From 0deb15ea1338927bc652127f2780ad7ab720c22f Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20543>
Date: Tue, 28 Mar 2023 17:22:22 +0200
Subject: [PATCH] path valide

---
 .../main/java/org/insa/graphs/model/Path.java |  65 ++++++++++++++----
 .../classes/org/insa/graphs/model/Path.class  | Bin 4873 -> 5897 bytes
 2 files changed, 53 insertions(+), 12 deletions(-)

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 5b228ce..5d23423 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
@@ -30,13 +30,36 @@ public class Path {
      * @throws IllegalArgumentException If the list of nodes is not valid, i.e. two
      *         consecutive nodes in the list are not connected in the graph.
      * 
-     * @deprecated Need to be implemented.
+     *
      */
     public static Path createFastestPathFromNodes(Graph graph, List<Node> nodes)
             throws IllegalArgumentException {
-        List<Arc> arcs = new ArrayList<Arc>();
-        // TODO:
-        return new Path(graph, arcs);
+                List<Arc> arcs = new ArrayList<Arc>();
+                Arc a = null;
+                if (nodes.isEmpty()){
+                    return new Path(graph);
+                } else if (nodes.size() == 1){
+                    return new Path(graph, nodes.get(0));
+                }
+                for (int i=0;i<nodes.size()-1;i++){
+                    double min = Double.MAX_VALUE;
+                    Node origine=nodes.get(i);
+                    Node dest = nodes.get(i+1);
+                    if(origine.getNumberOfSuccessors() == 0){
+                        throw (new IllegalArgumentException());
+                    }
+                    for (Arc suivant : origine.getSuccessors()){
+                        if (suivant.getMinimumTravelTime()<min && suivant.getDestination() == dest){
+                            min = suivant.getMinimumTravelTime();
+                            a = suivant;
+                        }
+                    }
+                    if (a == null){
+                        throw (new IllegalArgumentException());
+                    }
+                    arcs.add(a);
+                }
+                return new Path(graph, arcs);
     }
 
     /**
@@ -51,12 +74,36 @@ public class Path {
      * @throws IllegalArgumentException If the list of nodes is not valid, i.e. two
      *         consecutive nodes in the list are not connected in the graph.
      * 
-     * @deprecated Need to be implemented.
+     *
      */
     public static Path createShortestPathFromNodes(Graph graph, List<Node> nodes)
             throws IllegalArgumentException {
         List<Arc> arcs = new ArrayList<Arc>();
-        // TODO:
+        Arc a = null;
+        if (nodes.isEmpty()){
+            return new Path(graph);
+        } else if (nodes.size() == 1){
+            return new Path(graph, nodes.get(0));
+        }
+        for (int i=0;i<nodes.size()-1;i++){
+            float min = Float.MAX_VALUE;
+            Node origine=nodes.get(i); 
+            Node dest = nodes.get(i+1);
+            if(origine.getNumberOfSuccessors() == 0){
+                throw (new IllegalArgumentException());
+            }
+            for (Arc suivant : origine.getSuccessors()){
+                if (suivant.getLength()<min  && suivant.getDestination() == dest){
+                    min = suivant.getLength();
+                    a = suivant;
+                }
+            }
+
+            if (a == null){
+                throw (new IllegalArgumentException());
+            }
+            arcs.add(a);
+        }
         return new Path(graph, arcs);
     }
 
@@ -242,12 +289,6 @@ public class Path {
 
 =======
 <<<<<<< HEAD
-     *
-     *
->>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
->>>>>>> 661162456a46270c315c09521ce09f85f0020150
->>>>>>> 534e0b728e13a532d629312ec48c8c6185679721
->>>>>>> 9512825678cb119a068d94f8af261d356638dbdd
      */
     public double getTravelTime(double speed) {
         double TotalTime = 0;
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 667634c4aba62bb38d53438f1bcbcb05a3c88ef9..f70968595f3a4f82149a0ea05e0baf8a4a3ab252 100644
GIT binary patch
literal 5897
zcmbtYU365{8Qo`oa%U!&5CS1i5_QxHnaLlbA|w$-1|%2)8jOOia+%yrE=*?P%mhIz
zU`4A~wNz^rDS}p06&0&YjI`(*T|W5MW!s0Y+SRpO?Mq*~syN-}+&e#snOIlF%$$3E
zzHguJ+uuHC?k8V=cn-idIH$oS(3nccJFR5K=!~b0v5`#YXllqzbZ#-SBN{vcwY!Wx
zMrXoE#ydCf+-1hH0$w#!;Nrg7*WN4*bqiFb(pKC`3N%-k*iToS=P}Z;3_bNJSL0bL
z(b;EZvK;XbSn;Hh9Z#DA?K6gZDi~dpj&-l*+QwMgG_vM;Ba<~VS-GF}>C~unNnf|L
zR9J0epW&)ITw%7fN>_n(dt>HU)=DKa8Wsp#UW!?7B4Ngj#F}(`eAG;4ixUN`?*yUJ
zZdC|Ze;Yv0T5elIy}-g!jMt>o#y%P702ZM^$3+M-XFXQZ%B~i0w}c0)(S(aNGz-*}
zmdO=5F2SV&nw42MI+oq1W^WHb;4*3Ea)Hp?o3l-SPsf#5!u)5f`<Y;R?3Er{bc7M%
zbKE4^>RWolb~?&9*sY<hB6Vd*B$f_|rBk41ZY&j2s{$JytUB<oy!tPIR$Q&KYzVlX
z$oj`ecbe(V!vo{7n3>6>(wP8i(IBT?r(-2n3C!cP(y%~Xi?fpw#pQmxb@bqR0iTsM
z(?&Lx7FaxOX0OxVU5y*CM#GIXRmw+URL4zN%U~wWy$su;f`#c(TPF~ly=YlB0Yq`L
zjt%JLdSc&1DvXYgZcQ6|%*0k})Xq^<PP;`%A2yK}oEBwyS*%jhU*Hn@o!x;7sNBJ3
z9a|K8MvP29!O9riregqGnR8=kNap;T84oLd4a%I}A+YRQa#{+HQj+kX!2CWdY1&!a
zYV1sKGj)Bbn2{JX(w2O7I=x9-A%r2&RADPpVg!W6KZeRZDm6|-Sr4}0(X@vu!z^f-
zachr}WNYzsU;D-i{yJu8&9@XfSv8O~V!JmPV+yc_5#pRZ;!4XnY761ONGkmeCG;FP
zkk8A6CUlH~+we1?eP%MArCAo_dTxw=)v;7EMlofUxw-C^yD9`m>0u=Ts6ij7zLB*?
zGMUPT%B+TrWXP0S5=u~CLaE`<7_~LiA&Y8UCVkHgS`1{<Rx;il9+aiNSI0iw&k`bf
zXV;fjB%&?x0mSh`9S>r^y^I0vCH1D)jpHPMgZPn#ho+r|_Lz=`C2y<Dd&iAL#)n4)
zI%nCP+DvGe2T*9p8Xh*&JPSf`b>MP~0zcOAn3N2S8z8%=C5v!a#}oJoZL=oUBoeG#
zr!16wtWEJ`iOHhtwoBtF9Zx%=JZL1WAs>zitgMJ7J7Q!*L#dF=!*D7+8Ztr|1~g%+
zz<2PJSD1Oq&zWq_8?_@>S5~u5+?cX5b{EeZ){aLSuY57sVxOzaXIovVK<sm0!!rT6
z(couLf2qTZD%pBThX$W)oz&q+fB>>17MbXg)h@8<JITr12qYt;cumKI6i8W5o1JS=
zXF-#T`aid&0N%hU4R11xB|R(UJ)`3-yiHDyCwXVHhLws*x#I<-oGG>fmW5JvNY-7<
z?Cp_UVU=$u(GrEiH_|ct_$t?aPfIkc#D7x9`#8h3nK9GkTL0Em)^HApK-3&dn^G${
zpivp^b0aX28c)Z}^_J9Kzf5n3+!8J$3O8?~Zq&(Ku~jECrM{Ubj#jhnf=(ImV;*Wa
zb3S`K9I182>adVgB3v)${_QLlZJWg6O`^Yb3XK9UKtBtyEi#GFY4%*fq@TcI)z#{r
z!crGLM(ZTnPrFxmCh+tkEL-Jmt@jj0x->p`b`&3dK`n>nM^Swiwe)lCNAh{a6uJbu
z0u$&62ByI4)5nN*`Gfu()?eg({uml$b7Ro=8s@3aRo<Y#Ury~8IGX>o{d~z@Tl*Al
zb>WUf9#QXc01uta?^1}{CUN^|wf{T$xgCr7c_rhugt1!6IJBUdm!~C&U=`YU*0z(1
z9k>;p*nwpj!BrT;)s&TMa01top({wStC`JJ_yAo5-GkqA-5;?U+i3awj5#CfWJb2O
ztDN}oXIVweOMr9l;ygE39>WiCH!~B(A>2cMUi!Tc2GMDJ8o^GseDr-OV#@LmZ7-$`
z+pfus+IDsJ4YT)7_%5JXLz9MR^H=bSud&Rnp_TvVNrZrgxEhq>!Wp2e8-Pe2_3+I)
zj(-!gAJ!a93KMyN{y+c!nDkWLu9ee>R5hJQTCi#ck@)No$uEiIFA~WY^yRR-!TX#f
z5}O-?nk16!T<Hz^`sLLBnMk`U66sbZ;5Kf3fJE9#BHd0R4U!snGN#+GmdW43WZ%Q&
z#hL09TZft0mzd($nB3R-{2miG$<dD(;PYJf8FrTu>GL9yJ}(mKPemeqRwUAk4w2R>
zBBi)$i$kO;`ml+l(YH+`A4)`$c5Na_yK@k!(^ZK`&Ok*X6~+~j9%nh-OS+aMiBcpU
zW)Wy4(2>ZwqnIakqAop&>_-vz@*M8V;ekHS^%Dq1nw`hi91avF9+DFexkPj1+{yf3
z3k-~G>#91p!mAXjK3G-nS>E5)p2MR#JZ|emz4v7PpDMA+hm?taPI$6l_NUTpdr3L^
zrDo!OhV}u1e-J_J=TEu=)QW>xj)$lZ2l*RjKh`h>y?BHvf0TiJgh_vly^phXn4eGZ
z-(lW5o>WO*t@Qf{euiggJBYn_7C&cIH<3nC8C<lqfoXY;EvYQO!1L6N{X}B7WEyqO
zw`aZJsK5$n^Dm%A!$A>r<<SUD!%;qIydep}Hn1R151wMTMjOn6{2|IuxzD@lN9s%?
z4}ljWt!Hp7BF^A=#0l>ioOqX`E)rHMl9!*ynZlQd@dS0^B=_>N+M%shjeL5Zb7)Ty
znun+Sq3QS<p)a=_EBR`h+t(ZP^(K9tqOZ5;>uu#LWLx=$FX{Ca7OG2my@TKO3Hd9v
z({qmZ_G#WvMB3EBcN`1b3P)ZvhgT=~f`{1T<~?Pb&+%!JfIc9gDINzOmH}!n0%~_Q
z4<0i1VNgh*-BYN(RxoWXpg=QQQnBT?$kS(87pscBt=tpu@lGUVL}ezuk@s;-QrAvU
zmFoOhVUl#=1P7ClS1$I*l$S3)K6CN;Sr_vMt+RL?qbLnG(enxUXI~qJoJ#;hw{fP)
zPs>a;74h&+Urf-i6|UtpEKU2Q*$?pgOgn!lv*Rn;;oBAm+G=NgHP;_M53lEx`xMQ&
zRr>7E{H4r9wPQk_r`(gg0rQoMW2;Y*2xy4p@Xia++!Ltr6t}x$rrj^f>^79y^}<!X
zQSORAKOD=ikU_EtZu0cFDRu4AXmeTg)N}DtC8_u-yzU;Qd!=xn%zx5U0@0}C<v+yy
zCDrvS^6~=Z>Px;25ek@HFgH2CT(}XZ@h<Urcr~%*M+U(U_XTJ|ERprYU%U?BBQ)#b
zaBFqc4gjxn{S#QkyO@2M+jK=6PurbQcBqr~A6LAsLRypzF^_LkYxoLnK0^Esiv?w<
zT8pT{_zgvrzvZ}x_b7w*Ri{qY$b6|`!o>kzVQM*tmuv^#%jCE`QLd`lScKPAHGzwQ
zRRw@u-f+;nG>2SlqwG{5{~ms42FN7@xs)&TT5u)5J4Hl+jHta|<$$Ccmi`X9cCn16
z*mCnS;8(}9SKZ7OO1QP~60X~A<E0qO7e`$3Azeao{aKooV%kx&p@iBqf%>4QfVzJv
zPpS2>4YEf;{$lA&$SVl>Iy8xue6M&NU;A~H#kHdt*EXD0kedj{zL3gntGL#xxH>o&
M5a(|>;==F#3%80Apa1{>

literal 4873
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