From db095f9ea970f42d544e84059d9f529473428b1d Mon Sep 17 00:00:00 2001
From: Yohan Simard <ysimard@etud.insa-toulouse.fr>
Date: Fri, 15 May 2020 18:09:36 +0200
Subject: [PATCH] Tests and other minor improvements

---
 .../algorithm/shortestpath/AStarAlgorithm.java   |  3 +--
 .../shortestpath/DijkstraAlgorithm.java          | 16 +++++++---------
 .../shortestpath/AStarAlgorithmTest.java         |  1 -
 .../algorithm/shortestpath/ShortestPathTest.java | 11 +++++++----
 4 files changed, 15 insertions(+), 16 deletions(-)

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 27c8612..d97691d 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
@@ -47,12 +47,11 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
         int dataMaxSpeed = data.getMaximumSpeed();
         int graphMaxSpeed = data.getGraph().getGraphInformation().getMaximumSpeed();
         if (dataMaxSpeed == NO_MAXIMUM_SPEED && graphMaxSpeed == NO_MAXIMUM_SPEED)
-            return 1000;
+            return (int) (130/3.6);
         if (dataMaxSpeed != NO_MAXIMUM_SPEED && graphMaxSpeed != NO_MAXIMUM_SPEED)
             return (int) (Math.min(dataMaxSpeed, graphMaxSpeed)/3.6);
         if (dataMaxSpeed != NO_MAXIMUM_SPEED)
             return (int) (dataMaxSpeed/3.6);
         return (int) (graphMaxSpeed/3.6);
-
     }
 }
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 4bf28ca..0cafc76 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
@@ -54,21 +54,22 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         heap.insert(labels.get(originId));
         notifyOriginProcessed(origin);
 
-//        int iterationCounter = 0;
         Node destination = data.getDestination();
         Node currentNode = null;
+        double previousCost = 0;
 
         while (!heap.isEmpty() && (currentNode == null || !currentNode.equals(destination))) {
-//            iterationCounter++;
             // Get the node with the minimum cost
             Label currentLabel = heap.deleteMin();
             currentLabel.mark();
             currentNode = currentLabel.getNode();
 
-//            System.out.printf("Label marked : cost = %f; %d succesors; heap valid = %b \n",
-//                    currentLabel.getCost(),
-//                    currentNode.getSuccessors().size(),
-//                    ((BinaryHeap<Label>)heap).isValid());
+/*
+            // Debug
+            assert(((BinaryHeap<Label>) heap).isValid());
+            assert(currentLabel.getTotalCost() >= previousCost);
+            previousCost = currentLabel.getCost();
+*/
 
             for (Arc arc : currentNode.getSuccessors()) {
                 Node dest = arc.getDestination();
@@ -110,9 +111,6 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             currentLabel = labels.get(arc.getOrigin().getId());
         }
 
-//        System.out.printf("Nombre d'arcs du plus court chemin : %d\n", path.size());
-//        System.out.printf("Nombre d'itérations : %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 61d19fb..7fd3134 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
@@ -1,6 +1,5 @@
 package org.insa.graphs.algorithm.shortestpath;
 
-import junit.framework.TestCase;
 
 public class AStarAlgorithmTest extends ShortestPathTest {
     @Override
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 b7a3776..4f060d4 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
@@ -18,27 +18,27 @@ import java.util.List;
 import static org.junit.Assert.*;
 
 public abstract class ShortestPathTest {
-    String[] maps = {
+    private final String[] maps = {
             "/home/yohan/Documents/etudes/be-graphes/maps/carre.mapgr",
             "/home/yohan/Documents/etudes/be-graphes/maps/insa.mapgr",
             "/home/yohan/Documents/etudes/be-graphes/maps/toulouse.mapgr",
             "/home/yohan/Documents/etudes/be-graphes/maps/guadeloupe.mapgr",
     };
 
-    int[] origIndexes = {
+    private final int[] origIndexes = {
             22,
             553,
             25643,
             6187,
     };
-    int[] destIndexes = {
+    private final int[] destIndexes = {
             15,
             111,
             17402,
             15025,
     };
 
-    ArcInspector[] arcInspectors = {
+    private final ArcInspector[] arcInspectors = {
             ArcInspectorFactory.getAllFilters().get(0),
             ArcInspectorFactory.getAllFilters().get(2),
     };
@@ -74,6 +74,7 @@ public abstract class ShortestPathTest {
                 // Check result against Bellman Ford algorithm (except for the square map or there may be several paths with the same cost)
                 if (i != 0)
                     assertEquals(sol.getPath(), oracle.getPath());
+                System.out.println();
             }
         }
 
@@ -85,6 +86,7 @@ public abstract class ShortestPathTest {
                 assertTrue(sol.isFeasible());
                 assertTrue(sol.getPath().isValid());
                 assertEquals(sol.getPath().getLength(), 0, 1e-5);
+                System.out.println();
             }
         }
 
@@ -93,6 +95,7 @@ public abstract class ShortestPathTest {
             ShortestPathData data = createData(maps[3], arcInspector, origIndexes[3], destIndexes[3]);
             ShortestPathSolution sol = runShortestPathAlgo(data);
             assertFalse(sol.isFeasible());
+            System.out.println();
         }
     }
 }