From 3303f2400c2f52043d8f8a62064ad1ed1e7d32a7 Mon Sep 17 00:00:00 2001 From: pfaure Date: Mon, 16 Mar 2020 12:06:55 +0100 Subject: [PATCH] Version fonctionnelle - Ajout getMinimumTravelTime isValid --- .../main/java/org/insa/graphs/model/Path.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 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 10b20f3..d89d599 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 @@ -197,12 +197,21 @@ public class Path { * * * @return true if the path is valid, false otherwise. - * - * @deprecated Need to be implemented. */ public boolean isValid() { - // TODO: - return false; + boolean retour = true; + if ((! this.isEmpty()) && (!(this.size() == 0))) { + Node Deb = this.origin; + for (Arc arc : this.arcs) { + if (Deb == arc.getOrigin()) { + Deb = arc.getDestination(); + } else { + retour = false; + break; + } + } + } + return retour; } /** @@ -239,12 +248,13 @@ public class Path { * on every arc. * * @return Minimum travel time to travel this path (in seconds). - * - * @deprecated Need to be implemented. */ public double getMinimumTravelTime() { - // TODO: - return 0; + double minimumTravelTime = 0; + for (Arc arc : this.arcs) { + minimumTravelTime = minimumTravelTime + arc.getMinimumTravelTime(); + } + return minimumTravelTime; } }