From 07e85edc3caca47f88204526c74b93f18c2726fe Mon Sep 17 00:00:00 2001
From: Pellerin Tiphaine <tpellerin@insa-12634>
Date: Tue, 19 May 2026 17:54:09 +0200
Subject: [PATCH] =?UTF-8?q?fin=20de=20Dijkstra=20et=20A=20*,=20avanc=C3=A9?=
 =?UTF-8?q?=20sur=20la=20classe=20de=20tests=20Launch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shortestpath/AStarAlgorithm.java          |  30 ++--
 .../shortestpath/DijkstraAlgorithm.java       |   3 +-
 .../shortestpath/AStarAlgorithm.class         | Bin 979 -> 5602 bytes
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5406 -> 5428 bytes
 .../org/insa/graphs/gui/simple/Launch.java    | 141 ++++++++++++------
 .../org/insa/graphs/gui/simple/Launch$1.class | Bin 1292 -> 1292 bytes
 .../org/insa/graphs/gui/simple/Launch.class   | Bin 4691 -> 6740 bytes
 .../main/java/org/insa/graphs/model/Path.java |   2 -
 .../classes/org/insa/graphs/model/Path.class  | Bin 6437 -> 6412 bytes
 9 files changed, 114 insertions(+), 62 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 f15c7a0..c659b75 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
