diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/MyArcInspector.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/MyArcInspector.java index d656bd3..fcc624c 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/MyArcInspector.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/MyArcInspector.java @@ -21,7 +21,13 @@ public class MyArcInspector implements ArcInspector { boolean result=true; if (this.restreint){ RoadInformation.RoadType type=arc.getRoadInformation().getType(); - if (type==RoadInformation.RoadType.PEDESTRIAN || type==RoadInformation.RoadType.CYCLEWAY ) { + if (type != RoadInformation.RoadType.MOTORWAY && + type != RoadInformation.RoadType.TRUNK && + type != RoadInformation.RoadType.PRIMARY && + type != RoadInformation.RoadType.SECONDARY && + type != RoadInformation.RoadType.TERTIARY && + type != RoadInformation.RoadType.RESIDENTIAL && + type != RoadInformation.RoadType.UNCLASSIFIED ) { result=false; } } diff --git a/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/TestDijkstra.java b/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/TestDijkstra.java index df873f2..d81a1df 100644 --- a/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/TestDijkstra.java +++ b/be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/TestDijkstra.java @@ -175,10 +175,10 @@ public class TestDijkstra { // System.out.println("== Trajet long (et pénible avec les enfants) =="); // testScenario("bretagne.mapgr",564429,602395 , Mode.LENGTH, false,false,false); - System.out.println("== Test bug dijkstra temps =="); - testScenario("paris.mapgr", 27361, 36108, Mode.TIME, true,false,false); + // System.out.println("== Test bug dijkstra temps =="); + // testScenario("paris.mapgr", 27361, 36108, Mode.TIME, true,false,false); // ce test mettait en lumière un problème d'arrondi qui est mtn résolu. - // System.out.println("== Trajet impossible (piste cyclable) =="); - // testScenario("insa.mapgr",90,922 , Mode.LENGTH, false,false,true); //marche pas + System.out.println("== Trajet impossible (piste cyclable) =="); + testScenario("insa.mapgr",90,922 , Mode.LENGTH, false,false,true); //marche pas } }