Ver Fonte

read_bug_fixed

m513t20 há 1 ano atrás
pai
commit
bf8d7c7136
2 ficheiros alterados com 10 adições e 13 exclusões
  1. 9 12
      graph/graph.cpp
  2. 1 1
      graph/main.cpp

+ 9 - 12
graph/graph.cpp

@@ -95,11 +95,11 @@ void Graph::read_file(string file_name)
 	ifstream input;
 	input.open(file_name);
 	map <string, Node> saved;
-	if (input.is_open()){
+	if (input.is_open()) {
 		string line;
 		getline(input, line);
-		while (getline(input,line)) {
-			string fir="", sec="";
+		while (getline(input, line)) {
+			string fir = "", sec = "";
 			int splitter = 0;
 			while (line[splitter] != '\t')
 			{
@@ -114,25 +114,22 @@ void Graph::read_file(string file_name)
 			}
 
 
-			Node s = taken_names[fir] ? saved[fir] : Node(fir);
-			Node f = taken_names[sec] ? saved[sec] : Node(sec);
+			saved[fir] = taken_names[fir] ? saved[fir] : Node(fir);
+			saved[sec] = taken_names[sec] ? saved[sec] : Node(sec);
 
-			saved[fir] = s;
-			saved[sec] = f;
 
-			add_node(&s);
-			add_node(&f);
+			add_node(&saved[fir]);
+			add_node(&saved[sec]);
 
-			add_edge(&s, &f);
+			add_edge(&saved[fir], &saved[sec]);
 
 
 
 
 
 		}
-	
-	}
 
+	}
 
 }
 

+ 1 - 1
graph/main.cpp

@@ -13,7 +13,7 @@ int main()
 {
     Graph gr;
     gr.read_file("testgraph.txt");
-
+    cout << "END \n";
 }