From 85f52cdb6ab5d084380a8dc4f69024950dd69fc1 Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20714>
Date: Thu, 18 May 2023 17:57:49 +0200
Subject: [PATCH] dijkstra tests

---
 .../shortestpath/AStarAlgorithm.java          |  12 +++++++-----
 .../shortestpath/DijkstraAlgorithm.java       |  17 +++++++++++++----
 .../shortestpath/AStarAlgorithm.class         | Bin 5053 -> 5284 bytes
 .../shortestpath/DijkstraAlgorithm.class      | Bin 4755 -> 5736 bytes
 .../org/insa/graphs/gui/simple/Launch.java    |   3 ++-
 .../org/insa/graphs/gui/simple/Launch$1.class | Bin 1240 -> 1240 bytes
 .../org/insa/graphs/gui/simple/Launch.class   | Bin 2453 -> 2570 bytes
 .../main/java/org/insa/graphs/model/Path.java |   1 +
 .../classes/org/insa/graphs/model/Path.class  | Bin 5897 -> 6047 bytes
 9 files changed, 23 insertions(+), 10 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 487f70a..a2dfc61 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
@@ -22,7 +22,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
         ShortestPathSolution solution = null;
         // TODO:
         
-        ArrayList<Label> List_Label = new ArrayList<Label>(data.getGraph().size()); //Liste de labels
+        ArrayList<LabelStar> List_Label = new ArrayList<LabelStar>(data.getGraph().size()); //Liste de labels
         BinaryHeap<Label> Tas = new BinaryHeap<Label>();
         ArrayList<Arc> Arcs = new ArrayList<Arc>();
         
@@ -46,22 +46,24 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
             x = Tas.findMin();
             x.setMarque(true);
             Tas.deleteMin();
-            
+            System.out.println("test");
             for(Arc suivant : x.getSommet().getSuccessors()){
                 // Small test to check allowed roads...
                 if (!data.isAllowed(suivant)) {
                     continue;
                 }
+                System.out.println("test2");
 
-                Label l=List_Label.get(suivant.getDestination().getId());
+                LabelStar l=List_Label.get(suivant.getDestination().getId());
                     if(!l.isMarque()){
                         Boolean changé = false;
                         if (x.getTotalCost()+data.getCost(suivant) < l.getTotalCost()){
                             changé = true;
                         }
+                        System.out.println("test3");
                         if(changé){
-                            if (l.getTotalCost() != Double.MAX_VALUE){
-                                
+                            System.out.println("test4");
+                            if (l.getTotalCost() != Double.MAX_VALUE){                              
                                 Tas.remove(l);
                             }
                             l.setCost(x.getTotalCost()+data.getCost(suivant));
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 3fa7533..cab897e 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
@@ -43,7 +43,6 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         }
         Tas.insert(List_Label.get(data.getOrigin().getId()));
         Label x;
-
         while (!List_Label.get(data.getDestination().getId()).isMarque() && !Tas.isEmpty()){
             x = Tas.findMin();
             x.setMarque(true);
@@ -78,7 +77,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             
         }
         Label dest =List_Label.get(data.getDestination().getId());
-       
+    
         while (dest.getParent() != null){
             Arcs.add(dest.getParent());
             dest = List_Label.get(dest.getParent().getOrigin().getId());
@@ -86,8 +85,18 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
        
         Collections.reverse(Arcs);
         solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(data.getGraph(), Arcs));
+        ArrayList<Node> solutionNodes = new ArrayList<Node>();
+        for (Arc a : Arcs){
+            solutionNodes.add(a.getOrigin());
+        }
+        solutionNodes.add(data.getDestination());
+        Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes);
+        Path p2 = Path.createFastestPathFromNodes(data.getGraph(), solutionNodes);
+        System.out.println("shortest path : " + p.getLength());
+        if (p.getLength()-solution.getPath().getLength() < 1.00){
+            System.out.println("le chemin Dijkstra est le shortest");
+        }
+        
         return solution;
     }
-
-
 }
