Skip to content
This repository was archived by the owner on Jan 20, 2020. It is now read-only.

Commit c81c25d

Browse files
committed
add ability to find best candidate in fragment
1 parent 6e7cb28 commit c81c25d

17 files changed

+471
-108
lines changed

pom.xml

+17-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,22 @@
3333
<version>1.0.0</version>
3434
<scope>compile</scope>
3535
</dependency>
36+
<dependency>
37+
<groupId>org.projectlombok</groupId>
38+
<artifactId>lombok</artifactId>
39+
<version>1.18.10</version>
40+
<scope>provided</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.slf4j</groupId>
44+
<artifactId>slf4j-api</artifactId>
45+
<version>1.7.29</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.slf4j</groupId>
49+
<artifactId>slf4j-simple</artifactId>
50+
<version>1.7.29</version>
51+
</dependency>
3652

3753
</dependencies>
3854
<repositories>
@@ -49,5 +65,5 @@
4965
</repository>
5066
</repositories>
5167

52-
68+
5369
</project>

src/main/java/Components/App.java

+21-28
Original file line numberDiff line numberDiff line change
@@ -46,36 +46,29 @@ public void readTable() {
4646
while (scanner.hasNext()) {
4747
String line = scanner.nextLine();
4848

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));
7756
}
7857

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+
}
7972

8073
System.out.println(startNode);
8174

0 commit comments

Comments
 (0)