barbanso/BE-GRAPHE.2020-2021
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added new features

Browse source
This commit is contained in:
Adrien Barbanson 2021-05-18 18:43:01 +02:00
parent 59cfea1f4b
commit dc987176d1
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
View file

@ -58,6 +58,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
// We stop the algorithm when the cost of last marked point is equal to the shortest found path // We stop the algorithm when the cost of last marked point is equal to the shortest found path
// or if we searched all the graph // or if we searched all the graph
while(lastMarkedNodeCost < shortestCostToDestination && !minHeap.isEmpty()) { while(lastMarkedNodeCost < shortestCostToDestination && !minHeap.isEmpty()) {
//We get the shortest not marked label //We get the shortest not marked label
Label minLabel = minHeap.deleteMin(); Label minLabel = minHeap.deleteMin();

16
be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
View file

@ -354,4 +354,20 @@ public class Path {
return totalTime; return totalTime;
} }
/**
* Compares the path with other path object
* @param other
* @return
*/
public boolean isSamePath(Path other) {
for(int i = 0 ; i < arcs.size() ; i++) {
if(this.arcs.get(i).getOrigin().getId() != other.arcs.get(i).getOrigin().getId()) {
return false;
}
if(this.arcs.get(i).getDestination().getId() != other.arcs.get(i).getDestination().getId()) {
return false;
}
}
return true;
}
} }