From 4e07fd986e2f303c9ab9f1c9baabcc77d59692c7 Mon Sep 17 00:00:00 2001 From: Gasson-Betuing Danyl Date: Tue, 20 May 2025 13:42:53 +0200 Subject: [PATCH] =?UTF-8?q?Dijkstra=20et=20A*=20corrig=C3=A92.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../insa/graphs/algorithm/shortestpath/AStarAlgorithm.java | 6 +++--- .../graphs/algorithm/shortestpath/DijkstraAlgorithm.java | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java index 79b320e..5a7c102 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java @@ -56,7 +56,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm { maxSpeed = graph.getGraphInformation().getMaximumSpeed()/3.6; - System.out.println(maxSpeed); + //System.out.println(maxSpeed); for(Node node : graph.getNodes()){ nodeId = node.getId(); @@ -67,7 +67,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm { else{ // Mode TEMPS sans vitesse max - System.err.println("uh"); + //System.err.println("uh"); for(Node node : graph.getNodes()) @@ -104,7 +104,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm { IdxNewOrigin = minHeap.deleteMin().currentNode.getId(); labels[IdxNewOrigin].mark = true; - notifyNodeMarked(labels[IdxNewOrigin].currentNode); + //notifyNodeMarked(labels[IdxNewOrigin].currentNode); for (Arc arc : labels[IdxNewOrigin].currentNode.getSuccessors()) { // le arrayList de getSucessors, ça ne retourne que des arc forward. donc pas besoin de vérifier qui est l'origine o`u la destination diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java index 793f658..758d172 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java @@ -19,8 +19,6 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm { @Override protected ShortestPathSolution doRun() { - - // retrieve data from the input problem (getInputData() is inherited from the // parent class ShortestPathAlgorithm) final ShortestPathData data = getInputData(); @@ -66,7 +64,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm { IdxNewOrigin = minHeap.deleteMin().currentNode.getId(); labels[IdxNewOrigin].mark = true; - notifyNodeMarked(labels[IdxNewOrigin].currentNode); + //notifyNodeMarked(labels[IdxNewOrigin].currentNode); for (Arc arc : labels[IdxNewOrigin].currentNode.getSuccessors()) { // le arrayList de getSucessors, ça ne retourne que des arc forward. donc pas besoin de vérifier si le chemin est empruntable @@ -80,8 +78,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm { NewCost = labels[IdxNewOrigin].computedCost + data.getCost(arc); // calcul de la nouvelle distance OldCost = labels[arc.getDestination().getId()].computedCost; // lecture de l'ancienne - if (Double.isInfinite(OldCost) - && Double.isFinite(NewCost)) { + if (Double.isInfinite(OldCost) && Double.isFinite(NewCost)) { notifyNodeReached(arc.getDestination()); }