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 ddbcb63..9d113a1 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 @@ -81,7 +81,7 @@ public class ArcInspectorFactory { @Override public boolean isAllowed(Arc arc) { - return true; + return forCarsL.isAllowed(arc) ; } @Override @@ -108,7 +108,7 @@ public class ArcInspectorFactory { } ; // Non-private roads for pedestrian and bicycle: - static ArcInspector forBicyclesT = new ArcInspector() { + static ArcInspector forPedestrianT = new ArcInspector() { static final int maxPedestrianSpeed = 5 ; @@ -155,7 +155,7 @@ public class ArcInspectorFactory { filters.add(allArcsL) ; filters.add(forCarsL) ; filters.add(forCarsT) ; - filters.add(forBicyclesT); + filters.add(forPedestrianT); // Add your own filters here (do not forget to implement toString() // to get an understandable output!): diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java index bacb8e3..0390e44 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java @@ -8,7 +8,10 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm { @Override protected ShortestPathSolution doRun() { + // First step: get data from the input problem. + // The getInputData method is inherited from parent class ShortestPathAlgorithm final ShortestPathData data = getInputData(); + ShortestPathSolution solution = null; // TODO: return solution;