From 2accc896287b44b4144e1cb4860cef9373f414f1 Mon Sep 17 00:00:00 2001
From: Bafo <fofana@insa-toulouse.fr>
Date: Tue, 28 Mar 2023 16:04:00 +0200
Subject: [PATCH] m

---
 .../main/java/org/insa/graphs/model/Path.java |  16 ++++------------
 .../classes/org/insa/graphs/model/Path.class  | Bin 4724 -> 4749 bytes
 2 files changed, 4 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 ea34258..64e0951 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
@@ -198,16 +198,16 @@ public class Path {
      * 
      * @return true if the path is valid, false otherwise.
      * 
-     * @deprecated Need to be implemented.
      */
     public boolean isValid() {
-        for (int i=0; i<arcs.size();i++){
+        boolean valid=true;
+        for (int i=0; i<arcs.size()-1;i++){
             if(arcs.get(i).getDestination() != arcs.get(i+1).getOrigin()){
-                return false;
+                valid=false;
             
             }
         }
-        return true;
+        return valid;
     }
 
     /**
@@ -234,14 +234,6 @@ public class Path {
      * @return Time (in seconds) required to travel this path at the given speed (in
      *         kilometers-per-hour).
      * 
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-     *
-     *
->>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
->>>>>>> 661162456a46270c315c09521ce09f85f0020150
      */
     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 2cf227535595481040285a9679ef627c95de783b..9332aa9d88d345456aabbfba1ec0f2c66a663926 100644
GIT binary patch
delta 522
zcmYL`%}Z2a7{!0@y>su(*ez#<alV>LG8IJ|gH|#{NE?GJh#-Q<tG1Xh1es=AnwB<N
z>D#A$YRPPhh+<%bq_t%W{{z9jg>B28t3;dU<D8dsp2Pd=z+`=B>CeI<aF}^Nh9ae1
zEA^o{7pSrdZhx*%q0Z~6K+L}7Fvhrk7ig$0GU;bR5xMLZ+|1Q{u0PY6zclFP2L>JP
za93{x_V1c<7-4h=MYO|xT^BrOKXZ7(%*UbNXZxBWDz2~bVM_1tWz8ccTAM#{AzdM7
z@P#X73R}Cc`#&-;k7Z^@43+k%3cU(n-|Xhn?zf_1vR7&fTk2N~zTsz?7QS;(=3}g|
zPncTI@emzc<czF_5X0O+gvfG=(}J88Jc#)lzfui`P?AKih7#$UimnpT)(W?kcjC#q
zmNNHxjtelYYr;o&KH#A|Pm1v)9_#LKtf~khfh4%T9!_+MLc3iek+lD5v|CL{tFg?}
z-V+`;t(e(dYkDsyZ0Ct#$-FLS{UFUx>ZNDc(5vBi{5dZ~+mQXGOs4QbUWsvaB<>kU
ag`8zhw?!KFuod1B#LK*$UC9S{+nc`(IC3fg

delta 590
zcmYk2%WD%+6vlt|&P--Ph8o8xCKVO6t%<Fn;3|}^iqPT<MCe9stf5BKVi~(FXnjPD
zrjF10Y(=suh$w*wifgGZ{2Tle1Qo@2W?CPMd!FAp-*;}c<I9%h`(Ll$0y}tWqZOH;
zXk}jH%1$OeR`Pe1PL27;6vo!<&ICs}?{a~QLDT8nSmBDzWrcUVI9be}@yjRjgMMkE
z=#NjhT%{VcoK0=lUCweYL4_HY8$muk9Gi8y!`+wF_?y_2#uI8t$*W<a#rGS1b$W8I
zIN08#ta-=D29r^4j{K{PKf^K>rj=?BTTMn4bFD>lK{gny7rO>a?4sBY<oHOp#C?2X
zL)43yhB?fBNi_xbvJb@p$sCNISgKP?F5<<8@@52Oir<zPSR$NO?5UILX>v)0B6n}@
zZgB0$fD~%M_Lcop0XJnfjm<4?%XGNgL$_FgX`{3>Dv%V6{KqoOyvVf$*V{Jqm!%M^
zvo;<3!&9)bX{)Qjz0sktSX0clK4+iH(EoRT<&fqZ>-bKG_&h(N!*kIMy~}qC5BGT>
v+*%M1B{F0p&Lh!lMS53-dXre9*D#g@rv(0(C&8fCrJUfjx7wZ)Zq58}f{Jzg