From 8de2ae972b17c9d8791830b51eb5d79ed3a68c5b Mon Sep 17 00:00:00 2001
From: Pellerin Tiphaine <tpellerin@insa-11276>
Date: Fri, 29 May 2026 17:50:36 +0200
Subject: [PATCH] =?UTF-8?q?on=20a=20commenc=C3=A9=20=C3=A0=20impl=C3=A9men?=
 =?UTF-8?q?ter=20l'algo=20du=20probl=C3=A8me=20ouvert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shortestpath/DijkstraAlgorithm.java       |   2 +-
 .../algorithm/shortestpath/Marathon.java      | 103 ++++++++++++++++++
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5300 -> 5283 bytes
 .../algorithm/shortestpath/Marathon.class     | Bin 0 -> 1313 bytes
 .../org/insa/graphs/gui/simple/Launch.java    |  22 ++--
 .../org/insa/graphs/gui/simple/Launch.class   | Bin 6740 -> 6743 bytes
 6 files changed, 114 insertions(+), 13 deletions(-)
 create mode 100644 be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java
 create mode 100644 be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Marathon.class

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 1ae3391..1922d9e 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
@@ -88,7 +88,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             // Create the path from the array of predecessors...
             ArrayList<Arc> arcs = new ArrayList<>();
             Label nCourant = listLabel[dataInput.getDestination().getId()];
-            while (nCourant.pere != null) {
+            while (nCourant.getPere() != null) {
                 arcs.add(nCourant.getPere());
                 nCourant = listLabel[nCourant.getPere().getOrigin().getId()];
             }
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
new file mode 100644
index 0000000..01c1652
--- /dev/null
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java
@@ -0,0 +1,103 @@
+package org.insa.graphs.algorithm.shortestpath;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+import org.insa.graphs.algorithm.AbstractSolution.Status;
+import org.insa.graphs.algorithm.utils.BinaryHeap;
+import org.insa.graphs.model.Arc;
+import org.insa.graphs.model.Graph;
+import org.insa.graphs.model.Node;
+import org.insa.graphs.model.Path;
+
+public class Marathon extends ShortestPathAlgorithm {
+
+    public Marathon(ShortestPathData data) {
+        super(data);
+    }
+
+    public Label newLabelMarathon(Node s) {
+        return new LabelMarathon(s, false, Double.MAX_VALUE, null);
+    }
+
+    @Override
+    public ShortestPathSolution doRun() {
+
+        // retrieve data from the input problem (getInputData() is inherited from the
+        // parent class ShortestPathAlgorithm)
+        final ShortestPathData dataInput = getInputData();
+        Graph graph = dataInput.getGraph();
+        final int nbNodes = graph.size();
+        Label[] listLabel = new Label[nbNodes];
+        BinaryHeap<Label> tas = new BinaryHeap<>();
+
+        // variable that will contain the solution of the shortest path problem
+        ShortestPathSolution solution;
+
+        // initialisation
+        for (Node nod : graph.getNodes()) {
+            listLabel[nod.getId()] = null;
+            if (nod.equals(dataInput.getOrigin())) {
+                listLabel[nod.getId()] = new Label(nod, false, 0, null);
+                tas.insert(listLabel[nod.getId()]);
+                notifyOriginProcessed(nod);
+            }
+        }
+
+        Node dest = dataInput.getOrigin().getSuccessors().get(0).getDestination() ; 
+
+        Label xl = tas.findMin();
+        boolean possible = True ; 
+        boolean fini = False ; 
+
+        // iterations
+        while (!tas.isEmpty() && fini && possible) {
+            xl = tas.findMin();
+            Node x = xl.getSommetCourant();
+            notifyNodeMarked(x);
+            xl.marque = true;
+            possible = False ; 
+            for (Arc a : x.getSuccessors()) {
+                if (dataInput.isAllowed(a)) {
+                    Node n = a.getDestination();
+                    if (listLabel[n.getId()] == null) {
+                        listLabel[n.getId()] = newLabelMarathon(n);
+                    }
+                    if (!listLabel[n.getId()].getMarque()) {
+                        possible = True ; 
+                        listLabel[n.getId()].update(x,x.getCost());
+
+                        if ((!n.equals(dest)) && (listLabel[n.getId()].getCost()) < 43){
+                            tas.insert(listLabel[n.getId()]) ; 
+                        }
+                    }
+                }
+            }
+            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);
+        }
+        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()];
+            }
+            // Reverse the path...
+            Collections.reverse(arcs);
+
+            // Create the final solution.
+            solution = new ShortestPathSolution(dataInput, Status.OPTIMAL,
+                    new Path(graph, arcs));
+        }
+        return solution;
+    }
+}
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 ae8c7e30f479ca6a9f09a1e6a0eb448f11dd96e2..7379db3a78d59f558b3e0cf9f3e9158a034ae044 100644
GIT binary patch
delta 560
zcmY+BNlcSb6otS0)An!w4z#uwTL^JLq_rU=hDbt<!b&3!F>ctI=*p#A7wT3v#<y^(
zjV8JkOfggu1jOQq1LA}@K*hO<8yAYV5EpLVIrqGK?mM~fO6q(nJn?5>5ZFT5#uD00
zSvHugL@sadbi57)uG?HQ!%nhlkQ-*kX^0O8xXC5K-m`cAj$IvHHlsq)<RpGN;Bp*B
zxD~+7xXJoAJH-l}5PF(SE?8??f<bd!BBtou)VJV2BvNb6NsX)H$ia5AGx*ChDKs~w
zmRb+{!k%^q;gdNU%DTP_Y0Z{2s`t%>hOE_jddC-M6W*%~6v%aN>}9CHNOvaT?Psi?
z+h#2C^Vl7#b%bL@xXV2(s;vO`c|a8_Ee{Ww#6`XQ<`Iu^OJ4OSJjG+J`p0NvD^sk+
zrbkZkjA><OdB=0rycD^}3tr;W`V6mB^Glcmyk>@gH0+~`H%db?!ER=Gi&v)TRQt4A
z-s|Gy8frPf2Mw^?HK&8;^{z~4kqkZ?u}RysD3r{}XnkGDrd4ySfJK_||KBhgT_Ytk
zAI<0)ja7JStg*3TvB@o&!X2#Rqb|nQSJo?vqC1^u!JLTI)qK{<;tO9DD?f07Z~WMn
F_zN_WkUIbX

