From a68e27f24df96b7bf1a791232c4519133b89c1b2 Mon Sep 17 00:00:00 2001
From: Pellerin Tiphaine <tpellerin@srv-tp04>
Date: Thu, 28 May 2026 17:37:06 +0200
Subject: [PATCH] factorisation de label, labelstar, dijkstra et astar

---
 .../shortestpath/AStarAlgorithm.java          | 101 +-----------------
 .../shortestpath/DijkstraAlgorithm.java       |  72 ++++++-------
 .../graphs/algorithm/shortestpath/Label.java  |  50 +++++----
 .../algorithm/shortestpath/LabelStar.java     |  22 ++--
 .../shortestpath/AStarAlgorithm.class         | Bin 5602 -> 1381 bytes
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5428 -> 5300 bytes
 .../graphs/algorithm/shortestpath/Label.class | Bin 1528 -> 1742 bytes
 .../algorithm/shortestpath/LabelStar.class    | Bin 1062 -> 1067 bytes
 .../main/java/org/insa/graphs/model/Path.java |   6 --
 .../classes/org/insa/graphs/model/Path.class  | Bin 6412 -> 6412 bytes
 10 files changed, 77 insertions(+), 174 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 c659b75..b1f515a 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
@@ -1,14 +1,6 @@
 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 AStarAlgorithm extends DijkstraAlgorithm {
 
@@ -16,94 +8,9 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
         super(data);
     }
 
