From 3651cfadd2c74b6c2308af5ed33d391623943d8e Mon Sep 17 00:00:00 2001 From: ahamdy Date: Wed, 22 Apr 2020 15:37:59 +0200 Subject: [PATCH] Changes to be committed: modified: be-graphes-model/src/main/java/org/insa/graphs/model/Path.java --- .../main/java/org/insa/graphs/model/Path.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 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 a5a2abe..d8ee4a4 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,15 +201,26 @@ public class Path { * @deprecated Need to be implemented. */ public boolean isValid() { - if (!this.isEmpty()) { - return false; + if (this.isEmpty()) { + return true; } - if (this.getArcs().size() != 0) { - return false; + else if (this.size() == 1) { + return true; } - return true; - } - + else { + Node origine = this.getOrigin(); + for (Arc arc : this.arcs) { + if (!origine.equals(arc.getOrigin())) { + return false; + } + origine = arc.getDestination(); + } + } + + return true; + } + + /** * Compute the length of this path (in meters). * @@ -251,8 +262,11 @@ public class Path { * @deprecated Need to be implemented. */ public double getMinimumTravelTime() { - // TODO: - return 0; + double temps = 0; + for(Arc myArc : this.arcs) { + temps+= myArc.getMinimumTravelTime(); + } + return temps; } }