From 0e8f305f9aec62e6ce452044515dc39a75733ef6 Mon Sep 17 00:00:00 2001 From: Gasson-Betuing Danyl Date: Sun, 25 May 2025 14:54:31 +0200 Subject: [PATCH] TestDijkstraOK --- .../shortestpath/AStarAlgorithm.java | 21 +++-- .../shortestpath/DijkstraAlgorithm.java | 21 ++++- .../algorithm/utils/DijkstraFulltest.java | 86 ++++++++++++++++++- .../graphs/algorithm/utils/DijkstraTest.java | 72 ---------------- 4 files changed, 115 insertions(+), 85 deletions(-) delete mode 100644 be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/DijkstraTest.java 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 49f171c..193a7f9 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 @@ -47,7 +47,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm { for(Node node : graph.getNodes()){ // Mode DISTANCE nodeId = node.getId(); - Heuristicdistance = Point.distance(node.getPoint(), data.getDestination().getPoint()); + Heuristicdistance = Point.distance(node.getPoint(), data.getDestination().getPoint()); // la distance estimé est calculé par la fonction distance (ligne droite entre les deux noeuds) labels[nodeId] = new LabelStar(node, false, Double.POSITIVE_INFINITY, Heuristicdistance); } } @@ -83,7 +83,6 @@ public class AStarAlgorithm extends DijkstraAlgorithm { //binary heap for selected lowest cost BinaryHeap