VerifFastest

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<Node> solutionNodes , ShortestPathData data)
+    public void shortestVerif(ShortestPathSolution solution,ArrayList<Node> 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<Node> 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");
         }
 
     }

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<Node> solutionNodes , ShortestPathData data)
+    
+    public void shortestVerif(ShortestPathSolution solution,ArrayList<Node> 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<Node> 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");
         }
 
     }

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;