From f12e52c93d0db4e6dc652470dfd27ec91ffc93be Mon Sep 17 00:00:00 2001
From: Tiphaine Pellerin <tpellerin@insa-toulouse.fr>
Date: Thu, 4 Jun 2026 18:20:21 +0200
Subject: [PATCH] =?UTF-8?q?implementation=20de=20l'algo=20de=20marathon=20?=
 =?UTF-8?q?et=20am=C3=A9lioration=20de=20la=20classe=20de=20tests=20launch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../algorithm/shortestpath/LabelMarathon.java |  10 +-
 .../algorithm/shortestpath/Marathon.java      |  73 +++--
 .../algorithm/shortestpath/Marathon.class     | Bin 5763 -> 5974 bytes
 .../org/insa/graphs/gui/simple/Launch.java    | 281 +++++++++++++-----
 .../org/insa/graphs/gui/simple/Launch$1.class | Bin 1292 -> 1292 bytes
 .../org/insa/graphs/gui/simple/Launch.class   | Bin 6743 -> 1716 bytes
 6 files changed, 246 insertions(+), 118 deletions(-)

diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelMarathon.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelMarathon.java
index 95dd6ab..875c742 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelMarathon.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelMarathon.java
@@ -22,15 +22,15 @@ public class LabelMarathon extends Label implements Comparable<Label> {
         return this.coutDest + this.cout;
     }
 