-    public LabelStar newLabelStar(Node s, ShortestPathData data){
-        return new LabelStar(s, false, Integer.MAX_VALUE, null, s.getPoint().distanceTo(data.getDestination().getPoint()));
-    }
-
-     @Override
-    public ShortestPathSolution doRun() {
-
-        // retrieve data from the input problem (getInputData() is inherited from the
-        // parent class ShortestPathAlgorithm)
-        final ShortestPathData data = getInputData();
-        Graph graph = data.getGraph();
-        final int nbNodes = graph.size();
-        // ArrayList<Label> listLabel = new ArrayList<Label>(nbNodes) ; 
-        LabelStar[] listLabel = new LabelStar[nbNodes];
-        BinaryHeap<Label> tas = new BinaryHeap<Label>();
-
-        // 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(data.getOrigin())){ 
-                listLabel[nod.getId()] = new LabelStar(nod, false, 0, null,  nod.getPoint().distanceTo(data.getDestination().getPoint()));
-                tas.insert(listLabel[nod.getId()]);
-                notifyOriginProcessed(nod);
-            }
-        }
-
-        Label xl = tas.findMin();
-        // iterations
-        while (!tas.isEmpty() && xl.sommetCourant!= data.getDestination()){
-            xl = tas.findMin();
-            //System.out.println(xl.getCout());
-            Node x = xl.getSommetCourant() ;
-            notifyNodeMarked(x);
-            xl.marque = true ;
-            for(Arc a : x.getSuccessors()){
-                if(data.isAllowed(a)){
-                    if(listLabel[a.getDestination().getId()] == null){
-                        listLabel[a.getDestination().getId()] = newLabelStar(a.getDestination(), data);
-                    }
-                    Node n = a.getDestination();
-                    if (!listLabel[n.getId()].getMarque()){
-                        final var c  = listLabel[n.getId()].getCost() ;
-                        final var w  = listLabel[x.getId()].getCost() + data.getCost(a) ;
-                        if (c>w){
-                            if(listLabel[n.getId()].cout!=Integer.MAX_VALUE){
-                                tas.remove(listLabel[n.getId()]);
-                            } else {
-                                notifyNodeReached(n);
-                            }
-                            listLabel[n.getId()].cout = w;
-                            tas.insert(listLabel[n.getId()]);
-                            listLabel[n.getId()].pere = a ;
-                        }
-                    }
-                }
-            }
-            tas.remove(xl);
-        }
-        
-        // when the algorithm terminates, return the solution that has been found
-        
-
-        if (listLabel[data.getDestination().getId()].getCost() == Integer.MAX_VALUE) {
-            solution = new ShortestPathSolution(data, Status.INFEASIBLE);
-        }
-        else {
-            // The destination has been found, notify the observers.
-            notifyDestinationReached(data.getDestination());
-
-            // Create the path from the array of predecessors...
-            ArrayList<Arc> arcs = new ArrayList<>();
-            LabelStar nCourant = listLabel[data.getDestination().getId()];
-            while (nCourant.pere!=null){
-                arcs.add(nCourant.getPere());
-                nCourant = listLabel[nCourant.getPere().getOrigin().getId()];
-            }
-            // Reverse the path...
-            Collections.reverse(arcs);
-
-            // Create the final solution.
-            solution = new ShortestPathSolution(data, Status.OPTIMAL,
-                    new Path(graph, arcs));
-        }
-
-
-        return solution;
+        //@Override
+    public LabelStar newLabel(Node s, ShortestPathData dataPath) {
+        return new LabelStar(s, false, Integer.MAX_VALUE, null,
+                s.getPoint().distanceTo(dataPath.getDestination().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 d2c8137..1ae3391 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
@@ -16,20 +16,18 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         super(data);
     }
 
-    public Label newLabel(Node s){
-        return new Label(s, false, Integer.MAX_VALUE, null);
+    public Label newLabel(Node s) {
+        return new Label(s, false, Double.MAX_VALUE, null);
     }
 
     @Override
     public ShortestPathSolution doRun() {
 
-        System.out.println("on est dans l'algo");
         // retrieve data from the input problem (getInputData() is inherited from the
         // parent class ShortestPathAlgorithm)
-        final ShortestPathData data = getInputData();
-        Graph graph = data.getGraph();
+        final ShortestPathData dataInput = getInputData();
+        Graph graph = dataInput.getGraph();
         final int nbNodes = graph.size();
-        // ArrayList<Label> listLabel = new ArrayList<Label>(nbNodes) ; 
         Label[] listLabel = new Label[nbNodes];
         BinaryHeap<Label> tas = new BinaryHeap<>();
 
@@ -37,9 +35,9 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         ShortestPathSolution solution;
 
         // initialisation
-        for(Node nod : graph.getNodes()){
-            listLabel[nod.getId()] = null ;
-            if (nod.equals(data.getOrigin())){ 
+        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);
@@ -47,54 +45,50 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         }
 
         Label xl = tas.findMin();
+
         // iterations
-        while (!tas.isEmpty() && xl.sommetCourant!= data.getDestination()){
+        while (!tas.isEmpty() && xl.sommetCourant != dataInput.getDestination()) {
             xl = tas.findMin();
-            //System.out.println(xl.getCout());
-            Node x = xl.getSommetCourant() ;
+            Node x = xl.getSommetCourant();
             notifyNodeMarked(x);
-            xl.marque = true ;
-            for(Arc a : x.getSuccessors()){
-                if(data.isAllowed(a)){
-                    if(listLabel[a.getDestination().getId()] == null){
-                        listLabel[a.getDestination().getId()] = newLabel(a.getDestination());}
+            xl.marque = true;
+            for (Arc a : x.getSuccessors()) {
+                if (dataInput.isAllowed(a)) {
                     Node n = a.getDestination();
-                    if (!listLabel[n.getId()].getMarque()){
-                        final var c  = listLabel[n.getId()].cout ;
-                        final var w  = listLabel[x.getId()].cout + data.getCost(a) ;
-                        if (c<w){
-                            listLabel[n.getId()].cout = c;
-                        }
-                        else{
-                            if(listLabel[n.getId()].cout!=Integer.MAX_VALUE){
+                    if (listLabel[n.getId()] == null) {
+                        listLabel[n.getId()] = newLabel(n);
+                    }
+                    if (!listLabel[n.getId()].getMarque()) {
+                        final var c = listLabel[n.getId()].getTotalCost();
+                        final var w = listLabel[x.getId()].getTotalCost() + dataInput.getCost(a);
+                        if (c > w) {
+                            if (listLabel[n.getId()].getCost() != Double.MAX_VALUE) {
                                 tas.remove(listLabel[n.getId()]);
-                            } else {
+                            }
+                            else {
                                 notifyNodeReached(n);
                             }
-                            listLabel[n.getId()].cout = w;
+                            listLabel[n.getId()].update(a,w);
                             tas.insert(listLabel[n.getId()]);
-                            listLabel[n.getId()].pere = a ;
                         }
                     }
                 }
             }
             tas.remove(xl);
         }
-        
-        // when the algorithm terminates, return the solution that has been found
-        
 
-        if (listLabel[data.getDestination().getId()].cout == Integer.MAX_VALUE) {
-            solution = new ShortestPathSolution(data, Status.INFEASIBLE);
+        // 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(data.getDestination());
+            notifyDestinationReached(dataInput.getDestination());
 
             // Create the path from the array of predecessors...
             ArrayList<Arc> arcs = new ArrayList<>();
-            Label nCourant = listLabel[data.getDestination().getId()];
-            while (nCourant.pere!=null){
+            Label nCourant = listLabel[dataInput.getDestination().getId()];
+            while (nCourant.pere != null) {
                 arcs.add(nCourant.getPere());
                 nCourant = listLabel[nCourant.getPere().getOrigin().getId()];
             }
@@ -102,12 +96,10 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             Collections.reverse(arcs);
 
             // Create the final solution.
-            solution = new ShortestPathSolution(data, Status.OPTIMAL,
+            solution = new ShortestPathSolution(dataInput, Status.OPTIMAL,
                     new Path(graph, arcs));
         }
-
-
         return solution;
     }
 
-}
+}
\ No newline at end of file
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 8af88ad..88c00b4 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
@@ -3,44 +3,54 @@ package org.insa.graphs.algorithm.shortestpath;
 import org.insa.graphs.model.Arc;
 import org.insa.graphs.model.Node;
 
-public class Label implements Comparable<Label>{
+public class Label implements Comparable<Label> {
 
-    protected Node sommetCourant ;
-    protected Boolean marque ;
-    protected double cout ;
-    protected Arc pere ;
+    protected Node sommetCourant;
+    protected Boolean marque;
+    protected double cout;
+    protected Arc pere;
 
-    public Label(Node s, Boolean m, double c, Arc p){
+    public Label(Node s, Boolean m, double c, Arc p) {
         this.sommetCourant = s;
         this.cout = c;
         this.marque = m;
         this.pere = p;
     }
 
-    public Node getSommetCourant(){
-        return this.sommetCourant ;
-    }
-    
-    public Boolean getMarque(){
-        return this.marque ;
+    public Node getSommetCourant() {
+        return this.sommetCourant;
     }
 
-    public Arc getPere(){
-        return this.pere ;
+    public Boolean getMarque() {
+        return this.marque;
     }
 
-    public double getCost(){
-        return this.cout ;
+    public Arc getPere() {
+        return this.pere;
     }
 
-    public int compareTo(Label l){
-        if (this.getCost() < l.getCost()){
+    public double getCost() {
+        return this.cout;
+    }
+
+    public double getTotalCost() {
+        return this.cout;
+    }
+
+    public void update(Arc p, double c){
+        this.pere = p;
+        this.cout = c;
+    }
+
+    @Override
+    public int compareTo(Label l) {
+        if (this.getCost() < l.getCost()) {
             return -1;
         }
-        else if(this.getCost()>l.getCost()){
+        else if (this.getCost() > l.getCost()) {
             return 1;
         }
-        else{
+        else {
             return 0;
         }
     }
diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java
index 5287342..2192ea1 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java
@@ -3,22 +3,22 @@ package org.insa.graphs.algorithm.shortestpath;
 import org.insa.graphs.model.Arc;
 import org.insa.graphs.model.Node;
 
-public class LabelStar extends Label implements Comparable<Label>{
+public class LabelStar extends Label implements Comparable<Label> {
 
-    protected double coutDest ;
+    protected double coutDest;
 
-    public LabelStar(Node s, Boolean m, double c, Arc p, double cd){
-        super(s,m,c,p);
-        this.coutDest = cd ;
+    public LabelStar(Node s, Boolean m, double c, Arc p, double cd) {
+        super(s, m, c, p);
+        this.coutDest = cd;
     }
 
-    public double getCoutDest () {
-        return this.coutDest ; 
+    public double getCoutDest() {
+        return this.coutDest;
     }
 
     @Override
-    public double getCost() {
-        return this.coutDest + this.cout ; 
+    public double getTotalCost() {
+        return this.coutDest + this.cout;
     }
-    
-}
+
+}
\ No newline at end of file
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 b1c3b34c63fa92ac8c4a9e5de1d90d8c194a7bd0..a9c223aa42b82be3b45d215da66bb6539db4261f 100644
GIT binary patch
delta 134
zcmaE){gg}K)W2Q(7#J9A87$Ztm>3yMCr(t~XdcAK%aNB_?vt35n#0J@sWDlRRebYC
z#_dd;94Uz<i2;cv8Iue7m3bHx85kLuf!Y}um?ppA*JkBlU}fN(EFqxDm^#@>z<{3*
gEX&Kl%fQDV&A>akQb3X4l!2dt38>Euq>I5E0P@osrT_o{

literal 5602
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
K@Grc)%J(0n+A_WX

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 d3ea5d3e50bea764e9e9a795ffbc680d8b51aaaf..ae8c7e30f479ca6a9f09a1e6a0eb448f11dd96e2 100644
GIT binary patch
delta 2291
zcmZ`)dwf*I75-+kyL0c|$!3$7kQ<UflLE;m5D3P=5*{H5keGxB6dDlAWwStZlMTB!
zDA;xz+uACvQl=J(4~#{ltrZ_(1Ex^u3!&9&TW#r6TU+};E!JQEsjxk>3BT>H*8O8=
z&YAQ0zH`pZ9rce^_|9E^?j(T4c#p%uus~j9vt&KXetK1jqtJJwwacmwTYcNBn<4{S
z!y$M4on-1K2OZBF1{h`v%tE<*J7cx(M-@jUL!ErtQ|A(xjXCl*XSF^TH5~I8rpjTK
zFJE%<{Q0<=!5Qn>6Jp3HuV~@8hQUv%3uQ9XS7@LX3j|zPm^xl>U@jI3)MK%n=PE5)
ziUy8l4BiyF0lOz$-PRMc1(u^xMqD$eH)AEo3Wl7tL5m%VT6QEVunH~msB60OT82Ub
zR9Ix773~5Y3X^Ml$ZqL2;76yxbyy>_+|^nu)(LzJ>*We}nO2LB3v^+l-07}xUoWs3
zH^_(F^`*_&B4A-F1K(lAIzqSDDeM~+mu`U&w#m!nu|uGT!p`PX%5D+};|2y_U&QX&
zw!0(J9cs6tH-)-&<e*O=f_}N3f25=pggS=B44H&(?LaUXip3()7{>sEscM?p5DhBK
zHw)Z?-SRB2)@<A=@JX!MujTnZE#O18K~X;=Fo@ga46S_0=L9~l(2A{*NH}Emt+&Dh
zA!YLgfiL0?I-q3hBDNK7jKn6mG^reW1-^tY%Ry~+XAbUG!X1j@R|NKBBZE5{>W%E8
zKn!0MxJU8JPV-w6vVuE8RNovN5V#iy$zh<s+p=j6rj^T!+SK}{3Tk&P?i08_Rm`4P
zb8o-BTh-)2fkP;zGQ=Xiy&=0XG7z=;Yz698j)xf*(cI0K%Q7^Nj>CAA;}M2=siC@{
zPoa4n!DI5Y-mDGd8)~?|DZR!n_qPO|q!!+36wiE$AvZlS4biBzTg{b$BUqpyKPxbb
zqw)o#s`v=T1dd@n_1NkrJ~lcP!f}Cb<Ai)un^pE5oaQ*ike80w7zu|%LAxi?7Zdm{
zz9;8-N(&C-2LeCDV>CCbJJ+?eH?(m)KQWs5-cHNjVc-nTDZD?DcYA6*!+1dnFEZ?v
z*+#Fd7t;-$DrmLz^$*z3ZWN7-HOZmOx16sq%-QcOmKSuNdy#6$Tk@p0-udp8n?`zB
zo^^WjDd;pGa7^_lFr%$9fr|F31ge)5pFmE)IgZ+{G1LWIqzfF!5{7^_f(}zVjwXgv
zXbo`FY4QZx*jkg5_v!@J9>nZPrR?w(#M^2T*x*-2o0Q)t7>1Hhnyv(brziy<!N1ai
zvf3Wd{HB(`jV5;<!&OJotE8P1*^Ln-Ok*;;9ndRHJ%L>ZF|5`-0S_hi5Sp4Z$e!HB
z{YvwxwO39Oh$rybA@rvew=WbVP!a|8_Eg9_gA2U{qQHCLL99$0-gOm<4je?T=}PPN
zjX+POkXLl3Uf@mOYm-LtRMZU$bc*^4(i6*liuBMBvP?dT2dHunJ$m_l)2TKSI8wQW
zkUNgyuF7Zd^)WmiaF1ZCf5PO6aU7x6JRQ)|P62%cC8nlI@k|1V4FpI}#MS<|iW$&N
zeH71~Nxo)k$8d5o@b|}YrmM=-#&C8FKMuG}_fzymaKfPf7crmyi)iACNiIParXdg0
zX*UxK=;d!fIoeTyZn}j#QHh&LKZt7VMGfvE-+OU2;)m!$KZ0xMqSfInx&0IiaUKD@
zfkk+i9<~e`D<77!kJ77Ng$A|+%h|PPWF2T`>#&jqv5NJhj_pA^8$=De2iLL3v4+v4
zvEy_JPos;Squ1wEY+~neJ$nP2*?Y8qA6py@!MH<5w<8xpM*+6MLwue<wi<W{WRm1^
z<l`sAjKOeZ<0ZTd2eKT3VEzml$aA>ybG$<JC}EfIDt-YMCC<PviGrIVPVR`-Qv3>~
z;MmLd;n(;L?GE7&_$}h4(1`a4euoou*UsYreouxT;=Bc~;dKaN-bSXc!%I9m@JFhQ
zMr@YjPZUPSp9y3>ftmpDCIOhR`U}PVE1g}0H;F3f9E`)yF_)IVaVk1NXa?f{Mr)D+
zXdgJ|^kyN6Iq>|yBTgU2RDdKkQGAF6hfOxh6qm3mBg2)%)c*<Br=U=(|BC1PFfh4g
zmoSav2$>fqQT9PIj^Pw)Ujv=~oqEQp05fQ1s+07DU63rVXv*6pIq(ktL92TE4pWi-
Hxy<|z=@t-(

delta 2437
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
CqcZ^j

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 47de11380b6801f7e9693d2ba9d9c535cfb32e76..28229599e10afba31a3add9ec3efb6d10f450598 100644
GIT binary patch
delta 355
zcmX|*%}N4M9L3MQGb1=NT5S^4W`q))8A#K#PZyCd5LEktq>W(ExC`0{uH$Z6^av4%
z=%PimEvR0nP0?|hTHOEl`JMY|y=TnV@5d(qZM4VcmCW1c-RQU<g}uZ6Wh9UqT%3hb
zSHP{@d=#{fcdCZ6BO2;OHdEU+YS>V^_8`)ei8d1IOD|uS;gDxTFdA@CVis6Om2rvn
z5j5z`mLE(}@GDc~#%v{47_(dg9)&(k1Tm@<&#VMRA=Y>|$6HvXkz~z(BzU(+y5!RF
zXQ&5!w|6k){a>d-BX?4ztVT#3c{ET&D>hpG)%_be*yQg8nxv7L%`6^J)k=&!UeA5f
We((%2!<Kq8iVHiONbF)S&ig+ILoql2

delta 206
zcmX@d`-7Y7)W2Q(7#J9A8LT#P)i6yyz~sbeFqxUzl+BcfL6<>qvK{j}M)u8bncEo|
z^(G6l30v!HZ)4D(F^7SbX^j?;1>#Mg$H2<6hItLp9A*YtASuSc3M5q-co@_e_!u-8
zq!=_AWEgZN$Fqq?7&0g@Fftec<yjb*_;>{zfz}uUMFfE&nhZ=p$iTp<rG0>baT|jP
c$Veuzk!(OE3_vUg76FNxfm!AZ7GT;E00o>L`Tzg`

diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/LabelStar.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/LabelStar.class
index a4e37d870c40ffcecd587c5865bc0b05c998d4c6..b8c94ce2e507981e4f442e5c195a5c559b79c0f0 100644
GIT binary patch
delta 22
dcmZ3+v6^FpGZQCIdTL2Xeo11^W_PChi~v+=2aEs!

delta 17
YcmZ3@v5aGbGZPDYdTPmLAEx_^05Q%5g8%>k

diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
index bef549e..fe3a2c1 100644
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/Path.java
@@ -60,7 +60,6 @@ public class Path {
             }
             arcs.add(chemins.get(index));
         }
-        // TODO:
         return new Path(graph, arcs);
     }
 
@@ -108,7 +107,6 @@ public class Path {
             }
             arcs.add(chemins.get(index));
         }
-        // TODO:
         return new Path(graph, arcs);
     }
 
@@ -262,7 +260,6 @@ public class Path {
                 return false;
             }
         }
-        // TODO:
         return true;
     }
 
@@ -276,7 +273,6 @@ public class Path {
         for (Arc a : this.arcs) {
             l += a.getLength();
         }
-        // TODO:
         return l;
     }
     /**
@@ -291,7 +287,6 @@ public class Path {
         for (Arc a : this.arcs) {
             l += a.getTravelTime(speed);
         }
-        // TODO:
         return l;
     }
 
@@ -302,7 +297,6 @@ public class Path {
      * @return Minimum travel time to travel this path (in seconds).
      */
     public double getMinimumTravelTime() {
-        // TODO:
         double l = 0;
         for (Arc a : this.arcs) {
             l += a.getMinimumTravelTime();
diff --git a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class
index ba95b9d44479453a13a991d47b41c35f33071679..f515e6b28b2f29e716b9ce0ebe31bc84a110cb4e 100644
GIT binary patch
delta 459
zcmWNNO-R&n5Qd-GHb2PJ|L*=%D^xTIVf|VJBZ4T1G$KF3kJ7|MO+gC8Q-xZTVJ?aM
zx+$o2G|Sk7+IA5-bP%jVg{OiJ1syylO5uB%cjjT{onhj!cx*YDVP_NXGiC#$S4g8C
zj|Ps?#0joaLo;V+;S#NiZQS4*eOzadb{^5ew8#vdET~@OCJDMp(!&P5Y^w7MxA;Rp
z+YFe|XW0x|G0j%VZA~JN!(gX5ND3srWo=pGT^098=RSv|S&Wd!DEW+0&I4jRq*{7P
z>>Q7&V_auE(YkT&Frn_JqLa$vijz$7%vtEOH%E|pxh{~&3pu`YKSS-_qUbBpCDGTS
zZ(MzN%v%v%6<rg3N0g-d5q7rj-bQ>k5jklel{ML>3;GxBtGn!<x9@JsZ?)g<m%m!|
zmsEB%y{kv=5#}Fd{HMa8S}(X@0ov>UT^6KUY}iuWrz6u|HUaa<vk-;SQj55uoabJ?
gXaUEqkP>Ny6}g<;SuZMD#xX0WNE)?D_aV1-AIkD%G5`Po

delta 459
zcmWNNPe{{o7{)*E+|<glpW9DoMT9OSu&g;uqC*AI9|W7lT$vSyT2U0?v2>M@(#*!U
zTVCwXNi@eU+U!)P2+BiLH={#P2hWL7&*^!e5AXB5@Mh!L_-wJl4ipwDCIUn4lyd@)
zB%3%%j8p6-#eO<DPFmAxx;aB1U0mfX!*V&!@s#sS%1_Zlfr}LB<%709($8lu@teym
zbH$8)+sHMmCuO_2p)~4P54MjGrBL`%`OT8IWNx#DLDoqt$xzE3wsMzU+#{|?LfR^J
zkOv%NM5jk}a)j$VR4U7T#zY>;jWNz+XH|>dBtf33^*I}Op~jc)M^%?MEjlCmN_18<
z@7lu|Z(j7ZXi;>5M&7uku(P)=AMxF2q`}^6>aax@^pDtA*XAFx?{3`hv|sM0Key)(
zWvnQ@sz?4M%s+M-G+BUzm2lXCq%Fh+E2T$lz}C7?)j2Orz#`O|&o=1}i@KXNPrN$O
fdbU`M?b0S|a5d2hFD}~5W=l{fZL}8mE_(Do@ylcb