@@ -46,36 +46,29 @@ public void readTable() {
46
46
while (scanner .hasNext ()) {
47
47
String line = scanner .nextLine ();
48
48
49
- if (i > 0 ) {
50
- if (line .split ("," ).length > 1 ) {
51
- int weight = Integer .parseInt (line .split ("," )[1 ]);
52
- String rel = line .split ("," )[0 ];
53
- String src = rel .split ("-" )[0 ];
54
- String dst = rel .split ("-" )[1 ];
55
- edges .add (new Edge (src , dst , weight ));
56
- } else {
57
- startNode = line ;
58
- for (Edge edge : edges ) {
59
- if (!components .containsKey (edge .src )) {
60
- Component c = create (Node .class , new InitMessage (edge .src , edge .src .equalsIgnoreCase
61
- (startNode ), findNeighbours (edge .src )));
62
- components .put (edge .src , c );
63
- }
64
- if (!components .containsKey (edge .dst )) {
65
- Component c = create (Node .class , new InitMessage (edge .dst , edge .dst .equalsIgnoreCase
66
- (startNode ), findNeighbours (edge .dst )));
67
- components .put (edge .dst , c );
68
- }
69
- connect (components .get (edge .src ).getPositive (EdgePort .class ),
70
- components .get (edge .dst ).getNegative (EdgePort .class ), Channel .TWO_WAY );
71
- connect (components .get (edge .src ).getNegative (EdgePort .class ),
72
- components .get (edge .dst ).getPositive (EdgePort .class ), Channel .TWO_WAY );
73
- }
74
- }
75
- }
76
- i ++;
49
+ if (i ++ == 0 )
50
+ continue ;
51
+ int weight = Integer .parseInt (line .split ("," )[1 ]);
52
+ String rel = line .split ("," )[0 ];
53
+ String src = rel .split ("-" )[0 ];
54
+ String dst = rel .split ("-" )[1 ];
55
+ edges .add (new Edge (src , dst , weight ));
77
56
}
78
57
58
+ for (Edge edge : edges ) {
59
+ if (!components .containsKey (edge .src )) {
60
+ Component c = create (Node .class , new InitMessage (edge .src , findNeighbours (edge .src )));
61
+ components .put (edge .src , c );
62
+ }
63
+ if (!components .containsKey (edge .dst )) {
64
+ Component c = create (Node .class , new InitMessage (edge .dst , findNeighbours (edge .dst )));
65
+ components .put (edge .dst , c );
66
+ }
67
+ connect (components .get (edge .src ).getPositive (EdgePort .class ),
68
+ components .get (edge .dst ).getNegative (EdgePort .class ), Channel .TWO_WAY );
69
+ connect (components .get (edge .src ).getNegative (EdgePort .class ),
70
+ components .get (edge .dst ).getPositive (EdgePort .class ), Channel .TWO_WAY );
71
+ }
79
72
80
73
System .out .println (startNode );
81
74
0 commit comments