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

conflict fix

Browse source
This commit is contained in:
Clement Lacau 2024-05-20 01:42:54 +02:00
parent 2ec3d4200f
commit add3470b71
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,6 +73,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
// This loop serves to get the length of the arc as // This loop serves to get the length of the arc as
// we know its origin and destination // we know its origin and destination
for (Arc arc : x.getNode().getSuccessors()) { for (Arc arc : x.getNode().getSuccessors()) {
if (successor.getNode().equals(arc.getDestination())) { if (successor.getNode().equals(arc.getDestination())) {
// data.getcost(arc) returns a cost considering the mode chosen: // data.getcost(arc) returns a cost considering the mode chosen:
// TIME or LENGTH // TIME or LENGTH
@ -82,7 +83,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
} }
final float possible_path_cost = x.getCost() + arc_cost; final float possible_path_cost = x.getCost() + arc_cost;
if (successor.getCost() >= possible_path_cost) { if (successor.getCost() > possible_path_cost) {
// Mise à jour du label // Mise à jour du label
successor.setPathCost(possible_path_cost); successor.setPathCost(possible_path_cost);
successor.setParentNode(x.getNode()); successor.setParentNode(x.getNode());