dijkstra tests

be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java

@@ -22,7 +22,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
         ShortestPathSolution solution = null;
         // TODO:
         
-        ArrayList<Label> List_Label = new ArrayList<Label>(data.getGraph().size()); //Liste de labels
+        ArrayList<LabelStar> List_Label = new ArrayList<LabelStar>(data.getGraph().size()); //Liste de labels
         BinaryHeap<Label> Tas = new BinaryHeap<Label>();
         ArrayList<Arc> Arcs = new ArrayList<Arc>();
         
@@ -46,22 +46,24 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
             x = Tas.findMin();
             x.setMarque(true);
             Tas.deleteMin();
-            
+            System.out.println("test");
             for(Arc suivant : x.getSommet().getSuccessors()){
                 // Small test to check allowed roads...
                 if (!data.isAllowed(suivant)) {
                     continue;
                 }
+                System.out.println("test2");
 
-                Label l=List_Label.get(suivant.getDestination().getId());
+                LabelStar l=List_Label.get(suivant.getDestination().getId());
                     if(!l.isMarque()){
                         Boolean changé = false;
                         if (x.getTotalCost()+data.getCost(suivant) < l.getTotalCost()){
                             changé = true;
                         }
+                        System.out.println("test3");
                         if(changé){
+                            System.out.println("test4");
                             if (l.getTotalCost() != Double.MAX_VALUE){                              
-                                
                                 Tas.remove(l);
                             }
                             l.setCost(x.getTotalCost()+data.getCost(suivant));

be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java

@@ -43,7 +43,6 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         }
         Tas.insert(List_Label.get(data.getOrigin().getId()));
         Label x;
-
         while (!List_Label.get(data.getDestination().getId()).isMarque() && !Tas.isEmpty()){
             x = Tas.findMin();
             x.setMarque(true);
@@ -86,8 +85,18 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
        
         Collections.reverse(Arcs);
         solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(data.getGraph(), Arcs));
-        return solution;
+        ArrayList<Node> solutionNodes = new ArrayList<Node>();
+        for (Arc a : Arcs){
+            solutionNodes.add(a.getOrigin());
+        }
+        solutionNodes.add(data.getDestination());
+        Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes);
+        Path p2 = Path.createFastestPathFromNodes(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");
         }
         
-
+        return solution;
+    }
 }

be-graphes-gui/src/main/java/org/insa/graphs/gui/simple/Launch.java

@@ -11,6 +11,7 @@ import java.io.FileInputStream;
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 
+import org.insa.graphs.algorithm.shortestpath.ShortestPathAlgorithm;
 import org.insa.graphs.gui.drawing.Drawing;
 import org.insa.graphs.gui.drawing.components.BasicDrawing;
 import org.insa.graphs.model.Graph;
@@ -70,7 +71,7 @@ public class Launch {
 
         // TODO: Read the path.
         final Path path = pathReader.readPath(graph);
-
+        System.out.println();
         
         // TODO: Draw the path.
         drawing.drawPath(path,Color.green);

be-graphes-model/src/main/java/org/insa/graphs/model/Path.java

@@ -59,6 +59,7 @@ public class Path {
                     }
                     arcs.add(a);
                 }
+                System.out.println(new Path(graph, arcs));
                 return new Path(graph, arcs);
     }