Add unit test

agouge · agouge · commit aae292e626c6 · 2013-10-16T20:34:46.000+02:00
TODO: Add unit tests for all other cases
diff --git a/src/main/java/org/javanetworkanalyzer/alg/Dijkstra.java b/src/main/java/org/javanetworkanalyzer/alg/Dijkstra.java
@@ -210,11 +210,17 @@ public int compare(V v1, V v2) {
      * limited by the given radius. The shortest path "tree" we return may
      * contain multiple shortest paths.
      *
+     * Note: {@link GraphSearchAlgorithm#reconstructTraversalGraph()} should not
+     * be used when limiting by radius as it will include edges to vertices with
+     * a distance greater than the radius.
+     *
      * @param radius The radius to limit by
      * @return The SPT/traversal graph from the last start node {@link #calculate}
      *         was called on
      */
-    public TraversalGraph<V, E> reconstructTraversalGraphLimitedByRadius(double radius) {
+    // TODO: Make {@link GraphSearchAlgorithm#reconstructTraversalGraph()} call
+    // this method with an argument of Double.POSITIVE_INFINITY.
+    public TraversalGraph<V, E> reconstructTraversalGraph(double radius) {
 
         if (currentStartNode == null) {
             throw new IllegalStateException("You must call #calculate before " +
diff --git a/src/main/java/org/javanetworkanalyzer/data/VDijkstra.java b/src/main/java/org/javanetworkanalyzer/data/VDijkstra.java
@@ -44,7 +44,7 @@ public class VDijkstra<V extends VDijkstra, E>
      * Length of a shortest path starting from a certain source leading to this
      * node (Dijkstra).
      */
-    private double distance;
+    private double distance = DEFAULT_DISTANCE;
 
     /**
      * Constructor: Sets the id.
diff --git a/src/test/java/org/javanetworkanalyzer/alg/DijkstraCormenTest.java b/src/test/java/org/javanetworkanalyzer/alg/DijkstraCormenTest.java
@@ -49,6 +49,23 @@ public class DijkstraCormenTest {
     private VDijkstra v5;
     private static final double TOLERANCE = 0.0;
 
+    @Test
+    public void testWDLimitedByRadius() throws NoSuchMethodException {
+        dijkstra = new Dijkstra<VDijkstra, Edge>(graph);
+        final double radius = 12.0;
+        dijkstra.calculate(v3, radius);
+        assertEquals(11, v1.getDistance(), TOLERANCE);
+        assertTrue(v2.getDistance() > radius);
+        assertEquals(0, v3.getDistance(), TOLERANCE);
+        assertTrue(v2.getDistance() > radius);
+        assertEquals(4, v5.getDistance(), TOLERANCE);
+        sPT = dijkstra.reconstructTraversalGraph(radius);
+        assertTrue(sPT.getRoot().equals(v3));
+        assertTrue(sPT.edgeSet().size() == 2);
+        assertTrue(sPT.containsEdge(v3, v5));
+        assertTrue(sPT.containsEdge(v5, v1));
+    }
+
     @Test
     public void testWD() throws NoSuchMethodException {
 
