lacau/BE_Graphes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: lacau:6baec1d7dd53a51e96fccee4d60f05cb279a562a
Branches Tags
lacau:master
...
compare: lacau:224ab4a97d70f712c754bd691e774c7c1e7e6423
Branches Tags
lacau:master

2 commits
6baec1d7dd ... 224ab4a97d

Author SHA1 Message Date
Paul ALNET
224ab4a97d fix(dijkstra): filter invalid arcs during reconstruction 2024-05-03 13:58:13 +02:00
Paul ALNET
5363dd1a89 fix(dijkstra): remove then insert to sort bin heap 2024-05-03 13:57:54 +02:00
1 changed files with 7 additions and 3 deletions
Show stats Expand all files Collapse all files

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

@ -78,11 +78,15 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
// Si le noeud n'a pas déjà était rajouté au tas, on le rajoute
// isReached permet de vérifier en complexité O(1)
// C'est un léger coût en mémoire pour un gain en vitesse
if (!successor.isReached()) {
tas.insert(successor);
if (successor.isReached()) {
// removing then inserting resorts the binary heap
tas.remove(successor);
} else {
successor.markReached();
notifyNodeReached(successor.getNode());
}
tas.insert(successor);
}
}
}
@ -106,7 +110,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
// current node and add it to the path
if (parent_label != null) {
for (Arc arc : parent_label.getNode().getSuccessors()) {
if (arc.getDestination().getId() == current_label.getNode().getId()) {
if (arc.getDestination().getId() == current_label.getNode().getId() && data.isAllowed(arc)) {
arcs_path.add(arc);
break;
}