From 460456581e21dea974945ac79c626cb9ae783ed2 Mon Sep 17 00:00:00 2001
From: Yohan Simard <ysimard@etud.insa-toulouse.fr>
Date: Tue, 19 May 2020 18:35:58 +0200
Subject: [PATCH] Minor fixes and tests

---
 .../graphs/algorithm/shortestpath/DijkstraAlgorithm.java  | 8 +++++++-
 .../graphs/algorithm/shortestpath/AStarAlgorithmTest.java | 2 +-
 .../algorithm/shortestpath/DijkstraAlgorithmTest.java     | 2 +-
 .../graphs/algorithm/shortestpath/ShortestPathTest.java   | 5 +++--
 4 files changed, 12 insertions(+), 5 deletions(-)

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 0cafc76..384cbc2 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
@@ -56,7 +56,10 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
 
         Node destination = data.getDestination();
         Node currentNode = null;
+
+        // Debug / Tests
         double previousCost = 0;
+        int iterationCounter = 0;
 
         while (!heap.isEmpty() && (currentNode == null || !currentNode.equals(destination))) {
             // Get the node with the minimum cost
@@ -65,11 +68,12 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             currentNode = currentLabel.getNode();
 
 /*
-            // Debug
+            // Debug / Tests
             assert(((BinaryHeap<Label>) heap).isValid());
             assert(currentLabel.getTotalCost() >= previousCost);
             previousCost = currentLabel.getCost();
 */
+            iterationCounter++;
 
             for (Arc arc : currentNode.getSuccessors()) {
                 Node dest = arc.getDestination();
@@ -111,6 +115,8 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             currentLabel = labels.get(arc.getOrigin().getId());
         }
 
+        System.out.printf("Nombre de sommets explorés : %d\n", iterationCounter);
+
         Collections.reverse(path);
 
         return new ShortestPathSolution(data, AbstractSolution.Status.OPTIMAL, new Path(data.getGraph(), path));
diff --git a/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithmTest.java b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithmTest.java
index 7fd3134..b90cce7 100644
--- a/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithmTest.java
+++ b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithmTest.java
@@ -4,7 +4,7 @@ package org.insa.graphs.algorithm.shortestpath;
 public class AStarAlgorithmTest extends ShortestPathTest {
     @Override
     protected ShortestPathSolution runShortestPathAlgo(ShortestPathData data) {
-        return new AStarAlgorithm(data).doRun();
+        return new AStarAlgorithm(data).run();
     }
 
 }
\ No newline at end of file
diff --git a/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithmTest.java b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithmTest.java
index 555dd47..3e52994 100644
--- a/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithmTest.java
+++ b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithmTest.java
@@ -3,6 +3,6 @@ package org.insa.graphs.algorithm.shortestpath;
 public class DijkstraAlgorithmTest extends ShortestPathTest {
     @Override
     protected ShortestPathSolution runShortestPathAlgo(ShortestPathData data) {
-        return new DijkstraAlgorithm(data).doRun();
+        return new DijkstraAlgorithm(data).run();
     }
 }
\ No newline at end of file
diff --git a/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/ShortestPathTest.java b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/ShortestPathTest.java
index 4f060d4..5206718 100644
--- a/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/ShortestPathTest.java
+++ b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/shortestpath/ShortestPathTest.java
@@ -62,7 +62,7 @@ public abstract class ShortestPathTest {
             for (ArcInspector arcInspector : arcInspectors) {
                 ShortestPathData data = createData(maps[i], arcInspector, origIndexes[i], destIndexes[i]);
                 ShortestPathSolution sol = runShortestPathAlgo(data);
-                ShortestPathSolution oracle = new BellmanFordAlgorithm(data).doRun();
+                ShortestPathSolution oracle = new BellmanFordAlgorithm(data).run();
                 assertTrue(sol.isFeasible());
                 Path path = sol.getPath();
                 assertTrue(path.isValid());
@@ -71,7 +71,8 @@ public abstract class ShortestPathTest {
                     assertEquals(path, Path.createShortestPathFromNodes(data.getGraph(), path.getNodes()));
                 if (i == 1)
                     assertEquals(path, Path.createFastestPathFromNodes(data.getGraph(), path.getNodes()));
-                // Check result against Bellman Ford algorithm (except for the square map or there may be several paths with the same cost)
+                // Check result against Bellman Ford algorithm (except for the square map
+                // where there may be several paths with the same cost)
                 if (i != 0)
                     assertEquals(sol.getPath(), oracle.getPath());
                 System.out.println();