From 346c04150bcc282fdba582b34e46f90976932be0 Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20543>
Date: Tue, 28 Mar 2023 15:45:30 +0200
Subject: [PATCH 1/2] m

---
 .../main/java/org/insa/graphs/model/Path.java |   4 ----
 .../classes/org/insa/graphs/model/Path.class  | Bin 4724 -> 4724 bytes
 2 files changed, 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 7210561..c5d28dc 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
@@ -234,10 +234,6 @@ public class Path {
      * @return Time (in seconds) required to travel this path at the given speed (in
      *         kilometers-per-hour).
      * 
-<<<<<<< HEAD
-     *
-     *
->>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
      */
     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 bde81ea836712266c13b2f39dd2a084eb767cdab..275e6e91e12e3a0c8bf222b5ef2d62fdd4501f6f 100644
GIT binary patch
delta 35
qcmeyO@<nCC1wq003``6k7-SeeGN=M+eTL7I9}1Q+GE9yTk^unmHVh2_

delta 35
qcmeyO@<nCC1wp~j3``7P7-Sf}GN=M+eTMIo9}1Q+vP_N;k^unn#tbC@


From 9512825678cb119a068d94f8af261d356638dbdd Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20543>
Date: Tue, 28 Mar 2023 16:02:21 +0200
Subject: [PATCH 2/2] mintime

---
 be-graphes-model/.gitignore                   |   1 +
 .../main/java/org/insa/graphs/model/Path.java |  10 ++++++----
 .../classes/org/insa/graphs/model/Path.class  | Bin 4724 -> 4850 bytes
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/be-graphes-model/.gitignore b/be-graphes-model/.gitignore
index b83d222..a233b5c 100644
--- a/be-graphes-model/.gitignore
+++ b/be-graphes-model/.gitignore
@@ -1 +1,2 @@
 /target/
+*.class
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 6ec8022..f1db85a 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
@@ -201,10 +201,9 @@ public class Path {
      * @deprecated Need to be implemented.
      */
     public boolean isValid() {
-        for (int i=0; i<arcs.size();i++){
+        for (int i=0; i<arcs.size()-1;i++){
             if(arcs.get(i).getDestination() != arcs.get(i+1).getOrigin()){
                 return false;
-            
             }
         }
         return true;
@@ -263,8 +262,11 @@ public class Path {
      * @deprecated Need to be implemented.
      */
     public double getMinimumTravelTime() {
-        // TODO:
-        return 0;
+        double minTime = 0;
+        for (Arc a : arcs){
+            minTime += a.getMinimumTravelTime();
+        }
+        return minTime;
     }
 
 }
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 18957669f81e616e79854ad91dafb6a01dbf8720..5bfb92a67519f63b3eab8c28cbe0f9762e071525 100644
GIT binary patch
delta 314
zcmX|+y)OfC7{@=q>z&KhOYQ{8wW1f%G@4?ukVcH1EM+4iYUptO1&e{n#We;I)axih
zB<&zJNjHB0(#b9sg!8Dx^nIT1%k%sG-iBV&cH_H#3ygDSqA3#Ll99N~23AiTpQ8>A
zI8>N^d3CnzuUyrwpv~GwN0ZESShOb$y;O}F;g+3pr+6SGeBYnSB1PFW^5MN*avo)R
z!sQuHaF}M8cPh@iupjjENm_7>udwONuT|s)L$ae?h3qv8HP#iA`Z>L>USmUXhd+}U
zxuLpT_+<jcZuFA5kVK4uRs%^ZOFk4QsoEJ7%&E>+J5M}v`M+I`WA;!aG1+HF)HzQK
V-DnXux`~R3vI&luPDIf-{Q-emKjHuY

delta 186
zcmeyQ`b9<H)W2Q(7#J8#7#6cLFflSnO-^K$+Nd>wbMraQ32dAb7+4sXfYNr8(*-P<
z7ydspd8vTBqz%I*26>>U7(|XCo*@{>V`8wHd{-bv@E(wLpFxu00fPdN)?|1zIY@Ad
z;4h%)Zw48LKMblsTA$(H<nMwp<~l%8Mvz{<^<Wd^fFv78gpnI;0}n(NY6By~La?eu
E01bvF#Q*>R