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 3543de9..7af5570 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 @@ -215,8 +215,13 @@ public class Path { * @deprecated Need to be implemented. */ public double getTravelTime(double speed) { +<<<<<<< HEAD return getLength() * 3600.0 / (speed * 1000.0); +======= + // TODO: + return getLength() * 3600.0 / (speed * 1000.0); +>>>>>>> refs/remotes/origin/main } /**