From b798f06053f55a2156d2d110a884494cdaced1ba Mon Sep 17 00:00:00 2001
From: Pellerin Tiphaine <tpellerin@insa-11276>
Date: Fri, 29 May 2026 18:07:34 +0200
Subject: [PATCH] =?UTF-8?q?cr=C3=A9ation=20de=20label=20marathon=20et=20pr?=
 =?UTF-8?q?esque=20fin=20de=20marathon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../algorithm/shortestpath/LabelMarathon.java |  41 ++++++++++++++++++
 .../algorithm/shortestpath/Marathon.java      |  11 +++--
 .../shortestpath/LabelMarathon.class          | Bin 0 -> 1432 bytes
 .../algorithm/shortestpath/Marathon.class     | Bin 5390 -> 5763 bytes
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelMarathon.java
 create mode 100644 be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/LabelMarathon.class

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
new file mode 100644
index 0000000..95dd6ab
--- /dev/null
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelMarathon.java
@@ -0,0 +1,41 @@
+package org.insa.graphs.algorithm.shortestpath;
+
+
+import org.insa.graphs.model.Arc;
+import org.insa.graphs.model.Node;
+
+public class LabelMarathon extends Label implements Comparable<Label> {
+
+    protected double coutDest;
+
+    public LabelMarathon(Node s, Boolean m, double c, Arc p, double cd) {
+        super(s, m, c, p);
+        this.coutDest = cd;
+    }
+
+    public double getCoutDest() {
+        return this.coutDest;
+    }
+
+    @Override
+    public double getTotalCost() {
+        return this.coutDest + this.cout;
+    }
+
+    public double difMarathon (double d) {
+        return d - this.getTotalCost() ; 
+    }
+
+    public int compareTo(LabelMarathon l) {
+        if (this.difMarathon (43)< l.difMarathon (43)) {
+            return -1;
+        }
+        else if (this.difMarathon (43)> l.difMarathon (43)) {
+            return 1;
+        }
+        else {
+            return 0;
+        }
+    }
+
+}
\ 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 7771b80..0f0cf01 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
@@ -16,15 +16,15 @@ public class Marathon extends ShortestPathAlgorithm {
         super(data);
     }
 
-    public Label newLabelMarathon(Node s) {
-        return new LabelMarathon(s, false, Double.MAX_VALUE, null);
+    public Label newLabelMarathon(Node s, ShortestPathData dataPath) {
+        return new LabelMarathon(s, false, Integer.MAX_VALUE, null, s.getPoint().distanceTo(dataPath.getDestination().getPoint()));
     }
 
     @Override
     public ShortestPathSolution doRun() {
 
         // retrieve data from the input problem (getInputData() is inherited from the
-        // parent class ShortestPathAlgorithm)
+        // parent class ShortestPathAlgorithm)@Override
         final ShortestPathData dataInput = getInputData();
         Graph graph = dataInput.getGraph();
         final int nbNodes = graph.size();
@@ -61,7 +61,7 @@ public class Marathon extends ShortestPathAlgorithm {
                 if (dataInput.isAllowed(a)) {
                     Node n = a.getDestination();
                     if (listLabel[n.getId()] == null) {
-                        listLabel[n.getId()] = newLabelMarathon(n);
+                        listLabel[n.getId()] = newLabelMarathon(n, dataInput);
                     }
                     if (!listLabel[n.getId()].getMarque()) {
                         possible = true ; 
@@ -70,6 +70,9 @@ public class Marathon extends ShortestPathAlgorithm {
                         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 ; 
+                        }
                     }
                 }
             }
diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/LabelMarathon.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/LabelMarathon.class
new file mode 100644
index 0000000000000000000000000000000000000000..c854093a559cfbef35c5e499b0731f3ed0d0d994
GIT binary patch
literal 1432
zcmb_a+fEZv6kVrRS_WF7R&Ih-fp$Q~3o$W8qPCit6nud2ei+8-=(N*Jr^ZMBLLZD@
zKw?b1BtG~7ew1;YX)T3{fy9S%W}iKKt$kZRe|`S};6B!qhzP8EzHK<owlr*Cw(4y|
zy0+&#LA_zL>z*H2?Vu%tx>1w+mb)c=+Fmn>n850JkVzy2axdg7X}Gd!8x^n7BH6xc
z35=LtC#W)!fT#*2Hk_stYzjOp)=s8qcn6kiZ1XPHj>sN)o@>cwxq3?cL*Fb{OM3#b
z3Xy3<F{UAfae?jsnWD6pf<RV75+eecn$xtlJB@wI-|hA}QS(gc?n&QK@18Rj)Sb4#
z-J#OYvWGG!M)2GacwkNpX$VaIWnBDY^0WkIPa#l)6Ns1x0;9GSRQh|07E9ceM&GU%
zNVnp(1J!#$!&TLLOl_2y1Lyf4$<SG>ma1t+EooT5JTsFvWrjkqc0GZ6!^=3+5K2!I
z4<5gvrU6BNL&G&(C%r2$wi8J6<(6#qrk&pLI=*Q=ag^>Rj%j*L>4^pHICfJ89iIWg
z&{+Oe&!8fY<h^k|j?FR(>><h%=ZPsTu`gw(!tO@-3XllBS$$=-G#&p2O`l49LFN<x
zMR0-lI2iyX@-bxin&4}bC?JbT<oH$AMdZn=tV@_8Qd!evR@f|NFw4Bknxikl$jg}L
zttv1Wt&nm3Gcq4(bknLJumF`#>jw1F3AOSbc%5yjxU>TETrp2F<OdkieFko|$51AN
zDl)mOf5oDG5<U~c^I=EHe!od9vk&S5MU;9(ui2sMTi0_S)#^(3^X@(3k;CJ@w;vFX
z9Yzls9Svuk52rKFTnn6N0ZY_=5sL%4^?q(0Ym5<`8(4ZIH_5CwX-9Aix5Mw9-{$W?
A%>V!Z

literal 0
HcmV?d00001

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 d377ba03455e6a9f1d750f9dc71910d3ae843d20..7918ccafeb6be6786f7cd1a2d10fe1ce67049e48 100644
GIT binary patch
delta 2605
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
QA)rLc`y{~>W?!zq3Dl%YaR2}S

delta 2444
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