-    public double difMarathon (double d) {
-        return d - this.getTotalCost() ; 
+    public double difMarathon(double d) {
+        return d - this.getTotalCost();
     }
 
     public int compareTo(LabelMarathon l) {
-        if (this.difMarathon (43)< l.difMarathon (43)) {
+        if (this.difMarathon(43) < l.difMarathon(43)) {
             return -1;
         }
-        else if (this.difMarathon (43)> l.difMarathon (43)) {
+        else if (this.difMarathon(43) > l.difMarathon(43)) {
             return 1;
         }
         else {
@@ -38,4 +38,4 @@ public class LabelMarathon extends Label implements Comparable<Label> {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java
index 0f0cf01..3e69565 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java
@@ -17,7 +17,8 @@ public class Marathon extends ShortestPathAlgorithm {
     }
 
     public Label newLabelMarathon(Node s, ShortestPathData dataPath) {
-        return new LabelMarathon(s, false, Integer.MAX_VALUE, null, s.getPoint().distanceTo(dataPath.getDestination().getPoint()));
+        return new LabelMarathon(s, false, Integer.MAX_VALUE, null,
+                s.getPoint().distanceTo(dataPath.getDestination().getPoint()));
     }
 
     @Override
@@ -44,11 +45,11 @@ public class Marathon extends ShortestPathAlgorithm {
             }
         }
 
-        Node dest = dataInput.getOrigin().getSuccessors().get(0).getDestination() ; 
+        Node dest = dataInput.getOrigin().getSuccessors().get(0).getDestination();
 
-        Label xl = tas.findMin();
-        boolean possible = true ; 
-        boolean fini = false ; 
+        Label xl;
+        boolean possible = true;
+        boolean fini = false;
 
         // iterations
         while (!tas.isEmpty() && fini && possible) {
@@ -56,7 +57,8 @@ public class Marathon extends ShortestPathAlgorithm {
             Node x = xl.getSommetCourant();
             notifyNodeMarked(x);
             xl.marque = true;
-            possible = false ; 
+            possible = false;
+            tas.remove(xl);
             for (Arc a : x.getSuccessors()) {
                 if (dataInput.isAllowed(a)) {
                     Node n = a.getDestination();
@@ -64,43 +66,52 @@ public class Marathon extends ShortestPathAlgorithm {
                         listLabel[n.getId()] = newLabelMarathon(n, dataInput);
                     }
                     if (!listLabel[n.getId()].getMarque()) {
-                        possible = true ; 
-                        listLabel[n.getId()].update(a, listLabel[x.getId()].getCost() + dataInput.getCost(a));
+                        possible = true;
+                        listLabel[n.getId()].update(a,
+                                listLabel[x.getId()].getCost() + dataInput.getCost(a));
 
-                        if ((!n.equals(dest)) && (listLabel[n.getId()].getCost()) < 43){
-                            tas.insert(listLabel[n.getId()]) ; 
+                        if ((!n.equals(dest))
+                                && (listLabel[n.getId()].getCost()) < 43) {
+                            tas.insert(listLabel[n.getId()]);
                         }
-                        if ((n.equals(dest)) && (42<listLabel[n.getId()].getCost()) && (listLabel[n.getId()].getCost()< 43)){
-                            fini = true ; 
+                        if ((n.equals(dest)) && (42 < listLabel[n.getId()].getCost())
+                                && (listLabel[n.getId()].getCost() < 43)) {
+                            fini = true;
                         }
                     }
                 }
             }
-            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);
+        if (!possible) {
+            System.out.println("erreur : parcours non réalisable\n");
+            return null;
         }
         else {
-            // The destination has been found, notify the observers.
-            notifyDestinationReached(dataInput.getDestination());
-
-            // Create the path from the array of predecessors...
-            ArrayList<Arc> arcs = new ArrayList<>();
-            Label nCourant = listLabel[dataInput.getDestination().getId()];
-            while (nCourant.getPere() != null) {
-                arcs.add(nCourant.getPere());
-                nCourant = listLabel[nCourant.getPere().getOrigin().getId()];
+            // 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);
             }
-            // Reverse the path...
-            Collections.reverse(arcs);
+            else {
+                // The destination has been found, notify the observers.
+                notifyDestinationReached(dataInput.getDestination());
 
-            // Create the final solution.
-            solution = new ShortestPathSolution(dataInput, Status.OPTIMAL,
-                    new Path(graph, arcs));
+                // Create the path from the array of predecessors...
+                ArrayList<Arc> arcs = new ArrayList<>();
+                Label nCourant = listLabel[dataInput.getDestination().getId()];
+                while (nCourant.getPere() != null) {
+                    arcs.add(nCourant.getPere());
+                    nCourant = listLabel[nCourant.getPere().getOrigin().getId()];
+                }
+                // Reverse the path...
+                Collections.reverse(arcs);
+
+                // Create the final solution.
+                solution = new ShortestPathSolution(dataInput, Status.OPTIMAL,
+                        new Path(graph, arcs));
+            }
+            return solution;
         }
-        return solution;
     }
 }
diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Marathon.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Marathon.class
index 7918ccafeb6be6786f7cd1a2d10fe1ce67049e48..a6040daa00c43deb872b65c90001654fc7eac13e 100644
GIT binary patch
delta 1646
zcmaJ>X>3$g6#mZZ%)EK;-I>m`GqsOuTdNJ-L6!njp_H&w7K33)M4iHb#pz6$witep
zi81kqCThJ}XsO@=)@sxO`U(`ql+EH+H$>b}5foez+z{%SwgipFKliNnJKs6yzIRvg
z;S&AO#a%B07*DBN^#jg~>9}9u0n`v2u~1EPbx21p9u$yxNFH%s=V=n~z^h{_)(bSF
zMVeY(R;$1xXdsBHXfzxOMivCa4SaDbHVHh6$K<V=PkSPvZYE^Pt=g3$e{v%Hq(B><
zl3TQj_;Ui!Cm_`7x+yia^=mY2#da0j2%eR})xlxmU}VLx`D^OxLp1^~;6*}Gw4t8h
zuj~(3M~BUeRY&UQ*T+J^nldLk2|1xyEYuLo4rJE`V@snAvAXO?G?E?L+a3&8*9EJ>
zAzjB#bg9@y<w*Sx9D&_<i8<9Kpu-WamN!stfK5HSSCr*1P_ah}J=3<AP}b-fDoflx
zr-uDFsN#TJrI#kXiXQp2KE>6I*97c%oe<5dOk_sLD@PgQY;Ov@C07|)^tNm?(p|ln
zl^D-^0`KFnw2Y#RUK|nl5X-sk;Id^p)*`6mV|=RO6M4ZHlJpsl$sr=gzaL)+e2E?=
zJ$K%XGiFy*s`yIYAhL|(IGL#ZHDNe!AYGQ*9kN;YnA53*|1{y=zjGS7J=b-QLT6-0
z@+gIbJdr%o<|Py~dWOi}WRINYiBL#dp5ZPxlKB1j;DR3+^0a5PHX0g|0i{yrdz)mB
zx7cAfofhts=e*g}DAQ7M;t$U^ZKm78k`WfxS=i8mxUE#X<TC|p#z1sqp(!jpzSP1N
z(`~92mbM`0Qlf>8KD4iIg~zmC_N^RDY({|(&s_Fz<izxTGu~f#@UFvFs++Ezh!I-)
zN=>_kXItR%>&<ZbwU&#g`G9L1I#MhPJE+676<WA<kem;%tZPAP7rGZ0Zo|G#911wv
zP*pIH@<tbW7kA>FfN}X!K(z5UP?GA1ziZ)xg-nOrWA$hPF(CS_gMG(LV+TGOg#Ek=
z#}^lwMkh{m;+ufObae2<ZP58VgX{UciZ__ab{5Y)oA+=vTSGAxd8j}>W}^VhP>5A1
z!X50t6T{Jj_(=YKN1+vCu!&RKF%BIFz(N`JFlaZ%qX!dk9Od{96LFTI`Y?&ym`qui
zLOGa9MVLktSXN*L&B9Dtf?2c@v*~Wkq4k(c8!&;kU<`F)0qw>@+J{AS05?%DmeAoi
zD@SoNoy0A43RQFlAv%xcii#DAj@uMJs+C;UixE~vAgTmVt4wA&12GufvxStz8-w7N
z2iTQq_?EjT=*lD}{5=#TE93D4e&qM*SH|Eco|O%mN(p}EX6zI{$$@kD1rCNB)OZf%
z_?4%kqKPd0)~~hWPyCKQ;6yWR$9c9iv{DByu%`3O&fy~G89b>@^bwfQS+o(c&&>_Z
zA%&7)a9fke#wdd9Og9b6?E_rM!CVH?R2bw0NQJwPSEZ>5HCIIisl>)~Fs(&k1~dD3
zi^jjgD(|1`@|woN{g0?z>(5n4lbij;39;6HMXvTg0ABYs7m%f*S9;QX1^u;EbYFt^
qRG^e}p0vu1<g(<FuoqZl$a!fQ>6BQ9LT=(;0MCc8pFET@(fkVzMTesR

delta 1533
zcmaKsdr(zX6vlu1aPK|$ali`!<0%6NLwSl%RD2+cnwsg1S~_KURZJa_Qnaa==Gydk
zrS4JzGfe|~8cO%7lp&?2*~`+(tjshkv&>3MQ(ET&<5V;Kan4?kZ-4t+d#}BZ^n4^g
zc;M>JUBFP~HZc?hx+I}T!+>h9H<QOLma{^i@%9dCiy(=9M)Rb_Dpu<}U)G>%iyD?F
ztXY+n<z=CTw}r}=lsTBS7EiHGVct_#HL`MXl_D-HyVOr6>z&L7{irX~v(aJ`&+6^I
zlI|~9yhw$@v#6}1a;Z?<%*z&A9By;|;!zd%Ry|<SprigY*Q<)bj>MILR9}=GCfgOg
zbtsslmj_I@#ZH>^)W9gKk=HHU>{3)_>4t=U`e<O7tJz|=?qa2@H}w#!b9@Wq9kqKc
z_VKn3S$P9nIAHM(b474y&Ky4v5%TjMADFzaNLdhC8Y);)HNU)IWMz4I+3c$Ml?xYJ
ze8?fa$I3{F^0CEXnnd)(NmIs7D7nSt6WwgsiIYNA^ZXp)Ge^=<MK66WuCp$7dvs}h
zvbT|APW+2)GvhBAo|B56S=l1_2E8m0^bGc+xT;qK`?}&3Ik8I52N$XtI+WPU?U5vU
zU1EP<3O+i4F-9LtT;;dj5tcPGy2z^+CFSe7q;&O|-kX#WUOCxz*$EM5^oj69gf%sU
zU4_1mm~Dv_Xv@~-+E#?8XGeI(PO!}gvunuc07j@yrf$tzg0}lwY(YD)nw(@dUyIiY
zuyf1}#};m%>v0wO?f4xmQq;5-3XwO$^N#YDYKTwqSL03b)m%MeyK*Dk)GjKSt*dLe
zu8GF!xm$@ud9BD(&#as_$Qw<xOpo$bQQ+F7BCDP>JKz+vClY4=?II**bI{=|vSQx8
z*5h_yJMXp=f7Ha0>3Mb_%BN92FY?%)SLBYk@XP-Y{p8<8PV7eU(`47vNujG)-5E#^
zO2}dY*~}q_`^e>fi9bw%+?w8m*VBiM^renMo?`&pWXetk(M%Eh8O%Y3aGIf<V;C1H
zRtCdWA|q4=BUL7)s+7@cCSz0uV^uBV)H;T!%}i8VC{(+dtPV3ponWdu#WZ!6JJbd4
zGz?}KZtgOI+#NQ$ij&1GBcC#(KXZ*@8B3W*Kx&GR<a7`g@#49S5qv4tDg4GzzT!9r
zos5Be%?aX2G5YWgCuL94jBHNvEpAyjPQ-tQM;O~JDX*CCWyefbsRqJ7#LV@oo-_Q2
zmyK!@XZcB*w@z)~XR-XUAHPfe{Y27fqWr>n5p<DyewA2)RCFu92_hhMjo^Z?I9W&)
zd2Leu5Gie_KZWBGC@H9wJbdPOlu4#Zi42!bd1ge{G`P&TRym!3`R}wzx+yy@m(0m0
z{3EX?r)C;l)(@uUhug?H&@#61w#uXVf24`st~d*{$QswT((S)klg18G2$o3G{3YjM
sO1YUbiY(kY5w7%gy3>etXY56gjB}nw>}z%Y0(Q{OV-i({at*it2IU)I<p2Nx

diff --git a/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java b/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java
index 7147763..1fa985b 100644
--- a/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java
+++ b/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java
@@ -5,11 +5,11 @@ import java.awt.Dimension;
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.FileInputStream;
+import java.util.Random;
 
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 
-import org.insa.graphs.algorithm.ArcInspector;
 import org.insa.graphs.algorithm.ArcInspectorFactory;
 import org.insa.graphs.algorithm.shortestpath.AStarAlgorithm;
 import org.insa.graphs.algorithm.shortestpath.BellmanFordAlgorithm;
@@ -19,11 +19,12 @@ import org.insa.graphs.algorithm.shortestpath.ShortestPathSolution;
 import org.insa.graphs.gui.drawing.Drawing;
 import org.insa.graphs.gui.drawing.components.BasicDrawing;
 import org.insa.graphs.model.Graph;
+import org.insa.graphs.model.Node;
 import org.insa.graphs.model.Path;
 import org.insa.graphs.model.io.BinaryGraphReader;
-import org.insa.graphs.model.io.BinaryPathReader;
 import org.insa.graphs.model.io.GraphReader;
-import org.insa.graphs.model.io.PathReader;
+
+import org.insa.graphs.gui.simple.ExceptionCheminImpossible;
 
 public class Launch {
 
@@ -32,6 +33,7 @@ public class Launch {
      *
      * @return The created drawing.
      * @throws Exception if something wrong happens when creating the graph.
+     * @throws ExceptionCheminImpossible
      */
     public static Drawing createDrawing() throws Exception {
         BasicDrawing basicDrawing = new BasicDrawing();
@@ -50,110 +52,225 @@ public class Launch {
         return basicDrawing;
     }
 
-    private static ShortestPathSolution paths ; 
-    private static ShortestPathSolution paths2 ; 
-    private static ShortestPathSolution paths3 ; 
-    private static DijkstraAlgorithm dijkstra ; 
-    private static BellmanFordAlgorithm bellman ; 
-    private static AStarAlgorithm AEtoile ; 
-    private static ShortestPathData data ; 
-    public static void main(String[] args) throws Exception {
+    private static ShortestPathSolution paths;
+    private static ShortestPathSolution paths2;
+    private static ShortestPathSolution paths3;
+    private static DijkstraAlgorithm dijkstra;
+    private static BellmanFordAlgorithm bellman;
+    private static AStarAlgorithm AEtoile;
+    private static ShortestPathData data;
 
-        // visit these directory to see the list of available files on commetud.
-        final String[] mapName ={
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/insa.mapgr",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/toulouse.mapgr",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/toulouse.mapgr",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/france.mapgr"
-        };
-        final String[] pathName = {
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31insa_rangueil_r2.path",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31_insa_bikini_motorcar.path",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31_insa_bikini_canal.path", 
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr_insa_tour.path"
-        };
+    public static void main(String[] args) throws Exception, ExceptionCheminImpossible {
+
+        // Chemins vers les cartes (les fichiers .path ne sont plus nécessaires ici)
+        final String[] mapName = {
+                "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/toulouse.mapgr",
+                "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/insa.mapgr",
+                "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/toulouse.mapgr",
+                "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/france.mapgr" };
 
         final Graph[] graph = new Graph[4];
-        final Path[] path = new Path[4];
+        Random rand = new Random();
 
-        for (int i = 0 ; i<4 ; i++) {
-            // create a graph reader
-            try (final GraphReader reader = new BinaryGraphReader(new DataInputStream(
-                    new BufferedInputStream(new FileInputStream(mapName[i]))))) {
+        // for (int i = 0; i < 4; i++) {
+        // Lecture du graphe
+        try (final GraphReader reader = new BinaryGraphReader(new DataInputStream(
+                new BufferedInputStream(new FileInputStream(mapName[0]))))) {
 
-                // TODO: read the graph
-                graph[i] = reader.read();
-                System.out.println("pas d'erreur au niveau du reader");
-            }
+            graph[0] = reader.read();
+            System.out.println("Carte chargée avec succès : " + mapName[0]);
+        }
 
-            // create the drawing
-            final Drawing drawing = createDrawing();
+        // Création de l'affichage graphique
+        final Drawing drawing = createDrawing();
+        drawing.drawGraph(graph[0]);
 
-            // TODO: draw the graph on the drawing
-            drawing.drawGraph(graph[i]);
+        // Nombre de nœuds maximum disponibles sur cette carte
+        int numNodes = graph[0].getNodes().size()-1;
 
-            // TODO: create a path reader
-            try (final PathReader pathReader = new BinaryPathReader(new DataInputStream(
-                    new BufferedInputStream(new FileInputStream(pathName[i]))))) {
+        // --- DEBUT DES TESTS ALEATOIRES ---
+        // On crée 10 paires de points aléatoires pour chaque carte
+        int nbTests = 2;
+        for (int t = 1; t <= nbTests; t++) {
 
-                // TODO: read the path
-                path[i] = pathReader.readPath(graph[i]);
-                System.out.println("pas d'erreur au niveau du pathreader");
-            }
+            // Choix de l'origine et de la destination
+            Node origin = graph[0].getNodes().get(rand.nextInt(numNodes));
+            Node destination = graph[0].getNodes().get(rand.nextInt(numNodes));
 
-            // TODO: draw the path on the drawing
-            drawing.drawPath(path[i]);
+            System.out.println(
+                    String.format("\n[Test %d/%d] Origine ID: %d | Destination ID: %d",
+                            t, nbTests, origin.getId(), destination.getId()));
 
-            data = new ShortestPathData(graph[i], path[i].getOrigin(),path[i].getDestination(), ArcInspectorFactory.getAllFilters().get(i)) ;
-            dijkstra = new DijkstraAlgorithm(data) ; 
+
+            data = new ShortestPathData(graph[0], origin, destination,
+                    ArcInspectorFactory.getAllFilters().get(1));
+
+            dijkstra = new DijkstraAlgorithm(data);
             bellman = new BellmanFordAlgorithm(data);
-            AEtoile = new  AStarAlgorithm(data) ; 
-            paths = dijkstra.doRun() ; 
-            paths2 = bellman.doRun() ; 
-            paths3 = AEtoile.doRun() ; 
+            AEtoile = new AStarAlgorithm(data);
 
-            if (!paths.getPath().isValid()){
-                System.out.println("Pour la carte " + i + ", c'est pas valide");
+            paths = dijkstra.doRun();
+            paths2 = bellman.doRun();
+            paths3 = AEtoile.doRun();
 
-                if (!paths.isFeasible()) {
-                    System.out.println("Chemin impossible");
+            // --- VERIFICATION ET COMPARAISON DES RESULTATS ---
+
+            // Cas 1 : Aucun chemin trouvé par Dijkstra
+            if (!paths.isFeasible() || paths.getPath() == null) {
+                System.out.println("\n Dijkstra : Aucun chemin trouvé (Infeasible).");
+
+                // Alerte de sécurité si un autre algo prétend en trouver un
+                if (paths2.isFeasible() || paths3.isFeasible()) {
+                    System.out.println(
+                            "\n Bellman ou A* ont trouvé un chemin alors que Dijkstra dit que c'est impossible !");
                 }
+                throw new ExceptionCheminImpossible("pas de chemin possible");
             }
+            // Cas 2 : Un chemin a été trouvé
             else {
-                System.out.println("Pour la carte " + i + ", c'est valide");
-                if (paths.isFeasible()) {
-                    System.out.println("Chemin possible");
-                } 
-                //tester si l'origine = destination 
-                if (paths.getInputData().getOrigin() == paths.getInputData().getDestination()) {
-                    System.out.println("Origine = destination");
+                System.out.println("\n Dijkstra : Chemin trouvé !");
+
+                // Cas particulier : Origine égale à la destination
+                if (origin.equals(destination)) {
+                    System.out.println("\n L'origine est égale à la destination.");
                 }
 
-                if (Math.abs(paths.getPath().getLength()- paths2.getPath().getLength()) < 1e-6) {
-                    System.out.println("Même résultat entre dijkstra et bellman");
+                Path pDijkstra = paths.getPath();
+                Path pBellman = paths2.getPath();
+                Path pAStar = paths3.getPath();
+
+                // Affichage du chemin de Dijkstra sur l'interface
+                drawing.drawPath(pDijkstra);
+
+                // Comparaison des algos Dijkstra et Bellman-Ford
+                if (pBellman != null) {
+                    // test sur les distances (on laisse 1 cm de marge)
+                    if (Math.abs(pDijkstra.getLength() - pBellman.getLength()) < 1e-2) {
+                        System.out
+                                .println("\n Même distance entre Dijkstra et Bellman");
+                    }
+                    else {
+                        float diff =
+                                Math.abs(pDijkstra.getLength() - pBellman.getLength());
+                        System.out.println(
+                                "\n Distance différente entre Dijkstra et Bellman --> différence de"
+                                        + diff);
+                    }
+                    // test sur le temps de parcours (on laisse 1 seconde de marge)
+                    if (Math.abs(pDijkstra.getMinimumTravelTime()
+                            - pBellman.getMinimumTravelTime()) < 1.0) {
+                        System.out.println(
+                                "\n Même temps de parcours entre Dijkstra et Bellman");
+                    }
+                    else {
+                        double diff = Math.abs(pDijkstra.getMinimumTravelTime()
+                                - pBellman.getMinimumTravelTime());
+                        System.out.println(
+                                "\n Temps différents entre Dijkstra et Bellman --> différence de"
+                                        + diff);
+                    }
                 }
                 else {
-                    System.out.println("Résultat différent entre dijkstra et A*");
+                    System.out.println(
+                            "\n Probleme : Bellman n'a trouvé aucun chemin alors que Dijkstra oui.");
                 }
 
-                if (Math.abs(paths.getPath().getLength()- paths3.getPath().getLength()) < 1e-6) {
-                    System.out.println("Même résultat entre dijkstra et A*");
-                }else {
-                    System.out.println("Résultat différent entre dijkstra et A*");
+                // Comparaison des algos Dijkstra et A*
+                if (pAStar != null) {
+                    // test sur les distances
+                    if (Math.abs(pDijkstra.getLength() - pAStar.getLength()) < 1e-2) {
+                        System.out.println("\n Même distance entre Dijkstra et A* ");
+                    }
+                    else {
+                        float diff2 =
+                                Math.abs(pDijkstra.getLength() - pAStar.getLength());
+                        System.out.println(
+                                " Distance différente entre Dijkstra et A* --> différence de "
+                                        + diff2);
+                    }
+                    // test sur le temps de parcours
+                    if (Math.abs(pDijkstra.getMinimumTravelTime()
+                            - pAStar.getMinimumTravelTime()) < 1.0) {
+                        System.out.println(
+                                "\n Même temps de parcours entre Dijkstra et A*");
+                    }
+                    else {
+                        double diff2 = Math.abs(pDijkstra.getMinimumTravelTime()
+                                - pAStar.getMinimumTravelTime());
+                        System.out.println(
+                                "\n Temps différents entre Dijkstra et A* --> différence de"
+                                        + diff2);
+                    }
                 }
-
-
-                if (i==2) { //on teste au niveau du temps --> demande un ArcInspectorFactory spécial
-                    if (Math.abs(paths.getPath().getMinimumTravelTime()- paths2.getPath().getMinimumTravelTime()) < 1e-6) {
-                        System.out.println("Même résultat");
-                    }
-                    if (paths.getPath().getMinimumTravelTime()==paths2.getPath().getMinimumTravelTime()) {
-                        System.out.println("Dijkstra donne le même résultat que Bellman");
-                    }
+                else {
+                    System.out.println(
+                            "\n Probleme : A* n'a trouvé aucun chemin alors que Dijkstra oui.");
                 }
             }
-        
         }
-    }
 
-}
\ No newline at end of file
+        // --- CAS : CHEMIN IMPOSSIBLE ---
+        // PAS FINI (points à récup sur carte)
+
+        Node origin = graph[0].getNodes().get(27869);
+        Node destination = graph[0].getNodes().get(14534);
+
+        System.out.println(String.format(
+                "\n[Test chemin impossible] Origine ID: %d | Destination ID: %d",
+                origin.getId(), destination.getId()));
+
+        data = new ShortestPathData(graph[0], origin, destination,
+                ArcInspectorFactory.getAllFilters().get(0));
+
+        dijkstra = new DijkstraAlgorithm(data);
+        bellman = new BellmanFordAlgorithm(data);
+        AEtoile = new AStarAlgorithm(data);
+
+        paths = dijkstra.doRun();
+        paths2 = bellman.doRun();
+        paths3 = AEtoile.doRun();
+
+        // --- VERIFICATION ---
+
+        if (!paths.isFeasible() || paths.getPath() == null) {
+            System.out.println("\n Dijkstra : Aucun chemin trouvé (Infeasible).");
+            // Alerte de sécurité si un autre algo prétend en trouver un
+            if (paths2.isFeasible() || paths3.isFeasible()) {
+                System.out.println(
+                        "\n Bellman ou A* ont trouvé un chemin alors que Dijkstra dit que c'est impossible !");
+            }
+            throw new ExceptionCheminImpossible("pas de chemin possible");
+        }
+
+        // CAS : DEPART = ARRIVEE
+        Node origine = graph[0].getNodes().get(rand.nextInt(numNodes));
+        Node destinations = origine;
+
+        System.out.println(String.format(
+                "\n[Test origine = dest] Origine ID: %d | Destination ID: %d",
+                origine.getId(), destinations.getId()));
+
+        data = new ShortestPathData(graph[0], origine, destinations,
+                ArcInspectorFactory.getAllFilters().get(0));
+
+        dijkstra = new DijkstraAlgorithm(data);
+        bellman = new BellmanFordAlgorithm(data);
+        AEtoile = new AStarAlgorithm(data);
+
+        paths = dijkstra.doRun();
+        paths2 = bellman.doRun();
+        paths3 = AEtoile.doRun();
+
+        // --- VERIFICATION ---
+
+        System.out.println("\n Dijkstra : Chemin trouvé !");
+
+        // Cas particulier : Origine égale à la destination
+        if (origine.equals(destinations)) {
+            System.out.println("\n L'origine est égale à la destination.");
+        }
+
+        // --- FIN DES TESTS ALEATOIRES POUR CETTE CARTE ---
+        // }
+    }
+}
diff --git a/be-graphes-gui/target/classes/org/insa/graphs/gui/simple/Launch$1.class b/be-graphes-gui/target/classes/org/insa/graphs/gui/simple/Launch$1.class
index ba8a8f2ad9b07d1a94b461ffbb5dbff2730cc986..3f5d61ff261d7d4ed6fec36e0497a699fd484c1e 100644
GIT binary patch
delta 47
zcmeC->fzd8#KNdC*_fq7R-1u~L5D$<L6<>_L61S6L7%|@2rU>48EhDgCLdw(006@3
B2dV%7

delta 47
zcmeC->fzd8#KNdH*_fq7R+E8?L5o3@L7PE}L5D$}L6^aRL65<LL7%~f!C>+c77qZy
CYzLSC

diff --git a/be-graphes-gui/target/classes/org/insa/graphs/gui/simple/Launch.class b/be-graphes-gui/target/classes/org/insa/graphs/gui/simple/Launch.class
index 480a42b2862ab448e1cc2b81689401fdcee4f46c..d0397429b7ceda8ae4cc221ee0ae7a2cc41228b0 100644
GIT binary patch
delta 468
zcmca^vV~XR)W2Q(7#J9A8SL2^m>3xpCog0cnXJIXyV39@bG@W%MRICENoIbYb4F@z
zW}atmL4I*@W>QWnJA(-$1AkUxS)zVUVqUtwYf({t5eI`ABg3iCyrR_N{G77X6ousc
z+=9%UM34ar1x5KleYwR}3S68xja5ia%*)F!QAkQv02)#cF{LD5AyJ{EvLKacja1Ud
z&&9=H%wWO8Ajn|J$RMgQ`5`cD5`<)Bcs%p+Qj45(5{rvdiy0Ysd^3Tel9wI=bYt;k
zA(0wJ*~$GPVVvp=91I!^!VD&p--*blvN13*$TAoL`3wwN49pCSK$>eegK?yg>2?P5
x{XiZQgBXxx1IySmh=WBK7+4srz$|M98z9XElvM)KAYco`EI_^?gB_Hm1OSs)f5HF&

literal 6743
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
MpP0gj#OR6t0|~9;^Z)<=