@@ -16,10 +16,13 @@ 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() {
 
-        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();
@@ -30,20 +33,19 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
         BinaryHeap<Label> tas = new BinaryHeap<Label>();
 
         // variable that will contain the solution of the shortest path problem
-        ShortestPathSolution solution = null;
+        ShortestPathSolution solution;
 
         // initialisation
         for(Node nod : graph.getNodes()){
-            LabelStar l = new LabelStar(nod, false, Integer.MAX_VALUE, null, nod.getPoint().distanceTo(data.getDestination().getPoint()));
-            listLabel[nod.getId()] = l ;
+            listLabel[nod.getId()] = null ;
             if (nod.equals(data.getOrigin())){ 
-                tas.insert(l);
-                l.cout = 0 ;
+                listLabel[nod.getId()] = new LabelStar(nod, false, 0, null,  nod.getPoint().distanceTo(data.getDestination().getPoint()));
+                tas.insert(listLabel[nod.getId()]);
                 notifyOriginProcessed(nod);
             }
         }
 
-        LabelStar xl = tas.findMin();
+        Label xl = tas.findMin();
         // iterations
         while (!tas.isEmpty() && xl.sommetCourant!= data.getDestination()){
             xl = tas.findMin();
@@ -53,14 +55,14 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
             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()].cout ;
-                        final var w  = listLabel[x.getId()].cout + data.getCost(a) ;
-                        if (c<w){
-                            listLabel[n.getId()].cout = c;
-                        }
-                        else{
+                        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 {
@@ -79,7 +81,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
         // when the algorithm terminates, return the solution that has been found
         
 
-        if (listLabel[data.getDestination().getId()].cout == Integer.MAX_VALUE) {
+        if (listLabel[data.getDestination().getId()].getCost() == Integer.MAX_VALUE) {
             solution = new ShortestPathSolution(data, Status.INFEASIBLE);
         }
         else {
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 148f74e..d2c8137 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
@@ -40,7 +40,8 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         for(Node nod : graph.getNodes()){
             listLabel[nod.getId()] = null ;
             if (nod.equals(data.getOrigin())){ 
-                tas.insert(new Label(nod, false, 0, null));
+                listLabel[nod.getId()] = new Label(nod, false, 0, null);
+                tas.insert(listLabel[nod.getId()]);
                 notifyOriginProcessed(nod);
             }
         }
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 7bb818f1172c677ada65633423cb6e597336b904..b1c3b34c63fa92ac8c4a9e5de1d90d8c194a7bd0 100644
GIT binary patch
literal 5602
zcmcIo33wD|8GirGF}s@~gm9QGkbpqRK?$TqV8a!X0MR5MfgluUC%Z$ku-OT-vp}dv
z6>Y_{+A0z)^=KQ9ilxE^8mM@pt<_rZDz+ZA^=hqGwY9|epV?%ST{cFZ$A^dHpPBD`
zzw7_<@TCVI0<awaR^Sp?WSH%hp-5D#Y&W&8j%cM8Za2)3)zMiQ?J!JBk6K-t)lpf~
zVrgd0;5P-?0!zloS{K^ACu*765Vt_?vQQ*stq@pN+BiljEeUHj(3(2U(yGf^1+r_6
zpzcK$JSuXKD=@w>6w#Ywoo%|gNox!10)>r6Knu5OW=K9KUS?Yzp{T&(u__<weKi#a
zX@bDgu?k4DUO<iL`x~`3JuHzGIGm0|C!GsdHuGoo73(P*E9a0Y)e0sGEEr>0hS<EA
zj8`d`A~0dMwoj`JYmxTK)rJw)wTOx$_ym-FS~#Y!-z6}mbX!?t8W}ZD9l_oZvGjJ`
z%&mEHU|`@p;6({$DwrW~RjPSOtW>-jvjp7jy0yUwMJ$1m(sUFYdYhoyi#eF9;A$pB
zs@M$GkQz=Er6?1~r_MT7OemsRAtNGCoKdqKRWB-Vje>asQ&SZWvrol*R0?>5p{S)r
z0{SLHU`D2FaXc!k^P&(7Wl>ZKtj|R3q*i(y>e7<NF{j21RM*M66D*!-8HjA50y#lr
zV~h~2ybJ_mK()mP$0UXf4m*vCrSP+4h;KurD`v?CAW(f}qV4V>W4=sf8)Orbsj^mf
zztK{~CZIK|uv$S)#)#QuDr!;3CJ_xCWCzMBEo)G)MxZ=3$VnXNYdBiDnu%j}uhX?I
zFY2*QhOfcqZ<Tsqr=k%}j=2(K#-NZ0*x{4>m5of0>O8E+>lJKZHjezFVk26}9kO&&
zvkbPJDI>TW67MNtGqxyTm<y8<2EVF!1Gdt&h<<>THEB?SUG3}JcIyF)7?t397272Q
zIWl5F3HDAEH^>_C@XdNN)E<gRI!#3z0vrhX-k27qN0Up3^@W7MvTYI$UBxc6la$j+
zH>un=oV3>H?9xox;yD;(&V*F##vTfc7*=Rkx1(}{X$16WR1eBXkCwk>trCS!6%nx7
zlnyQ0Y&*<Y+Q#fvVS?r=yF!s*Q;2z9Gy;lY<|v2>%*!155o6YFr(Rgtui}7&tAKE|
z7@eKERcpjdEn-RE4yw3G`c~lhCX=B_Gxz904>{kY;>~yqaq85}y)owB#9@dg8nPXu
zx2kxX%%^cuMJynJG0dofw-ee_bBF3*hVm8_x8j`)Whhz`4jcO=oW+^ols!XYb_jE&
z>F-uifC;iYy;sHi@O~#DXuWOf<Pjhyjh&1SsQ91^h1%wflvX)Pq?kKYd<Y+AB<Mx0
z5oKO5Mr?m`@Dcgt=zlY<&O;#|Rq-+0$+Qj_F-j2Rug6^~K5i$RsdpOts7&CKDn2EF
zpO6H8qpk%yB=Uv0N5#G9rIaq+B<@o)B$z}*%Kwat&)V4)iq>~_S=};t_o?_iu47E1
z!(*=C3+#5OF-dlh5h*l$HVt-B4^H5V3LX$xm|03qo4ln3m~Kw%oz07h6^p7kiBlXu
z4b5xnYg!ssH`WVWo90^5m<(d*@^SRZmUddeNY9p}fQ;VQjr$5TI}PDM75y@HMNaI7
z&FMr46`W(SBwJpMX=>fFr+RS~>twE-SMg<h#mTh|c8sSpVN($usuj9?7GG2Gb=l#v
zv>^N7A?)<xn|N5kx7eDJx@wJZn7xw&k9a?VZ&Qb<@6*kwtlvbROZND(RvFOmsQ9jo
zjIw^iriP}PMg`x?crlW<W-lJY_hkTn!0TOl035TOF_$`2B!b8BBgy<@)^IxW|1o+Q
z@Rc6fJ3vmmGrFf|Aapz;Op&(4)D#@5o-hMzcUxxj^=Ygb{299Kas|k;G!B4yqp+q9
zbuzi5iQ*DiJ_={X5*VyasXt<{@460z1?G=clx;tG#R2~34N7ou2_~o5&#tAJ0Xcw&
z#eS#)q~(#s01~MBpVZ0qhWt}T?qS_sgS*)FQKY3JxNH>K5tuoSuAttk%lVToCt0+T
zX&j9X>}k@v?0r$eMPhuJN>64<YSUxs3;bQhBD{vJvxTEOpsxwZeRSf;U2?wc0UT=$
zk%(^AhBaPJID%gq^|F|%jI-Wp)tE`GS={b{Y@WCg^QXe66>#w%kXv5S2lok{TwJE)
zLM7i8ka7a@c$(r+LB%*ekskRNPZ_*wkiwC*10GvPNk0m=R%D&Vq)C`2D&i=f7sqV=
zile*_3+^YoqeL13OtKZsa9D>Fl;B!iXMZoTRk?U3W{#@tXUS7QF)PdC+|{X~x`{eg
zu9$ufh5qb*)Nk#>T7M4Tz4i>61^n(_?C`nIV3WXkl=u~2woi#;n`rSV<lYg-jYqL8
z@lu-aQ>6X*LQ)lzB58h$FDF4)6-TgK5_Cw(thSzkyL>rube)IgS9(QW@<CGV^SjG^
z?l`)AN;YMm!W-q&&5nKEUOeLSChR-p_f+^ialGRw;?%{{VcJ@C0Y%BDa{DzcdsmBn
z^5^keo+OLoJ#pODgPW2sZeObMf!gHP+ilrL0!#CY)S~<&$FOmb@FaQ|u_H$@(e^PR
z?N~27<x=z~2I-3OPoZZxNpSFs&vOcQOFwKh7LtaJACowIx(DNZ%1L~VCeOb2(lfqn
zc}Q3!wf10QKaOv$cmVhJA@0xZMO(Q;a;6_=8PA9O?j)1n(~DxCTe|+GIKH}t1~|uW
zNRfVz&vO!YUl@4G=RS=K3AvB<<FT#teC|Fx-iIIhbA7oo6|?Ppf1Jq%Ok=)J=W{W0
zdj|h(F_WjcSi&8?24!eMIig(5Z^k^_!uPjf0eVn{JDIAzOwQv>&y!e;bL995_tIa&
zkLOV>vawv`ah;rom7)x*#By$l^;j*opjHIA3$>$ObYiVIh;`yt?sa!yi8#iry@xBh
z%!o&^Sv<k5>mv87r?Fi;haKW2>=duy2A3N*x{9#VH3I?H9PDykgLc<q{$7SXc3IuW
z>SUQD$|}d@Pt>i~wTL$Ul!Z9nwE$1xXDq+Tu5$bw7l}x*YbJhyCy_(FS$K+`<Wged
zMDLpME8?Y~hc^Bizv1aPUc}RU=cd%N_$~49(C5Q=hVSy|^&UJ+oK*V01;67dpI$WM
z_xJ<c^kp^vh(ED=JjWQwPUGl*p86fCKU3}t{PqI!2ME4Lflx3<A(jgMqVUE{3pN8U
zW9tC<-D#f{UZ63+zn0`(?vuiG)8-#w@G?;-IAqgYLL2F`vT_D+bw=VraRr%dnK<he
zlqfi>pzx{z%t|LCqPEcmHB79(I$e*Oi)^?+4!hppQroDo<1M?k3;(cxzKDPFx12X8
K@Grc)%J(0n+A_WX

delta 377
zcmaE)eVJY0)W2Q(7#J9A8RXa*m>3yMCr(t~Xdc8kIfKQco}EFMk%2!eu`E$PCowNw
z-?gYHzleiDl#yXVXkJljaehu&YKlT~er`c#PGU)Bex5=>QGQZRYHqQW0vBgUWkIS!
zZf0?AVo7p_l|pi2US56)P<38eYEg+oT2X$kf=^;nYK}rlK7<iml30YSEszv_Tns`C
z;yetj3=)hCq8dI3M+cV_W#*+@Ylbm0=uIwUk)3>-OMu&&i-D0rnukGvL2z;*zcLSl
zB9PAv3<m}V=E*PkBmGT)JVqdoYd3>Xq>#vV2C@A>9uor>kYoeP=rM2u**p+cK$@3<
mLBJ7cpd?U)9Vnv;q(LUIYHeeXn!H|Aij$E+2FPb(kOcr5DO#}r

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 aa80bbea14ad1ddab09b15f65aaaa43c29ffd180..d3ea5d3e50bea764e9e9a795ffbc680d8b51aaaf 100644
GIT binary patch
delta 501
zcmXYtJxr5f6osGrew4NXZLN*w8*G4qKw}fNmOsTJ%1^405C_GO;7^30ppye(XyWGN
z@FfzBAuh@y#waNeCME|a1|z6|fFPhq!oUIsZiVSR@4YAIo^$#mLy`BZe(yiL1i;ig
zoBo(IIYoi|c+}3a-Dz%&5p1#D)(9b=3=_U;yABqo)7*_@D4n)vly2e0?z@lo1E0j2
zrOb&3OHy5&pob_aih05*9AZ4<46i6<fHDRtCrt&DRPvRxtZ<GUs>I^Fgh)sM)e`4|
zR8b>IE=nV{(ng(hQ7;c^kVhotF_+~jSL7uX@`h#^Bqrlrlh0gF$pS61M60aRCR^Mz
zhFiwPZ4=;*$yZ!VyNS|i;@mR{eJ}BV9N;a7Gi{Jdp8oPoB|iKJL1lhn3d1pTl4&(<
zaoj}s#&@zPG6l>qi%aiX%#r#*wn}E8BC1I+Pa$p`8DfD&MFWz}Pn~(Rg9(;+jaSn@
zXIW=Cn!lG{^pUGAbZ9$$_%ucntE}PCFg5&E6)%6(<WV)XZ(v;w{AV5FuL^JIa?_bV
M61KKUeh7tS4*`*D#{d8T

delta 505
zcmXw#OGuPq6o#Mkjr#wCIyb}|VMKzF91LTebe!^<8WyA=s8Of|gU&*NcHv?cLaP?R
zK$4(4UAa&cF9bo05OOC(X<3<<QM-xa+D;6uzV|!laL)Ta3!%x-?4jG4#>NAtCUxSj
zlKNDcr!*MwXTQRC*KawNDR9XWC5yyEeru70-(F!@7(ahKKjK*x$0pUOR$qBCK?RSv
z#1pPCN|>iq@tmuSQOyK3OcUh|wY($7N3QXc>zq<2S=5V{1_{zAmuZq1%~D5;bkHjI
zX_J0#N}P6i%q>ZBTb>b>7j()5VVR>_-qIuM^d{v!_hgGc*{5Gl7?3j_7<gzr445L~
zCcuyhk}#F}Mi?d+n8EumIeFykFW-c4;YRT3<Oj8BxL``zU=s%cQ_LqmlSP^Fvc(s&
z^{|7ld?UvsBmX6hRI<%QEJkI4@9d}=lN@%nW-Eg=_L#z{>0h$1wOq|VLRv}XDTP4}
zRJk<99S%9d)-cWd&@E1728C)WW8jw>$V~ml4)RBv$GFdl;It5nsHJEvjxBDW7P=rd
JUszBge*v`PX|w<U

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 cac02ef..ef75039 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
@@ -11,6 +11,7 @@ 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;
 import org.insa.graphs.algorithm.shortestpath.DijkstraAlgorithm;
 import org.insa.graphs.algorithm.shortestpath.ShortestPathData;
@@ -51,60 +52,110 @@ public class Launch {
 
     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 {
 
         // 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";
-        final String pathName =
-                "/mnt/commetud/3eme Annee MIC/Graphes-et-Algorithmes/Paths/path_fr31insa_rangueil_r2.path";
+        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"
+        };
+        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"
+        };
 
-        final Graph graph;
-        final Path path;
+        final Graph[] graph = new Graph[5];
+        final Path[] path = new Path[5];
 
-        // create a graph reader
-        try (final GraphReader reader = new BinaryGraphReader(new DataInputStream(
-                new BufferedInputStream(new FileInputStream(mapName))))) {
+        for (int i = 0 ; i<5 ; i++) {
+            // create a graph reader
+            try (final GraphReader reader = new BinaryGraphReader(new DataInputStream(
+                    new BufferedInputStream(new FileInputStream(mapName[i]))))) {
 
-            // TODO: read the graph
-            graph = reader.read();
+                // TODO: read the graph
+                graph[i] = reader.read();
+                System.out.println("pas d'erreur au niveau du reader");
+            }
+
+            // create the drawing
+            final Drawing drawing = createDrawing();
+
+            // TODO: draw the graph on the drawing
+            drawing.drawGraph(graph[i]);
+
+            // TODO: create a path reader
+            try (final PathReader pathReader = new BinaryPathReader(new DataInputStream(
+                    new BufferedInputStream(new FileInputStream(pathName[i]))))) {
+
+                // TODO: read the path
+                path[i] = pathReader.readPath(graph[i]);
+                System.out.println("pas d'erreur au niveau du pathreader");
+            }
+
+            // TODO: draw the path on the drawing
+            drawing.drawPath(path[i]);
+
+            data = new ShortestPathData(graph[i], path[i].getOrigin(),path[i].getDestination(), ArcInspectorFactory.getAllFilters().get(i)) ;
+            dijkstra = new DijkstraAlgorithm(data) ; 
+            bellman = new BellmanFordAlgorithm(data);
+            AEtoile = new  AStarAlgorithm(data) ; 
+            paths = dijkstra.doRun() ; 
+            paths2 = bellman.doRun() ; 
+            paths3 = AEtoile.doRun() ; 
+
+            if (!paths.getPath().isValid()){
+                System.out.println("Pour la carte " + i + ", c'est pas valide");
+
+                if (!paths.isFeasible()) {
+                    System.out.println("Chemin impossible");
+                }
+            }
+            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");
+                }
+
+                if (Math.abs(paths.getPath().getLength()- paths2.getPath().getLength()) < 1e-6) {
+                    System.out.println("Même résultat entre dijkstra et bellman");
+                }
+                else {
+                    System.out.println("Résultat différent entre dijkstra et A*");
+                }
+
+                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*");
+                }
+
+
+                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");
+                    }
+                }
+            }
+        
         }
