be-graphes-model/src/main/java/org/insa/graphs/model/Path.java

@@ -198,22 +198,15 @@ public class Path {
      * 
      * @return true if the path is valid, false otherwise.
      * 
+     * @deprecated Need to be implemented.
      */
     public boolean isValid() {
-<<<<<<< HEAD
-        boolean valid=true;
-        for (int i=0; i<arcs.size()-1;i++){
-            if(arcs.get(i).getDestination() != arcs.get(i+1).getOrigin()){
-                valid=false;
-            
-=======
         for (int i=0; i<arcs.size()-1;i++){
             if(arcs.get(i).getDestination() != arcs.get(i+1).getOrigin()){
                 return false;
->>>>>>> 9512825678cb119a068d94f8af261d356638dbdd
             }
         }
-        return valid;
+        return true;
     }
 
     /**
@@ -243,8 +236,6 @@ public class Path {
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
-=======
-<<<<<<< HEAD
 
 =======
 <<<<<<< HEAD
@@ -253,7 +244,6 @@ public class Path {
 >>>>>>> 052958ee6eb4821ebbb9c903780d467d62617fd2
 >>>>>>> 661162456a46270c315c09521ce09f85f0020150
 >>>>>>> 534e0b728e13a532d629312ec48c8c6185679721
->>>>>>> 9512825678cb119a068d94f8af261d356638dbdd
      */
     public double getTravelTime(double speed) {
         double TotalTime = 0;