|
@@ -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]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|