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

dijkstra verifications OK

Browse source
This commit is contained in:
Clement Lacau 2024-05-04 22:32:08 +02:00
parent df55fb1472
commit b45ff5d930
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
x = tas.deleteMin(); x = tas.deleteMin();
x.mark(); x.mark();
notifyNodeMarked(x.getNode()); notifyNodeMarked(x.getNode());
// System.out.println(x.getCost()); // Pour vérifier une croissance des noeuds marqués
// We create a list of node successors of x, instead of a list of Arcs. // We create a list of node successors of x, instead of a list of Arcs.
float arc_cost = 0; float arc_cost = 0;
for (Arc successorArc : x.getNode().getSuccessors()) { for (Arc successorArc : x.getNode().getSuccessors()) {
@ -96,47 +96,47 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
} }
} }
if (labels.get(data.getDestination().getId()).getParentNode() == null) {
solution = new ShortestPathSolution(data, Status.INFEASIBLE);
}
else {
// Create the path ...
ArrayList<Arc> arcs_path = new ArrayList<>();
// Create the path ... // We will find the path using the parent nodes, from the destination to the
ArrayList<Arc> arcs_path = new ArrayList<>(); // origin
Label current_label = labels.get(data.getDestination().getId());
Label parent_label = current_label;
// We will find the path using the parent nodes, from the destination to the while(current_label != null && current_label.getNode() != data.getOrigin())
// origin {
Label current_label = labels.get(data.getDestination().getId()); // Find the label matching the parent node
Label parent_label = current_label; parent_label = labels.get(current_label.getParentNode().getId());
while(current_label != null && current_label.getNode() != data.getOrigin()) // Knowing the parent node, get the arc between the parent and
{ // current node and add it to the path
// Find the label matching the parent node if (parent_label != null) {
parent_label = labels.get(current_label.getParentNode().getId()); for (Arc arc : parent_label.getNode().getSuccessors()) {
if (arc.getDestination().getId() == current_label.getNode().getId() && data.isAllowed(arc)) {
// Knowing the parent node, get the arc between the parent and arcs_path.add(arc);
// current node and add it to the path break;
if (parent_label != null) { }
for (Arc arc : parent_label.getNode().getSuccessors()) {
if (arc.getDestination().getId() == current_label.getNode().getId() && data.isAllowed(arc)) {
arcs_path.add(arc);
break;
} }
} }
current_label = parent_label;
} }
current_label = parent_label;
notifyDestinationReached(data.getDestination());
// Reverse the path...
Collections.reverse(arcs_path);
// Create the final solution.
solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(graph, arcs_path));
} }
notifyDestinationReached(data.getDestination()); return solution;
// Reverse the path...
Collections.reverse(arcs_path);
// Create the final solution.
solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(graph, arcs_path));
/*System.out.println("watch here" + "\n");
for (Arc a : arcs_path){
System.out.println(a.getOrigin().getId() + " --- " + a.getDestination().getId() + "\n");
}*/
return solution;
} }
} }