file manager read dot file method was refactored

files/file_manager.cpp

@@ -46,24 +46,11 @@ bool file_manager::load_graph(const std::string &file_name, GVC_t *gvc, Agraph_t
     return false;
 }
 
-// TODO: refactor the read dot file
-std::unique_ptr<ts_instance> file_manager::read_dot_file(const std::string &file_name) {
-    // graphviz context
-    GVC_t *gvc = gvContext();
-
-    Agraph_t *graph;
-    std::unique_ptr<ts_instance> value1;
-    if (load_graph(file_name, gvc, graph, value1)) return value1;
-
-    // graph variables
-    std::map<std::string, std::unique_ptr<node> > nodesMap;
-    std::vector<std::shared_ptr<node> > nodes;
-    std::vector<std::shared_ptr<edge> > edges;
-
+void file_manager::load_graph_into_program(Agraph_t *graph, std::map<std::string, std::shared_ptr<node>>& nodesMap, std::vector<std::shared_ptr<edge>>& edges) {
     // Iterate over the nodes
     for (Agnode_t *n = agfstnode(graph); n; n = agnxtnode(graph, n)) {
         std::string nodeName = agnameof(n);
-        nodesMap.insert(std::make_pair(nodeName, std::make_unique<node>(nodeName)));
+        nodesMap.insert(std::make_pair(nodeName, std::make_shared<node>(nodeName)));
     }
 
     // Iterate over the edges (directed)
@@ -84,6 +71,24 @@ std::unique_ptr<ts_instance> file_manager::read_dot_file(const std::string &file
             edges.push_back(std::move(edgePtr));
         }
     }
+}
+
+std::unique_ptr<ts_instance> file_manager::read_dot_file(const std::string &file_name) {
+    // graphviz context
+    GVC_t *gvc = gvContext();
+
+    // loading graph from a file
+    Agraph_t *graph;
+    std::unique_ptr<ts_instance> value1;
+    if (load_graph(file_name, gvc, graph, value1)) return value1;
+
+    // graph variables
+    std::map<std::string, std::shared_ptr<node> > nodesMap;
+    std::vector<std::shared_ptr<node> > nodes;
+    std::vector<std::shared_ptr<edge> > edges;
+
+    // converting graph into vectors of nodes and edges
+    load_graph_into_program(graph, nodesMap, edges);
 
     // Free the graph and close the context
     agclose(graph);

files/file_manager.hpp

@@ -3,6 +3,7 @@
 
 #include <cgraph.h>
 #include <gvcext.h>
+#include <map>
 #include <string>
 #include <__filesystem/directory_entry.h>
 
@@ -16,6 +17,9 @@ public:
 
     static bool load_graph(const std::string &file_name, GVC_t *gvc, Agraph_t *&graph, std::unique_ptr<ts_instance> &value1);
 
+    static void load_graph_into_program(Agraph_t *graph, std::map<std::string, std::shared_ptr<node>>& nodesMap,
+                                        std::vector<std::shared_ptr<edge>>& edges);
+
     static std::unique_ptr<ts_instance> read_dot_file(const std::string &file_name);
 
     static std::vector<std::filesystem::directory_entry> get_dot_instances(const std::string &directory_path);