From c91585c90d9d1f1b3ee81dfc5723224c519da726 Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20163>
Date: Wed, 19 Apr 2023 13:55:45 +0200
Subject: [PATCH] while

---
 .../shortestpath/DijkstraAlgorithm.java       |   8 +++++++-
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5045 -> 5322 bytes
 2 files changed, 7 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 415c6fd..4f3b05b 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
@@ -24,17 +24,21 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         ArrayList<Label> List = new ArrayList<Label>(); //List de labels
         BinaryHeap<Label> Tas = new BinaryHeap<Label>();
         ArrayList<Arc> arcs = new ArrayList<Arc>();
+        Label dest = null;
         
         for (Node x: data.getGraph().getNodes())
         {
             Label a= new Label(x,Double.MAX_VALUE,null);
+            if (a.getSommet() == data.getDestination()){
+                dest = a;
+            } 
             List.add(a);
         }
         List.get(data.getOrigin().getId()).setCost(0);
         Tas.insert(List.get(data.getOrigin().getId()));
         int i = 1;
         Label x;
-        while (MarqueExiste(List)){
+        while (MarqueExiste(List) && dest.isMarque() == false){
             x = Tas.findMin();
             x.setMarque(true);
             Tas.deleteMin();
@@ -45,6 +49,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                         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());
@@ -59,6 +64,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                                 arcs.add(suivant);
                                 l.setMarque(true);
                             }
+
                         }
                     }
                 }
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 cc2206986bfa7fa80b3edb5b24e1db3cf5b32bc0..bc3aca7b1c60ce6aa4bb20c4efe4db650a3b40c5 100644
GIT binary patch
delta 2476
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

delta 2220
zcmb7_Yjj*y6~})knVCCtb0-a@o%Dv%w1t{X(xeSy4Aa!sc3N9V!XvdYpw%I{rc)*}
zbY@ZuK1Kv8C=~U`qosgCC5Wv+T5c$5u_&Tc#R4i+5kah?EM+a0AN<s~@6AJ5vKGrP
zbI;lTz0d!@ALq=m_@i}I$4))|1aK~YGbmHE=~P*bUTQ{lyE^TWb<KfrjFlE2W|cl3
zSlE)ZSi@R{u{l-fa<&&0<@NDPO=?+Zv7Yl4kpZW8VLm;O&MM~B$MrR4bzN7k-&tnT
zN{2-!U5cPMt?&1P*PFz+$l_uy(JO-sn>Sc|l#RkraEhyQ1z`x(C*vDU&fsGfy<DmY
zrLzSmFNj^QpA5#V3H0L@pJ0<73C2U8vPf~cel1wNuHV98lgR3KGEULyOlM8n7_itp
zCAK>^IOr5Tbz3a1Ag+jty6&OAKBrK~<qHOb!lYld?2<`_oW+%1Xr(wMokB64O%>BQ
zIW<O;cXYv`=v643E_9~yTZbIaxXt1-Y?q`YXd)>oTQb7ce9qvrimENCZK)-hRCZuV
z_f>_WGidR7z999<4N01_JA62;_l2s|7xj_Q+?ijJvh>YgKHsFobrwOc*KdYu!X>_J
zaRWE%sL>#suUg#1&3c7#cIg(rZtyk5=@UogmRyuiXN%p%yps~LZ*aYcyV5gdB$W)`
zw78YqCc4?-WCx0y{bsE-xr5yXyCnbrNbXD(H(T7v9`PCU`W~!LCgaI4cZ<r5s0_2>
zTe95l3yyKG#eLos1PbY^oiN{#uvEU!tKhK316(2<&O3v-ZGPz<wD=zTv=eR#ec$3C
z9@cxpi^I1t;;BBMkB4glk1Cc;j;&qQoy!b)4T&(yA%n+sOQf~@amMtP$SQS2?~l}4
zhxvh5vZIQn_1=8yw<0y+gZ$7l{^-DIW~<VriaOP-TcXW+Z^fDe5$issUf27h?dlD^
zsq9SM6{*tIm4jyB2Exn$^-sOCazUxlWuD8~hiFhFjA0hp#vzs}j?$V4jnUR?hh~vb
zqqHZ&O?KF2MUUsPTCscl#U_dVh|2{o7apap(xuxDywm2=6KD+$tJQYE<uY+f7`7qH
zPkQ^l9=l|?eA*>F!5<k`m3Cy3Ka&W1eA$HA<gztk4fBR=O=4|{3cErgZS#Jf_g4Ac
z9P_?I=S4@jYK&6v%xgxuc23k~hs#%7cG`Z#kS&Bm-nshbzQ?$|B$}rJ?veoijOmyu
z<Q@<40;iEVQQ!0SU2L#}F5jLVx|d3EpSf44hB-^{;OtPK->*!@W4mJy)3*D2?0^^F
zV_#n3Y5A@loGfjHUmHo&FYqj{7~bmCKduX@2C2jT-KWNc#^ZcsjDx+6Be-K6?roGd
z+QCtt80E>%#ShEt7{HX@2Wij`RaKYf@*(EQLsrWM=CX+e@**tcTFznzi@1^Zp{ZjR
z_1r_8BQ)?7jhtXHuhYbvH1jq~R756YAuXz%bJRxOuTq?=uHXZzK&!fm531WZPu(Tc
zvX^CQAMI*{Ms--8r>9G-QqQnRJx5ZVV2yg4wN!|_om6_0h(%O(LG_mGXCU`l{apn7
zm@;OllRV8&C})m(nV<5EB(^}kz%j7}C8-!c<L87VHG^O9tjzWfmF1Tl7n@eCf<7xq
z=?LRI$MXU|#lLt#LQKi-1iuovLUKFGulbFLcu{1`7qSW3m!@e?Ow;~WXn!Z7=U|R=
z4q*djP-}3|AZBoe{0d(SEEtzRC}R>W{THkdEp?dx8z=|0O$3k2Uq|%a9SkyZzCr7h
z=L1x}ho|J<CNbqu`~Msqc`uFDbbjwlPZ}tXo;2@esb(3!$GA)u2gMweZ)5p#nbxg|
zz%bQzVCq75$#Bah4hEKcHh=n0&fO>O6LVZ6?Su>Dv<@k7Cuh<nv)m!Gda<5AtGe`x
zjDr$1&L4PHzA++xZ_E9TT7n5Nukezrq<hS!Y+M>2^eY#Wf%95+dR3AtUK1BXTo%dK
p3kx>5{L#BnW&Vu{`9|fBZ<%lX6U-9uB!8BzDex$N;jb(0e*-z&=3)Q<