From f69318c33da980d5f5d5bf1402eacae43a70a056 Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20163>
Date: Wed, 19 Apr 2023 14:33:19 +0200
Subject: [PATCH] faux

---
 .../shortestpath/DijkstraAlgorithm.java       |   6 +++++-
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5144 -> 5197 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)

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 cbfc062..6613e11 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
@@ -38,7 +38,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         Tas.insert(List.get(data.getOrigin().getId()));
         int i = 1;
         Label x;
-        while (MarqueExiste(List) && dest.isMarque() == false){
+        while (dest.isMarque() == false){
             x = Tas.findMin();
             x.setMarque(true);
             Tas.deleteMin();
@@ -56,6 +56,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                                     System.out.println("arc");
                                 }else if (l.getCost() < arcs.get(i-1).getLength()){
                                     arcs.remove(i-1);
+                                    System.out.println("remove");
                                 }
                                 Tas.insert(l);
                                 l.setParent(suivant);
@@ -69,7 +70,10 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             }
             i++;
         }
+        System.out.println(data.getDestination());
+        System.out.println(dest.getSommet());
         System.out.println(arcs);
+        System.out.println(arcs.get(arcs.size()-1).getDestination());
         solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(data.getGraph(), 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 9ceff9dc34714ca1a8631aa13afe12fc9378723d..f2538ec56004b32f35fd9f044f5615c820167210 100644
GIT binary patch
delta 1090
zcmY+CU2GI(6o#KO-R*RCXLq~1>9*5WOQn&m1=}VyX<D!dO+;;p2GR7w;3g)B!8RbM
zH>OQ6M&pIz7n4%_DOFq1RZ0t6ph{7}AGAvS1r&cFCdLGfw@N)T5R5lx-g)2eeCIvq
ze1qB9Z0Yd}hYkZRoU^fnR`X|Mky$Fqy{jI#V<kKvp_O5mU5uF1c4N!SjM}^+#P7>J
zm}}ga>s{a2o!fG+%NVZ;MfY#$6~fuh&ic*>&+wYdv%GFLl~jh_5ZZ&g2gFUU>D#z<
z%Z9#Qhdu1I85f#O&Z;!$OT3~9CQZ~?A^Xj0rzW<KDVHz@gr;nlxy{L#r=3bS&mo_k
z7M{!+ajQ(D#LR#sC(k?kEz?nwH6!k@d~a69mdY<?AT|^U*HS_Ptf;Ar@03b&B)+Kq
zoEJGrlW>H-Hpg=cY-)=xDX_UMHpYw>yQH<Yxt?2~!;6lx+eZ%!vCCYQ$Y$1g;R279
z*(1a!cp~*wf$d{lYwk`|)RuYSGCOonft`2y(hDkiAwT&p&-E+4XtpO7_P<o1$FFm<
zFf_l+cN3uUM{V(nwa|_WXEnQ_z{&!<75QYxC8(tXDjb;bORd#Dv<Ky<$@er&@a8o8
zdNlh=FFZwIii6#Y$92~sA{yVN$;3;y^|#A<mPs$y%T_w%5thp~R>*TS$|y@@oEv45
zdYR@XIi~JTaEqLzOa7qSa#&4NZyLNfSX^TI7q*ItD<jxeh_`qfi-i2mVP+_zLjKZm
zzoQ;%<u~;()31B1lV5p{qZD%kS96T_vALCUK2XkKhiv9UK2mN}VyYh1O`hOuj`Ojq
z-|!iqXhxLZ8D~~iS3+v(Q|04&4i;$Hiw5Q{8~FUP0q+Yn@FmE@#OApU$3|>wZ1QF>
zStEIKAX%sJOo0DMRx6%ORk&5e|2sIGsx|9UQI&>MUbRiDO|#8IP<>6+JQe>xx;VID
z;exzP#-=KWt)f1Kue2*mJJM&$Ns~;kDqExIb~3Ex3htmraXmezH(lO!O2;Xx)^nO~
z^_$UI_}v!;J-ezw1E-i%r0r3LHLpVo2d*=^9GW3r+DR$jnYnbj<&6I{tl()B2iX!V
W*9zDlg7_mp={KV49)9NRa_?V+b_DJK

delta 1048
zcmY+D>u*$56vcmgI>VhibLY{iecX;^L>`^CkYZ9zqqTr3SV@RgLr6{3G%+fMwlRW<
z(FBdg=m(>6G`67C0WDS3fkE%sRw{^6MFAgZ1u2SxelZ&T1E~A9Sn<O>XP>qAIcuG@
z?>Um~%O($>9~lFh_|+mHG@AoXt!a_cJ?&3gkqFJa;_xatGifz8?cjBb*M#`JT@Q3M
zZs_W{yKzm|#(NwF*(sECukR5;*|xU2wg|!-4sWu{+~?HmIa_$!;RW6?%fr>d-NH4~
zJdcQzyrp-;rj6@+du$54Yq8hl!dI2Nhi6WPuaoypjh%6dj5vfC6_#erUv{Or!>$hJ
z+2?~}dmpv`4w#pn0r}Ci#9HL6xjj&0#==Q680(G%&k-g8a@y3yw@Jzj$7^NMoQbD1
zMK?CgQei*MS39obvCNGQlJlecx6*IYiR|_3+>pl;<<@rM1)fSh<MG^17WpL)yP<L`
zc&EqO{q%ag_;lY(#Qw#$t#gBZ(QU5d+8zUDOJe@5+dVpc%GJWwsg-WzLX>&jlKLec
zL;XbEIm+FC{;YEO#BYs~?`$ZrXOv=RgU4JqRAjiw2WuAZ)}954=vZK}X-Yn}xkc{c
zTIr@$HnB_|Vud_UqYSV_hFB%LsFP9J<sdi6DOMBJoqaRL;1JVQNKOz}M6hIn57m|c
z2|30AKB9ywImAIeR?c~{k53c}u|P&R#5i+U!J^H4%4b+~P|0BhZTe*;pYw%cgA&s0
zxOU=8j&ejln+aVX(;ZQMXGrmJ90~F)U-7ld_(la?rnEBxj?W7Cc2>Z5DquqU`XKQs
zuEe%2#3EynH%Ch|k~e>pE@;hLR9K{^$7U6B1x)F$9-gheI4^#(mgsEKbfo6%LAjJ`
z{!E3PRuccEa;b&M%hOX-5x*GpE6a3GN2<!C%cArCCqM~&d-YMMwcqOv1Dr6c%Gx_`
z)To0BZlZ>p$!J{1+UXY6>wTf&LW}(9q*^apU&jxe(z!yt^xZ3&_RP`TOx1CXCd_YT
obIT_+vJ_pYv!4ysdz?1amt0!;ldb}s;b)!w7hB*L&MkNU0qDf_$N&HU