-
-        // create the drawing
-        final Drawing drawing = createDrawing();
-
-        // TODO: draw the graph on the drawing
-        drawing.drawGraph(graph);
-
-        // TODO: create a path reader
-        try (final PathReader pathReader = new BinaryPathReader(new DataInputStream(
-                new BufferedInputStream(new FileInputStream(pathName))))) {
-
-            // TODO: read the path
-            path = pathReader.readPath(graph);
-        }
-
-        // TODO: draw the path on the drawing
-        drawing.drawPath(path);
-
-        data = new ShortestPathData(graph, path.getOrigin(),path.getDestination(), ArcInspectorFactory.getAllFilters().get(0)) ;
-        dijkstra = new DijkstraAlgorithm(data) ; 
-        bellman = new BellmanFordAlgorithm(data);
-        paths = dijkstra.doRun() ; 
-        paths2 = bellman.doRun() ; 
-        if (paths.getPath().isValid()){
-            System.out.println("c'est valide");
-        }
-        if (paths.getPath().getLength()==path.getLength()) {
-            System.out.println("même longueur ");
-        }
-        if (paths.getPath().getLength()==paths2.getPath().getLength()) {
-            System.out.println("Dijkstra donne le même résultat que Bellman");
-        }
-
     }
 
-}
+}
\ No newline at end of file
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 b1eb6cb5f93d8c811645a27dbda8bccf56edc2a6..ba8a8f2ad9b07d1a94b461ffbb5dbff2730cc986 100644
GIT binary patch
delta 47
zcmeC->fzd8#KNdH*_fq7R+E8?L5o3@L7PE}L5D$}L6^aRL65<LL7%~f!C>+c77qZy
CYzLSC

