diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java index f00186c..e0683cc 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java @@ -17,12 +17,22 @@ public class AStarAlgorithm extends DijkstraAlgorithm { } @Override - public void ShortestVerif(ShortestPathSolution solution,ArrayList solutionNodes , ShortestPathData data) + public void shortestVerif(ShortestPathSolution solution,ArrayList solutionNodes , ShortestPathData data) { Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes); System.out.println("shortest path : " + p.getLength()); if (p.getLength()-solution.getPath().getLength() < 1.00){ - System.out.println("le chemin Astar est le shortest"); + System.out.println("le chemin Astar bien est le shortest"); + } + + } + + @Override + public void fastestVerif(ShortestPathSolution solution,ArrayList solutionNodes,ShortestPathData data){ + Path p= Path.createFastestPathFromNodes(data.getGraph(), solutionNodes); + System.out.println("fastest path : " + p.getMinimumTravelTime()); + if (p.getMinimumTravelTime()-solution.getPath().getMinimumTravelTime() < 1.00){ + System.out.println("le chemin Astar est bien le fastest"); } } 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 f6430d8..bbc1c85 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 @@ -97,18 +97,30 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm { solutionNodes.add(a.getOrigin()); } solutionNodes.add(data.getDestination()); - ShortestVerif(solution, solutionNodes, data); + shortestVerif(solution, solutionNodes, data); + fastestVerif(solution, solutionNodes, data); return solution; } - public void ShortestVerif(ShortestPathSolution solution,ArrayList solutionNodes , ShortestPathData data) + + public void shortestVerif(ShortestPathSolution solution,ArrayList solutionNodes , ShortestPathData data) { Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes); System.out.println("shortest path : " + p.getLength()); if (p.getLength()-solution.getPath().getLength() < 1.00){ - System.out.println("le chemin Dijkstra est le shortest"); + System.out.println("le chemin Dijkstra est bien le shortest"); + } + + } + + + public void fastestVerif(ShortestPathSolution solution,ArrayList solutionNodes,ShortestPathData data){ + Path p= Path.createFastestPathFromNodes(data.getGraph(), solutionNodes); + System.out.println("fastest path : " + p.getMinimumTravelTime()); + if (p.getMinimumTravelTime()-solution.getPath().getMinimumTravelTime() < 1.00){ + System.out.println("le chemin Dijkstra est bien le fastest"); } } diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.class index f921f08..c711e43 100644 Binary files a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.class and b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.class differ diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class index ebf886b..f08991c 100644 Binary files a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class and b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class differ 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 cc16537..62ff32b 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 @@ -266,7 +266,6 @@ public class Path { * */ public float getLength() { - // TODO: float length=0; for (Arc arc : arcs) { length += arc.getLength(); @@ -282,14 +281,6 @@ public class Path { * @return Time (in seconds) required to travel this path at the given speed (in * kilometers-per-hour). * -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD - -======= -<<<<<<< HEAD */ public double getTravelTime(double speed) { double TotalTime = 0; @@ -305,7 +296,7 @@ public class Path { * * @return Minimum travel time to travel this path (in seconds). * - * @deprecated Need to be implemented. + * */ public double getMinimumTravelTime() { double minTime = 0; diff --git a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class index 395dc28..3b9dca3 100644 Binary files a/be-graphes-model/target/classes/org/insa/graphs/model/Path.class and b/be-graphes-model/target/classes/org/insa/graphs/model/Path.class differ