From 44de56129eddd5d7005513e8c34299b1c4b4538e Mon Sep 17 00:00:00 2001 From: Nabzzz Date: Mon, 16 Mar 2020 16:22:00 +0100 Subject: [PATCH] modified: CreateFastestPath() --- .../main/java/org/insa/graphs/model/Path.java | 39 ++++++++++++++++-- .../classes/org/insa/graphs/model/Path.class | Bin 5431 -> 5888 bytes 2 files changed, 35 insertions(+), 4 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 0fd92e9..b6eb926 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,12 +30,43 @@ 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 nodes) throws IllegalArgumentException { - List arcs = new ArrayList(); - // TODO: + List arcs = new ArrayList(); + double min_time; + Arc min_a=null; + Arc a; + boolean found; + if (nodes.size()==1) + { + return new Path(graph,nodes.get(0)); + + } + for(int i=0;i nodes) throws IllegalArgumentException { 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 bb120ef93684166052732cdc87182278f580eeaf..a84c516a2b1b1c03c6934064143fa864c8e28cdb 100644 GIT binary patch literal 5888 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

aAc$bP7+d!IyRfJB(mQ#T0I8s*V;S?$UFo zu~ufTJKFf{3s~h1chp8UhC?03M1`uZm@i4gn4EpN+Bk`2?_=fus%igkxt-3X(~5!lxEPoZ{lK(ig7S7UfR*?q zrS9V1Tc~$8M-l3M7+=NBBvccg#Q^pY;Wcbzw{TQZ5>%1v1y$rqQ1?>rGcaapM#R8A z16T4ND5w*drH+b)lS<}U2#fPU*{hVE?_My^C4YtVS>(j0SU*dH=9YZT6ox10qg#n^ zE(u6`^$2NiaP>sud?AXrNfZ;o_Gx^58dhKE+9|{nYyH=zY1oC0BeHQKpw=eNPtN|K zz|h40jgj*m;b2E-3e~ld>QH-sbIUZ+)5z|d2&w8&b$D|2&zcNchoo3PH{=Uq?-j8v zl64+Q`mvhh5jyW~f*<9DE<^HU8LTmqf9fjN^73gw1CbhwuRD@+gkb z`1|lApT|iZ$=uDlVw~XW5x&)O=Y9AFv$G!Sb+`kRbR$E0KOH7ydH@fSDi08eH@cjs zOz!t~J>&F~o5cNi>Gc~<+vE2r*wdXCL%g2V&B7wg>pVDkrOS-;oZfDCJ^O(CC@+hYlK5*f@k>Z^-|9@ zzbz3_>5GsON}J?{$RE(YtUgU5;G)Ddo_!8Ra0<&qMRV_3DEIdzaxW^88%CgVhoIs; z-k1D4GDs3`L?oXi*lC;$of5PhJufOsX?Pmjf}5t$BJ=enKGyGkAN>GA*jEq^o|#Ze z2gVP|HL0=n>zT1Ushm zC8aygGDKFW|Day24}8kojbbgl-Z$?AjSEppQ)Rd3t``*gr?95w98M|T8aj8bYi7?s z(9Ma{3MXg(wC)WZ0J-q!98+|filA0S5$Cf}#WWr->6?5!0Y>UIW}lQ713zIG^?G5I zWYh|&cq+h!NoaUy@KYb&78WHbK_;F3#?cLH@MbpqCf`f)N7a_tZ~FSA{JzcpEwSXK z(U5ry$!g6&nA^9vA4BoZ!@NS Qdn=Z-w~E+iv_