From 1747043e2ae2b1ee066628b00a97a144af8c1af6 Mon Sep 17 00:00:00 2001
From: Tiphaine Pellerin <tpellerin@insa-toulouse.fr>
Date: Thu, 4 Jun 2026 23:38:59 +0200
Subject: [PATCH] =?UTF-8?q?r=C3=A9paration=20de=20l'algo=20astar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shortestpath/AStarAlgorithm.java          |  12 ++++++++---
 .../shortestpath/DijkstraAlgorithm.java       |  20 ++++++++++++------
 .../graphs/algorithm/shortestpath/Label.java  |   4 ++--
 .../shortestpath/AStarAlgorithm.class         | Bin 1381 -> 1573 bytes
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5379 -> 5573 bytes
 .../graphs/algorithm/shortestpath/Label.class | Bin 1742 -> 1742 bytes
 6 files changed, 25 insertions(+), 11 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 050c21f..3233751 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
@@ -8,9 +8,15 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
         super(data);
     }
 
+    @Override
     // creates an 'empty' labelstar for the node given in argument
-    public LabelStar newLabel(Node s, ShortestPathData dataPath) {
-        return new LabelStar(s, false, Integer.MAX_VALUE, null,
-                s.getPoint().distanceTo(dataPath.getDestination().getPoint()));
+    public LabelStar newLabel(Node s, Node d) {
+        return new LabelStar(s, false, Double.MAX_VALUE, null,
+                s.getPoint().distanceTo(d.getPoint()));
+    }
+
+    @Override
+    public LabelStar newLabelOrigine(Node s, Node d){
+        return new LabelStar(s, false, 0, null, s.getPoint().distanceTo(d.getPoint()) );
     }
 }
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 6f6a34f..1d83f52 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
@@ -10,6 +10,8 @@ import org.insa.graphs.model.Graph;
 import org.insa.graphs.model.Node;
 import org.insa.graphs.model.Path;
 
+import java.sql.Date;
+
 public class DijkstraAlgorithm extends ShortestPathAlgorithm {
 
     public DijkstraAlgorithm(ShortestPathData data) {
@@ -17,10 +19,13 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
     }
 
     // creates an 'empty' label for the node given in argument
-    public Label newLabel(Node s) {
+    public Label newLabel(Node s, Node d) {
         return new Label(s, false, Double.MAX_VALUE, null);
     }
 
+    public Label newLabelOrigine(Node s, Node d){
+        return new Label(s, false, 0, null);
+    }
     @Override
     public ShortestPathSolution doRun() {
 
@@ -35,16 +40,18 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         // variable that will contain the solution of the shortest path problem
         ShortestPathSolution solution;
 
+        Node destination = dataInput.getDestination();
+
         // initialisation
         for (Node nod : graph.getNodes()) {
             listLabel[nod.getId()] = null;
             if (nod.equals(dataInput.getOrigin())) {
-                listLabel[nod.getId()] = new Label(nod, false, 0, null);
+                listLabel[nod.getId()] = newLabelOrigine(nod, destination);
                 tas.insert(listLabel[nod.getId()]);
                 notifyOriginProcessed(nod);
             }
             else if (nod.equals(dataInput.getDestination())){
-                listLabel[nod.getId()] = newLabel(nod);
+                listLabel[nod.getId()] = newLabel(nod, destination);
             }
         }
         Label xl = tas.findMin();
@@ -59,11 +66,11 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                 if (dataInput.isAllowed(a)) {
                     Node n = a.getDestination();
                     if (listLabel[n.getId()] == null) {
-                        listLabel[n.getId()] = newLabel(n);
+                        listLabel[n.getId()] = newLabel(n, destination);
                     }
                     if (!listLabel[n.getId()].getMarque()) {
-                        final var c = listLabel[n.getId()].getTotalCost();
-                        final var w = listLabel[x.getId()].getTotalCost() + dataInput.getCost(a);
+                        final var c = listLabel[n.getId()].getCost();
+                        final var w = listLabel[x.getId()].getCost() + dataInput.getCost(a);
                         if (c > w) {
                             if (listLabel[n.getId()].getCost() != Double.MAX_VALUE) {
                                 tas.remove(listLabel[n.getId()]);
@@ -80,6 +87,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             tas.remove(xl);
         }
 
+
         // when the algorithm terminates, return the solution that has been found
         if (listLabel[dataInput.getDestination().getId()].getCost() == Double.MAX_VALUE) {
             solution = new ShortestPathSolution(dataInput, Status.INFEASIBLE);
diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Label.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Label.java
index c5c1e9d..fa8b241 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Label.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Label.java
@@ -46,10 +46,10 @@ public class Label implements Comparable<Label> {
     // compares the labels in term of cost
     @Override
     public int compareTo(Label l) {
-        if (this.getCost() < l.getCost()) {
+        if (this.getTotalCost() < l.getTotalCost()) {
             return -1;
         }
-        else if (this.getCost() > l.getCost()) {
+        else if (this.getTotalCost() > l.getTotalCost()) {
             return 1;
         }
         else {
diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.class
index a9c223aa42b82be3b45d215da66bb6539db4261f..66bab8be3d39752839766d210e0d98a3be06585f 100644
GIT binary patch
delta 478
zcmZ{f!AiqG5QhKVZBtrfno2;4wRjM0o7z;Zdhj5EHwCZum|&=tG=iW##z#=sqgU?*
zp%#1|kD~YjI!Q{^Lk4#EcV_4RcHRn4>hOUvUw(>;{1S_-c6VEqhdeKr_>HNbJJ*iw
zJ3-ezxVUnCPYFN1<B((S$a_%{Rn+9OXe*YAEE@7%4CdJ>Lox6MM~>_H$CtfsFYp-7
z{vph`xmy6krV1UUNNuTTp(Oj6Cd<mlOeb`ahX7E1#azb{V;Ba?%o?H6pfkeC3+hAa
za}+3R@mmeEC}M$bGgMnn=AlwGiZa&FBvhnqQk*m~Dd(tmGU1sCFC?Iric?}6;}6E1
xV$3PVOfdRBExA6ytkS2VwQ_Zf_SpE{AhBezB?tCss+BU;PMspiHkotm`~b03N<aVr

delta 264
zcmX9%yH3L}6g}4okGO78CB%}dWnf5oBoqpf*pOJ5sKkKSu!I$YkSl@JxhoS5W@2a0
zR960ki4Wilf*a0obRIhQeuy7lz7czlEcu;cc2dkD8?)e*O~dxRoXF%s>MS|eMrG=8
z`SiQ0sxQF4Gf8Ptq@h5BKB1K<bEck5uBFMxn$V5<i;E489qg@Omk`?0+u);du8ly9
z#CE(P9|$brfN)X&w-fIwSiO}-j-<J>H-1dazWCRHLI4jy&;I)Bms@jm=h*(le(5p>
l?zmO=O*EYf9XDLI`M-g1et{kiF$C4>2y1RhIChR9{R7dhHERF>

diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class
index 6e1ef208031d4f4881c2aa3a6cb0327d1e551d63..10341ad740a1fbf707532a9ca2960f56aea5745b 100644
GIT binary patch
literal 5573
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
CrSKL2

delta 2438
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
HZZ`i1{$m4@

diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Label.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Label.class
index e85e1380b4a7ab044d2d648d25a6df19b16833c8..524067d900d33b5bca25810b648f99f47544d45f 100644
GIT binary patch
delta 14
VcmX@ddyaPlD>I|+W;W&%%m5>w1S9|e

delta 14
VcmX@ddyaPlD>I|^W;W&%%m5>k1R?+c