delta 47
zcmeC->fzd8#KNdL*_fq7R)c|yL6bq0L5o3(L7PFIL5IPBL6^aTL65<PL4WcQ77qZx
Ctp|?)

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 8e00c1f89b3e09113849f99ce4cb3723578074c3..23fa9dcb2b2dcfc098364b94ce8081d5be2cda36 100644
GIT binary patch
literal 6740
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

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

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 5298eb6..bef549e 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
@@ -285,7 +285,6 @@ public class Path {
      * @param speed Speed to compute the travel time.
      * @return Time (in seconds) required to travel this path at the given speed (in
      *         kilometers-per-hour).
-     * @deprecated Need to be implemented.
      */
     public double getTravelTime(double speed) {
         double l = 0;
@@ -301,7 +300,6 @@ public class Path {
      * every arc.
      *
      * @return Minimum travel time to travel this path (in seconds).
-     * @deprecated Need to be implemented.
      */
     public double getMinimumTravelTime() {
         // TODO:
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 fc4c3b8a841f4343d7e94933324e1f2e07c7fcb0..ba95b9d44479453a13a991d47b41c35f33071679 100644
GIT binary patch
delta 131
zcmZ2#)MLbZ>ff$?3=9mm3<ud6m?p1dlH914!o|wP;J~nV^BgV>UPi{rr^O8z_e}mH
zE~}};z{IG`Aj7D_pbDh*8PyqLfqJzVSb(G<!*YhXKpMo_H`z(T0;sc5!duV?sK=N=
Zn$d(o2}tWOnoYhd;mE!psE&!@008?H8vXzP

delta 156
zcmeA%T5805>ff$?3=9mm42Remm?p1dlH914!X?DWz~z!!P?VaSSdyB;#o)lOZ*xDF
z1}{4k!ycewhRHj`4H)-Mekm@ism#E{sKOw_sLG%Ur1cp!7-E46v=~@`q#?s{hPfd1
rK-T`r`Vtm!{TUM8f+j$nrVP@IW(-O|T8GhM@(~F~_5(oGObiDBX&4|X