navid-zhaw/ADS-Praktika
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor improvement

Browse Source
This commit is contained in:
navid.sassan 2020-11-08 21:20:51 +01:00
parent a828de13ce
commit 727e1d7c2b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
07/src/main/java/ch/zhaw/ads/Node.java
View File

@ -31,4 +31,7 @@ public class Node<E> {
edges.add(edge); edges.add(edge);
} }
public boolean equals(DijkstraNode other) {
return this.name == other.getName();
}
} }

10
07/src/main/java/ch/zhaw/ads/RouteServer.java
View File

@ -45,6 +45,12 @@ public class RouteServer implements CommandExecutor {
} }
private void dijkstra(String from, String to) { private void dijkstra(String from, String to) {
for (DijkstraNode<Edge> node : graph.getNodes()) {
node.setMark(false);
node.setDist(Double.POSITIVE_INFINITY);
node.setPrev(null);
}
Queue<DijkstraNode> pq = new PriorityQueue<DijkstraNode>(); Queue<DijkstraNode> pq = new PriorityQueue<DijkstraNode>();
DijkstraNode<Edge> start = graph.findNode(from); DijkstraNode<Edge> start = graph.findNode(from);
DijkstraNode<Edge> goal = graph.findNode(to); DijkstraNode<Edge> goal = graph.findNode(to);
@ -53,9 +59,7 @@ public class RouteServer implements CommandExecutor {
while (!pq.isEmpty()) { while (!pq.isEmpty()) {
DijkstraNode<Edge> current = pq.poll(); DijkstraNode<Edge> current = pq.poll();
current.setMark(true); current.setMark(true);
// implement equals for this if (current.equals(goal)) {
// if (current.equal(goal)) {
if (current.getName() == to) {
break; break;
} }
for (Edge<DijkstraNode> edge : current.getEdges()) { for (Edge<DijkstraNode> edge : current.getEdges()) {