\ 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 2eae295b389afa4e21c9f40793568116de06aa1f..0fe21d42424f9cc32b6c9fea747c55b3a644235f 100644
GIT binary patch
delta 1684
zcmZvcd2mxz6vlry+e;oVwYIj97AV6gErnW^GC(Q{gyNtuGL)e*!ziJXmTH=m<P`*w
zxGz-E@)X*NY=Tum*)%K_tcrqY1s4<nQ3O$O-xbApUkbI(_|JX!obR0PJLlYc-_G1M
zeN*@Sy<-<p#90N4U`Ty^?xvwD95EL+F;8KxAoT|SY=2?UAF3=Yog38y)fzW5UtkT_
z>Vk~%Nw_LpI5AQc(o6M7z+YYLWP!k@2co*lt=z6~n;`vv0yXa7PJvQm<_1HOF0Y+$
zOuL>g{guUir>InLx5hn;7Pu+{dTF@2Iv}}6aG%CP1_<1yx3;`I5RHZ-QHA>j9%H29
zQB^!F(s+=Ej6$WLz{z5P-K=boN*&`>d_1DD1i!#p6`kOZ%&HBjG|;5bXe>}Nt&g(I
zSgPa>TCTBzl>$vFO%Ch+pf4Pi1F+`x9b;;&)_9yXvKI-rBR!2-YPZ;^NO`dt;bXaz
z=5yMEO@*g4o;GE*8R2j+;15ml2WtaP)}M<hQpx36jSbu=a6|&t;n}h<ADc8bvqcI;
z&kNb|#+W1W@w`Tyt#U*Xn&^)NLb@=5&Wjz}HFnTqEOC0Xc53W0MU|>(Np+1r*PLvt
z#!I|xoOTXy?ADmZt41$ZR$d(=Rraz^;dOZ~$-}GFtAd5Ta4;As*Q>&zsKy(-Y0Pl-
zw!I}NuCE_#w768)0p3w~TQIP`KFjE@cC~A~%X@}R9c_DGkY%j2b#?ponJNc4q+#bn
zBcu+|+BjkwM+J3x#)WFOQR8+S8(i9!6Y5zZ#u>-8(Q2vgj}%{CESQ#z=xI$gCcD>(
zUl*qg7k?VU+C$2v8kH#_*FKzd0ZVV=Sjz6$X^$;Vu$2n0!{d<K8q?OxHZv#fmN+qw
zBhFoM?%mEnf!Ep0MvrqlLj|qWd6j-1CC&p)IGSlNGwNkVf$1~il*O6RiqGrvxZ*tA
z#2o83mU>l_@Udjxs&a|MSlh4+mo15z6i=9<YMdt<8Ee|>Oj|Ony@-;fji?@*X+7g{
zbta0-vXcIp(l6zo%Rg7dHnZC61Wk$Y1^wb&-BDJuq%Iy?EY1s!3H}3Cc$H>)d+a91
zi*a5lOSU9;uboeq5lL`Q;;6^IjXf>2P3^at{Vg1vDrLHP>|6O@D~Bia-za||HdMLp
zqEN0G@*Fc!<fF(WiyVwZ>af^APB2IaiiFA#;g;jgV7TamS6oW5DB?0PjuGM-t`KF6
z6xTCKRLa*L#V6)bBI+0`7IUR&WSm$ndDc@P_A*f%Vv;yQsW`=CafV423uP9CYc0K)
zYMwufNHK2#S`4=|?Uo+WaRKuFTeA6xV_3+vXnf2kSjn+iInJlDmpn;!Li+5KFrAZp
zhJ&CaJjLhoVl_yv_T7HTagr}^$i`OjC8tqjOY`|k#<^ruA-?7tR9U9)D!!G03g5{x
zdP%W%+3!1Kf9R0?QOf=Vq8si6!*MDIIZK5$V`f_SDQyaw3c1O3gu*aLkl!h&1D0Az
zFb78m!@r=+D#X<R7>Cnx3OZ9)DAXkh&N52Dr_hj}kpH7j8GX`ovj5G1>;!3@>M*9K
qXJq_rPFgm6iTnz4{`ql!F&3tG@A{jxEd0(N@~cYh0B87Xq~{;1JEIN&

delta 1301
zcmZXTYfw~W9L9g|vU|>+!vQ4_JdA_ZREV@gUPxI=O=PT;tej+YjA^k&(S=o6Eiy&z
zhS%EOOh8R5OSAG?hegydP0KEJzZl)LvJZXfqth6@XKA3BzP#`M`aIA7z3eJDmOt?9
z-$#xEWB6UiBPfo?^AC>Qq2-y>@Q_6#lLW@RaBN1jt}YxixrOBxkI2<}mUpGVmR+7~
zxnI|{RTisRBaiBVQj---bNe5+c!H3?U)xX-TC#X)*rb_tI%@?P3qs36MUhbbyrN0b
zXe1n}w^+{xS>(^xHd#Ey({hgA)}FDDJS&&`1Jj#%&SHxTXI1xh%nU_b$b4EY+E^&i
zmW1n~%T%a_Z5G>kUZ6LGV`b5Xn7})Ha=}bDwbSASUX)iEBeh)?FY}7L-3aFHv3S)5
z*J~Tf>lVct-OAT2Ugr(D-MI0#{T6dLAQ&`!TEFt?)eFLNW2FVN-H9if9Of;ZH&s!x
zWNEB6QdAa=L{v>}w7$W@p<NC#ukm&WO5^d-vfebcPLAmul`GAgQjYVsY&R!)PY815
zPH#?HC^p}ui<1^UPRXlNi~R{syUv-zRjI`uQ7$K>UmqWqBPVJ;c|NUM{4CqkOT=&T
z&-ATE8-7y3<B^*OoN792dmSQO)C4tKQ|2Pqk5$^5!-EbFcQ8^A^zWv{_IEH=DApB0
zz0lSjn%dBIvnt@)k2+L3RJ$;SZ8$vE#=MjSPX<jFXk)TIKG)4`Y}tn4?M;~u;mxg#
zPsXz--_nX{dtI-^HvZe_u(dZnU&R&OjuHQozT~Q^614R^5GZt*+9x9^A=RB_cWciu
zd0&QIvDaZ=Wm2uO4)#?Bbr);znVxRjm*7w*iCKk*IMPYiEQL7O_O<g)JMUK9a6tVA
zFQ!`eQ7BJlOl=y)WyS~(#lpupkxhxnBPgz=RFrVDn80{3g$ZH?w~E=6iG@rSODGqO
zOc84sB{mQcd$?01xJz_$w>Zr`;=HmiaId(;Ob=AL_rxaB-P^(<O?f_XMfn3z53))8
z#e2Muhivf&XZe5>hKh@P$VW=(a0T|Uiuow#e$Md;8W9EfDW9na(4xS4t#cex+0Rw>
zGHdyQFVWQ~5x!C}Lk&~K*L;JiWZuEIDyDN@$rz@%M)%Tw*GJpkNBg~^{Q<;a(t0St
zuOoD9orIj8IYcC6Br{K~>obSsCUmlO^3@7G>dPAar6)3n2Kv)FH99MF#=#Xzl3sJ}
z|2ncP1Fat-kYyM4Ln!SvkT-BL1NqTCK{d#AY8URgj&S%%F3uW~b3u6?F7k`oO_l59
JS1wJo{{dAbMLhrj

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 91bc88795af1264d99e346348081f96aa281f981..4c7194130baf298cfa74981f73a1571a7a3873d9 100644
GIT binary patch
delta 1285
zcmZuxS!^3s6g~GPlNpc4#4*%~69fjS$Z1U+nkFrF5LHO5O0*>q)DWPH6;Exq_So1H
zr1E2lKalvE9~8k)B~(C2G$fip+myDHrD1QOEM+NSX(4P4g|ar>u@k5S(rDg&=e~R9
z+;eBfT6!kzoxZU50DzUG$q<Cq)*-FgDhQ9&O$}pf8`X9deymh6fdd+z$3a5Na8XZ~
z`an8gH1(3%pD@$$Vm`MapVUi)o2>@9$vPz@Yr^HTc8SKab0Fpr9M<rHL(p6$h$l+_
zsdwQ;ye#7-f_Ho3-b5suFjA3$oqRB-;T0Su)Z|A@!jg5BbS59^FJ=sLz+_3en2c8m
zjTaS~oGhn$Ml#u?UR3Zp)0P%w2Ma7K7!9hJ#+w=>yv3}cDsA<tPH`&My3vt-Ov7=!
zLvW>ZbDeIa%rq+rwZ@(56B^#b`-Hkgp`aT{!sVfO>%T<h2&-eJ1r_YXG(OaD5+4y1
zGha;-E(={$vrxikKfx&(pAs(ppMEub=BSnnjs;mm#Z&lP!x#9HG1lq$PPoEaQ5(3n
zG6Myt30G(J;BZ>cWsG2NX8VqkSxf|Zia~}Ktr_2<4w27O%4bK+Ox{=+EETMJce7ey
zB8b8Y%XXiq4r`|tw)WIY))QJ>kYt_JVuDnw%`>V>PeOqk5V`SVo*63dgMVle;iwXj
zZ0wJ!yU`p_pTjD`K^Re2Knb{PJZ59ppab7Z7@eO9D9de(IvB4_0p(dtMO};Gp{V){
zj_kwqkngogyy29;ZR1@VAK3V~vJ2aoVQ||+^$$PN1UH}deZ{%(9)9I(q4NC%I<3R?
zv2q)BBZ4usV-nY43LQM5PBya(r*S=gMU;RT)uEeOa06Y18>tm*s1rTZjb2)hKDr%o
zx(jP5i4HQ*Mi1f^8s#<~#clLB253LWN3fBOVvuHV2hC!LKe#)E#;d=KyG0P2#ByvF
zUDzV}u~iHsA$B0?SO^<F$4F@K@J<qGT!MP=pv5+v!PgM*i$Q#YS=8W4u>s%WJ8m!}
z`tUtt68g}CAMhjUu!;H3Vva|1A9GcsF_fn`J;&*jcmO})9Axe}i=P>Dao3yi3(iC3
zevUIf2btC1kKdSD;T{~qb8xZv9{i3!IO@VG{K=7uzgX@vmQs~>;U9VPi}Ki4iDtbH
z9q|`I0-#}d$J-nHB+X+r+}1q}OT0J9{2!8e3;#UJsesowpo|H=0B<k6RO48}Ph83?
f6GK{NQ?0et*V4pIuz@6#!mG;3r^!X`HG#hY^w?A=

delta 484
zcmX|-O-NK>7=@qrI(J5|I&+Z_%|*5l@&`s`ENI4<tWgq#u#ptemCJIk2(zw55O*Vi
zYg?(qfWk0MnKPDST9*B&L?D8$1Ho1F-aFvt`#B%qInQ~|I-C}(^e>wSA{?cy5i2ua
zGbT=J@Z3p;`V97+`B2p4KxlhuUv+|2wqw{&E#DlKRD+ykX6$1LcC4s_4@=i2+MU03
z(Nvg4I!V*T8r{5c{kh2rw>afC7eobO;-^=dxFgqzODlJ!hkFtuAw%>_k^vd#flLvR
zX~OcHhw_SHS>TbpCMh{R7kDgNjLI=%E)OpVx>VGpsMV_}e^dw|1mrh4#W1LsUGlu8
zf@@Ob9qS5yL(Sf+W|E+f4GQ>~P{SgdT69*u%BQqCY^dhfGSB$HM*>>q30taFX_-k%
zY-1^A&mf;v46vgZ%^FsY-Mx(cd>Q*iWA~K0f!a*=O1%u(_p$lvLhIia-E~x$ZL559
e$830G_Isjur43L0?yW!gsk^1G%lzUn-uNHYMr5}D

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 dc447da..46c7181 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 java.io.FileInputStream;
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 
+import org.insa.graphs.algorithm.shortestpath.ShortestPathAlgorithm;
 import org.insa.graphs.gui.drawing.Drawing;
 import org.insa.graphs.gui.drawing.components.BasicDrawing;
 import org.insa.graphs.model.Graph;
@@ -70,7 +71,7 @@ public class Launch {
 
         // TODO: Read the path.
         final Path path = pathReader.readPath(graph);
-
+        System.out.println();
         
         // TODO: Draw the path.
         drawing.drawPath(path,Color.green);
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 4fdcf7d9e554f17f5329243365e61a77bb865fc2..5a2b741639a0e6d41cea064fd2a3f7397fda51d2 100644
GIT binary patch
delta 47
zcmcb?d4qEU8w;cIWOkMkSv3YO26YBe1`P%&22BQe1}z2y25kll1|0?)2HnXsSR4S%
C1qX)!

delta 47
zcmcb?d4qEU8w;b-WOkMkSycuu1~mpz26YB01`P&z22BP71}z2)25kl#2A#<>SR4S$
CMhAWX

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 6e8b432b5502328d07b3e0dacc44e5892a4bc913..a6f0fb0655a370c27203fbaa24586fb6dc4a5a2a 100644
GIT binary patch
delta 409
zcmZvYO)mpc6o#KWV>)e>G-(MoQet5t6M_VhkS4xDNE`M2F=#2%4($|WVQ(iBKf?lv
zgoRk!`3n;NLd3z=U7Yuv`=0l?$-RzU#-p!aPtQOvRTE8-xO$6U-PGN7pBop^ef!w9
z9J{z{rK@ExTZoWhL7}@9Pth>_Yv)~Su9Po&X|I&E3qxU+STR{v#Qw1(tP)U|hd&9Y
z7-F4GlMO}v@3MX3SxMJ%OA&0g{1>A&uoEFm?*7C0RI15;H#4C&g0vIE@<)T6p%y|i
z!<k<W<}U6?J+RnpG@Ey<J+iH{a4V)pSZY6YQv1-Q3osyegCs;d7^aI6dPp+F7%NPY
zV+w~Es?1U=snp*i?6N15&Ix(;QNr;!kWLfIJmU@pF}oyK#HB`%6C84cA<$MzlqHZO
WE};tY-5d){6WFO}Sa6M^a=rl~22s@j

delta 292
zcmXAk%Ps=}6o$W<n(0hc)1(tJD;bG}NHv6nAQB=h+|oshx=m43wL!ze!rrc#cncO~
z#li#Fc>zx%;!mB$`OhW)cXA%Q$4vV3_x%GHryj>N2wGoW>$#^rdS`j5YIqao!rNwU
zp;2pGB`HvhhV6cPE6Fyc*A4r}F#4iZr{D%S43J?YdUA%`G_HDRM&C~5-nabt3;8!T
zV-(vOn<SLSNOtbVn80RIvnc}UATwl{(|(?57Adhzg%z$@qg#&rKbjqO)y24Ek9`a=
x>Kv#tMOY`KtX-BRW)C@{tAjfh$P&=!gi{$Rq&TCBKIdF8lNuM&gmAr5#UC)^F2w)<

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 5d23423..cc16537 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
@@ -59,6 +59,7 @@ public class Path {
                     }
                     arcs.add(a);
                 }
+                System.out.println(new Path(graph, arcs));
                 return new Path(graph, arcs);
     }
 
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 f70968595f3a4f82149a0ea05e0baf8a4a3ab252..395dc28ab1971f059376be12d7735f70e942423d 100644
GIT binary patch
delta 2612
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

delta 2550
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
O$Y`!#|C%@seDfckCbIkh