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

---
 .../shortestpath/DijkstraAlgorithm.java       |  14 ++++++--------
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5322 -> 5144 bytes
 2 files changed, 6 insertions(+), 8 deletions(-)

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 4f3b05b..7307095 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
@@ -47,16 +47,14 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                 for (Label l : List){
                     if (l.getSommet()==y){
                         if(!l.isMarque()){
-                            double cout = l.getCost();
-                            System.out.println("c = " + cout);
                             Boolean changé = false;
-                            l.setCost(Math.min(l.getCost(), x.getCost()+suivant.getLength()));
-                            System.out.println("l = " + l.getCost());
-                            System.out.println("x = " + x.getCost());
-                            if(cout != l.getCost()){
+                            if (x.getCost()+data.getCost(suivant) < l.getCost()){
+                                changé = true;
+                            }
+                            if(changé){
                                 if (arcs.size() < i ){
                                     System.out.println("arc");
-                                }else if (cout < arcs.get(i-1).getLength()){
+                                }else if (l.getCost() < arcs.get(i-1).getLength()){
                                     arcs.remove(i-1);
                                 }
                                 Tas.insert(l);
@@ -64,7 +62,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                                 arcs.add(suivant);
                                 l.setMarque(true);
                             }
-
+                            l.setCost(Math.min(l.getCost(), x.getCost()+suivant.getLength()));
                         }
                     }
                 }
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 bc3aca7b1c60ce6aa4bb20c4efe4db650a3b40c5..cf598b04ff084275531d63a72a195b37fc07231e 100644
GIT binary patch
delta 1438
zcmZ8h|5H>|6#txMci+C<$FeM6AE1k-2!aDlgzH9{h74I0MP&X^&PE$zu$!=8sI^&U
zUorApvPhOzLK&@MJrvTuP*9X<Ws#=#O`B<Irs*G$&U;ui{cz8{_jAs<=X1_I_m1av
z<+{c%4IKkef?p+=2wvegWr!ksyeOl@gOyoU&w8{=cz}?&*5BqYZ1e}~3zvmLjRAj9
z!3Jy;F=_5>FCJ9z5F!MrJ`lbx)DkAd<>r;!;lXBI^N3hy%f5m4>#;?_W2ho1cTb&i
zyT7qDU`Hw*SMUUGBbZwnHUwlmg=Zu@O>j-et!Zxw2bvUgV4LW%&MdW|ljHcC>+IN$
z9TEf~$*^t+6;?Ml1j9Aq=766ap2rJJ?S36<42s{a84E+`QV>NqL1xA`27>kBH3sJj
zol1{_7jXx{+8k&KwJ|#{UQ+Nf_K1M3u;dlICgD|rbDCL|KfFf4KJ@Y#O$|YUCAYj>
z&!6zRf;X^V^w<h)+tIIcc}twMWta~TuD)Ds)m0N}Yz;Srf-(m1wuD2XST2ow2bx$b
zFQdbvU-l@27*b%tFrg?{Y__L~KjjQt3`ceF*r7!GaXR#yV}$4j(H~z%7sOqr8R90{
zCDNQtcJoEpkO0tmvCX-Q++u!0P6X#v`w<io-bctMtFnf5KF0zL&A#|v465;$bzYyM
zDjJrkj(ympuUfhhjXR7spHsDI*p#n(K3u13Hg)wtHczRX8Xk>erE1ZzHAUJB=K!8`
zKda%nUgQ|I5!I3+neWk1%keer>|p2kf3RIERkLn&r>f}3?^Z4PRIyT3%o+j=>d}nw
zI=-``?lAUhSf!I*LFk@buBT?KJX<81&sp_F;ZUv2K6>c_Q&BDRHM}{D*sA;i92~~r
zs(cMIRm&ib4C39Yf&=^}%&@Z@K!J$40ueK=Bo!s(K`G6{LMn!r7GV+9!bhu7M)%?x
zYQkb_#S+?xrL+Tuv>OYk4;8c@c{Gel8o~8+7AxT3bGxQ41PbDLXQ9(@GQw?26L^pB
z#DoMofe-K@;*d_G5scs?rZkI=;$sFam_tJt#TcwuiX41`Pa&ZiX&7frMwFK0Gknh2
zKC-ZOj62{YzQA!FGA4L`f;}Ag1AUB-K_N3b@g=@u8ecP^Yz{j`;FLjN-Y66J=3fHe
zGJy$hsCGCfaTR0<B*7ygCOX~8Vzt{rF>#-J4$Drrhvflx7RyLdx{?X!wDDi=S;}H0
z{1;HOBzPqhOZ-<LYj)-&(*N%v!!hj<NxEWIOhT%JOhbAJMjiRlaSgxYR7^N6Mv^L1
zZst`rzwTQw1Gn<eRE<2;itOaH$Qdpuu{ICi<1EjqTq3<FaYiW=)&coAgHycXtdRoK
zB-hSjut?=QLotx#Du)Z_*hFHJxjgG`dY_%wyUAp9lhpvp=m3*}{s<(q@+bVvTm8cr
Kz%RIXt@<~lt5EU)

delta 1659
zcmZuxYj9Il5dJnza&wcLkOwWjP%TKsM8LubTAHFfGECLh0b9iW@JFU(N}M)<G_3`}
zRKX{p)uYlDRIJj9%3ISyq*k%0APORaD5ChPieQmn&d|E|0)-L(oU?a#zuj-YbIxt_
z?(sSI^zG;bFac*J7zlZy*Ls~OAlH_{EOR0c_baHwLV{EgicgPL#|dd(UqHqKSR!FD
z!FgY>Hkex(j8x>7EUb=)suVnk1ZPESI5)jW4~L_<Gh^XMyd)kA1*`lL9wH363>fEN
z#k87m<=jxrf~5pw`S8iZtw_}45d|hZ%9Xt5OP%ke1N^?bt*FQ23ZB4|1aoly{7_^r
zA<G-^U6FjDx?e-AP_PnD5iId2Gvd~S!QLw&erqur@T`Pq2%i6$LxIqkN%OVQDkD}r
zk5v+0Ah<4#HZ2;h3<V<!8qp+{ny*bnv0A|zyhxB)(V|eKB0f*obcPi#;}r>O364wn
z;$VE9f)>2WIaT2Z!Q>4Dd;tsAu}GCHk_ByS)#-9&V7-DjP|A+#@S>0fZ!szuE4Ly8
z8x?HAJ>-Tt7OINYhOEfL76n_eO&pbSErfRzB+)J=TgF%#uw9#Nhge`4YJ8XA*Y89<
zDV~yOWlcOBjmYRkmxT8S<3-RgRGhY`Y476$VUwrPhvH5-+rA6CwUhgZFwR>fX2}_%
zK_054@QLQ#Ls;$=qzn_eWEb`1+ICuQAlX>1Um6N*TVm@b`cq7|7tk3|Z*R7m#=-&@
zU`Q7^j@5LV=yHro&|uZN9peaHh~~?xoWz2B+t?&x`Sv!PQtcOFdHIT}Byp>1YsC@G
zs&2-9ZLgi=*os9d)R(y*ZpX4rM-q=Eu{?>V(>m~6zEjn4wW@_vwd&0)%RBH=5@qL6
zi8A+V4AUzOATJhd)gl^jAd>0OGgmdCR5c~>db-pCt-t$CZrFyA95<y)#<@w%=6SSk
zjcZ`P=-V(yHEQ^KnG{pmteVsy?=$A8iZO|hHtg+$=6;7JiDvcnER*PZR^#m^*i<u5
z-PE^%+iAT!Qb?7J-in<m>?#|b#MP>)9o_BtxOmKF{udZw<#h*c5DsT3VZx1+g$Z;G
zCXydF(QMpIQRLAgOrmATrxoziIuy_*+(N7}?Zg!7##GviTsnlYbR30r0zNv!wEn>z
z1`mp0<N7UdYUc?BcK$LMoN!<e_&pgM*o#kLz#xMe`x5vJX~?8=_#FG0+6X#}1MD*)
zhkEe^4#JG77=<r!2oh#u2)<&Uj3!!)!#KjeRx04=LB2ry$%L<Ql%t2yhi@2R!$};+
zw;WYCwj0Or9UMIBdiH+L1b@IJU^o-dx!}YAl^+MF{KQm#2B;27KPEz!KoYVgq(q}D
zn^K~~mBZ^X-9G2aVtb!EQyB)wrNp)F5z0n5FL$WJB;-jLpC<8d1=;=h4`7U5XC$w^
zZjYT`F6;FR>uA8Q!sRJUpT*W){O(I|6-trKwhwbe#51I*hs7g~`tTcm=RJev&;&^1
zVZo<CypBc>&q~@{NQa@Hbu#JfGWdKj9`HB=tj-_efX6f8q;_Wv`kgWBXwuKupnFg0
S>uLPOyOpDz=*8bt)PDgnJ*2Y$