diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/AbstractInputData.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/AbstractInputData.java index a2a1b1f..faef8b8 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/AbstractInputData.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/AbstractInputData.java @@ -77,10 +77,14 @@ public abstract class AbstractInputData { * @return The maximum speed for this inspector, or * {@link GraphStatistics#NO_MAXIMUM_SPEED} if none is set. */ + + /* Apparently, getMaximumSpeed is never initialized in arcInspectors. + * => Do not use. public int getMaximumSpeed() { return this.arcInspector.getMaximumSpeed(); } - + */ + /** * Check if the given arc is allowed for the filter corresponding to this input. * diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspector.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspector.java index 18e6f2a..f8e3fc0 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspector.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspector.java @@ -33,7 +33,7 @@ public interface ArcInspector { * @return The maximum speed for this inspector, or * {@link GraphStatistics#NO_MAXIMUM_SPEED} if none is set. */ - public int getMaximumSpeed(); + /* public int getMaximumSpeed(); */ /** * @return Mode for this arc inspector. diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspectorFactory.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspectorFactory.java index d43df60..b9b6a7a 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspectorFactory.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspectorFactory.java @@ -32,10 +32,12 @@ public class ArcInspectorFactory { return arc.getLength(); } + /* @Override public int getMaximumSpeed() { return GraphStatistics.NO_MAXIMUM_SPEED; } + */ @Override public Mode getMode() { @@ -62,10 +64,12 @@ public class ArcInspectorFactory { return arc.getLength(); } + /* @Override public int getMaximumSpeed() { return GraphStatistics.NO_MAXIMUM_SPEED; } + */ @Override public Mode getMode() { @@ -91,10 +95,12 @@ public class ArcInspectorFactory { return arc.getMinimumTravelTime(); } + /* @Override public int getMaximumSpeed() { return GraphStatistics.NO_MAXIMUM_SPEED; } + */ @Override public Mode getMode() { @@ -120,11 +126,13 @@ public class ArcInspectorFactory { return arc.getMinimumTravelTime(); } + /* @Override public int getMaximumSpeed() { return GraphStatistics.NO_MAXIMUM_SPEED; } - + */ + @Override public Mode getMode() { return Mode.TIME; @@ -139,6 +147,8 @@ public class ArcInspectorFactory { // Non-private roads for pedestrian and bicycle: filters.add(new ArcInspector() { + static final int maxPedestrianSpeed = 5 ; + @Override public boolean isAllowed(Arc arc) { return arc.getRoadInformation().getAccessRestrictions() @@ -149,7 +159,7 @@ public class ArcInspectorFactory { @Override public double getCost(Arc arc) { return arc.getTravelTime( - Math.min(getMaximumSpeed(), arc.getRoadInformation().getMaximumSpeed())); + Math.min(maxPedestrianSpeed, arc.getRoadInformation().getMaximumSpeed())); } @Override @@ -157,11 +167,13 @@ public class ArcInspectorFactory { return "Fastest path for pedestrian"; } + /* @Override public int getMaximumSpeed() { return 5; } - + */ + @Override public Mode getMode() { return Mode.TIME;