From 79dc211f957affca7bbdd655a9992b1d225ebe65 Mon Sep 17 00:00:00 2001 From: Sabben Matteo Date: Fri, 4 Apr 2025 09:44:28 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Mise=20en=20place=20de=20la=20m=C3=A9thode?= =?UTF-8?q?=20getLength?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../insa/graphs/algorithm/utils/PriorityQueueTest.java | 3 ++- .../src/main/java/org/insa/graphs/model/Path.java | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/PriorityQueueTest.java b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/PriorityQueueTest.java index 27bb14e..649875f 100644 --- a/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/PriorityQueueTest.java +++ b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/PriorityQueueTest.java @@ -311,7 +311,8 @@ public abstract class PriorityQueueTest { Assume.assumeFalse(queue.isEmpty()); int min = Collections.min(Arrays.asList(parameters.data)).get(); for (MutableInteger mi : parameters.data) { - // Update value before removing it. This is what happens when updating a Dijkstra label before updating it. + // Update value before removing it. This is what happens when updating a + // Dijkstra label before updating it. mi.set(--min); queue.remove(mi); assertEquals(parameters.data.length - 1, queue.size()); 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 7580981..27561e2 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 @@ -30,7 +30,8 @@ public class Path { public static Path createFastestPathFromNodes(Graph graph, List nodes) throws IllegalArgumentException { List arcs = new ArrayList(); - // TODO: + // TODO : faut faire en fct du maxspeed ds road information + return new Path(graph, arcs); } @@ -198,8 +199,11 @@ public class Path { * @deprecated Need to be implemented. */ public float getLength() { - // TODO: - return 0; + float pathLength=0f; // sinon error si on met O.O + for (Arc element : this.arcs) { + pathLength=pathLength+((float) element.getLength()); + } + return pathLength; } /** From ca03cd58605c2a88d336385ac115933c0a4f8fd7 Mon Sep 17 00:00:00 2001 From: Sabben Matteo Date: Fri, 4 Apr 2025 10:06:21 +0200 Subject: [PATCH 2/3] =?UTF-8?q?ajout=20des=20m=C3=A9thodes=20TravelTime()?= =?UTF-8?q?=20et=20MinimumTravelTime()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/insa/graphs/model/Path.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 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 27561e2..5cbc3ab 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 @@ -196,7 +196,7 @@ public class Path { * Compute the length of this path (in meters). * * @return Total length of the path (in meters). - * @deprecated Need to be implemented. + * */ public float getLength() { float pathLength=0f; // sinon error si on met O.O @@ -215,8 +215,11 @@ public class Path { * @deprecated Need to be implemented. */ public double getTravelTime(double speed) { - // TODO: - return 0; + double travelTime=0; // sinon error si on met O.O + for (Arc element : this.arcs) { + travelTime=travelTime+element.getTravelTime(speed); + } + return travelTime; } /** @@ -227,8 +230,11 @@ public class Path { * @deprecated Need to be implemented. */ public double getMinimumTravelTime() { - // TODO: - return 0; + double minimumTravelTime=0; + for (Arc element : this.arcs) { + minimumTravelTime=minimumTravelTime+element.getMinimumTravelTime(); + } + return minimumTravelTime; } } From d7c5d21b4235d1d120131b90504d701d79e9e26b Mon Sep 17 00:00:00 2001 From: Matteo Date: Fri, 4 Apr 2025 10:10:36 +0200 Subject: [PATCH 3/3] =?UTF-8?q?juste=20enlever=20les=202=20deprecated=20pa?= =?UTF-8?q?s=20enlev=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/insa/graphs/model/Path.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5cbc3ab..d801511 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 @@ -212,7 +212,7 @@ public class Path { * @param speed Speed to compute the travel time. * @return Time (in seconds) required to travel this path at the given speed (in * kilometers-per-hour). - * @deprecated Need to be implemented. + * */ public double getTravelTime(double speed) { double travelTime=0; // sinon error si on met O.O @@ -227,7 +227,7 @@ public class Path { * every arc. * * @return Minimum travel time to travel this path (in seconds). - * @deprecated Need to be implemented. + * */ public double getMinimumTravelTime() { double minimumTravelTime=0;