delta 608
zcmY+BOGuPa7>1wkPv@V@ug*B5<^`!Vb4;8dA}OOZf(pAV+PG`5SvU+SW<jgky9v&s
zWk^Boq7)5Hv#V)kH?@0d_v~s3t!ny4anb7g&U>Eop7)&ZWVkErANkum0Bm5^#uBQ{
zjI1y<5;(WD&KvTOO`pR>`h~QXSZhouGyz{;xVE)%y_ZW|wiy(1;?YCV$icRzL}YVw
zA`xqBYiizqz~Ks4%~@}0?sbP7oDu9@yZ3C{QCn|wQz$SUl53J)mwSj2hjeb44BuMs
zom4w2w3nNxQ)nWRVU9|`40~30_WJgTsmb{58W*a{!*ly_kKd(9gs&!^S(EltsL&S_
z7}Yz+G6$_CUGxqmC-dDG80e#;VdZ(Q^)b{?neXmlxQE-OD=>THE?H{fwF2DZJ{DP)
z!vh|&h#bqs7~`Z-EPt5b5$V#c`eUBpvKB9NRI`z%EW@T<j`57=+MVDvFI00g%xPZI
zk4H}(=ap(c@w1mnrf{Tm9rcP%ktrkW<PC3e%LH}2QyUNObv(HmYCgaR4KPoARO3%3
z8qAYvb2wOBG;Om+Z_S1zRrqYgrov{GmTA)&T&mc3u(D(Uv)QinmK5#B{XbnADl1EI
tHXU<@{#r`-tY2hnmgQPSYkEaDUrbA=DDRuDEWYzYYibs!nBmu^{C_Y|n->58

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
new file mode 100644
index 0000000000000000000000000000000000000000..494128fc6dd97002630472884613c1b4ffa6b52e
GIT binary patch
literal 1313
zcmb`HU279T6o%hP^SP!r#<qUzR1lI1T@-ILwGyhm+7>af;N>JcO;$EDVRjPnU+Ikn
z1-<wGcq^XSBsE$sK_oCcXLHW;o_S|xzkdJt8Ng%QE+E6;Yt!>1l?cCQ#IT?EBJODu
z+5W&!`r25T*rBj}e_t4SXjMR#VSB-%)|Bv^N}Dq-Lw-9_k=-FqE%*o0Q(;A;e#nsB
z)uHsTgi;wf<QZ0iNXdiIpd(FNbYjU+4Rlw;hr&cIp1#c5ev~lWTU30u_6A9YB+l?~
z(b9Pb(!LogO1=q1N5(TOLvY%M0WB@|4`^)E7ZppXjRG!`6R*Ws__0tu|Cuq`6tTvz
z|56#5=y)tc-qnL)6bl<^#fL_dIfF;sEB(?K?+T@~<sHdS>a6C1+qXmMd8p!&GyXEe
zS}ph~*s>;4y>y3ip?)z^3{PqcFJj)YmX1fR!$uL;8NQv}e&YIXo00r$+vDjm@Jf3k
zPX1@!g0k(t<O509DC9k9cXeWGbsi;rq(XT_M>ph0+Hgx*&SCC$-(%Q1)4XOUu|{<5
ziB}#NZk2HbR~fvP9+|G(i`-pUo*lR?w^!Jpye0Y)09l&R{h_fy(GD{71M-`9k5PP2
zvkW{Mz4UE`GB4m9#p{zSl(9?^<>Ne7h(RZuGA67Cq~KWICsbcmSC6s&g`x@1=>e-L
ztDMfgDT}%0=LjxuLb&z^!u`{PN|OjTri456bcEdI2i$!3n><U4U5gAn{cqz3J&bES

literal 0
HcmV?d00001

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 ef75039..7147763 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
@@ -61,24 +61,22 @@ public class Launch {
 
         // 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/belgium.mapgr",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/haiti-and-domrep.mapgr",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/french-polynesia.mapgr",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Maps/fractal.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/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_be_173101_302442.path",
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_be_173101_302442.path", 
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_be_173101_302442.path", 
-            "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_be_173101_302442.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"
         };
 
-        final Graph[] graph = new Graph[5];
-        final Path[] path = new Path[5];
+        final Graph[] graph = new Graph[4];
+        final Path[] path = new Path[4];
 
-        for (int i = 0 ; i<5 ; i++) {
+        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]))))) {
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 23fa9dcb2b2dcfc098364b94ce8081d5be2cda36..480a42b2862ab448e1cc2b81689401fdcee4f46c 100644
GIT binary patch
delta 659
zcmY+AOGwmV6vcn{`k$Ak=8)MyQHu~-IHW0N<r_0$%xWqdNv3~3Y8aidaWtaL0u7;z
zY{FIvwQysLWLg9<8-o@>&<i431hr`?gqtAj8=8W+a3AL!?)TmEq55O>laM9tsS>Mh
zQ!+j_6dxNM@DJM~=MrxA3T;`!JD9LzegEKn!YKn+r`|Zqtph@DZYbUnj>Jao@YzT-
z5{ra~<H>lU&rbM9?Bsbj4MNXf;kN&TeRj+q%Bh-!BRN%J{vVb3RU+Ntd{)$At&?v8
z{pQM08OrnS35G0hO)%uhCa1SH7|0QISz>>dsLv9O!A?UoA9kfXOBZ$0_3&5!G8R#;
zG7EIDU;@^pP_~--UMi%*)I2tu{F4Tg8*$P^0nKcrg;HACVlW?VZ08_5X=fLQ@S9zg
z2CE`KEuGZUWt2xv9AnVrC?^=7<fM7Hn+!dy(93Ji@EMy`Q`hJh2Ln>bpah6Wh^S04
zBy$YQ0x?-4E>9Ve3>V}jqw<cVd|_O^b5T~gBtN*Ua78^#XbIP}oa^dmN&`&mac*cg
zGddaOrcQ86r<v6mZtETH>O3h;b5EZ$uWz}ppXk!BJfO_nei~2Kbk@ZT`1F;C>4Yj>
z7B!txtB)m5EaO<cE{a2(#@!};Brb8|FjwyukL2TKMa!hXCmW2JYt$IKi||OXSvo`6
KI<2WW-;3Y)Pm`zs

delta 653
zcmXw#Pe>DR6vsdBxy@;1Ik8oirwBTzo10A2QX#ZVGntqxbIdv2$jvofBvD2|N{~jg
z|A+n@#6yQff-ZK6@FLV9@KBwiLr?@A1+m|v@!<P?zxRE-AK&kq_mlTkz#=V~VoP1g
zKxAY%mX24(L&@Qkom!zYJKq}(#l~Y5p~PUt;AlJ*N#+&~<raogkwiFJksKYFNJPeB
zq1-})@bB`Dp;Rb59vaEbk7RyZ&RLp-ZgbyTb}BR;9ji(j3=TwsZlA~PatA%GYOl9?
zso(adsNGsjp(*s2eHnKk&*AY0ERGs~!0Pb%12#vUKalUJ_qYF74`<cJtZKlPg?s}Y
zMr}T6U+OKLSGWE7#^53r(oFLJ@UvhFHpM9i41X1$_zdT<6GUmsRP8FA+{01!(MUNh
z?5CB39HWxscxa=R6V#h|11D*w)2Ll^n7e1`CTTd$X|B<0{tK`|AFBjeV}S33SvS1N
zkZfmIoJ6IE^AaX5GbH2*qq0C!UUOkm-jb3P#^fVu`NBo{!6o^_gsgK}Hn^gNT-6dL
zwT$cP;)d38Q+t@wex^0VEsb$or<l=MX7w(2^f7b#jC;DweSObE{mdi%MwkBNDNbX*
zkAiIKCKmJHOu2p#F|E*`i=w7en)RjRiNz$<s`FwMn@P1zUr4^#u^QJdDUd?!tg2JC
a$X0B|X^m`?A_|OOOdifnIx=&+-~9!;YLmeL