minor refactoring; removed traversal mode support from dijkstraoneToMany as we need a more severe change

Author: Peter

core/src/main/java/com/graphhopper/routing/AStar.java

@@ -111,7 +111,7 @@ private Path runAlgo()
                     continue;
 
                 int neighborNode = iter.getAdjNode();
-                int iterationKey = traversalMode.createIdentifier(iter, false);
+                int iterationKey = traversalMode.createTraversalId(iter, false);
                 double alreadyVisitedWeight = weighting.calcWeight(iter, false, currEdge.edge) + currEdge.weightToCompare;
                 if (Double.isInfinite(alreadyVisitedWeight))
                     continue;

core/src/main/java/com/graphhopper/routing/AStarBidirection.java

@@ -243,7 +243,7 @@ private void fillEdges( AStarEdge currEdge, GHPoint goal,
                 continue;
 
             int neighborNode = iter.getAdjNode();
-            int iterationKey = traversalMode.createIdentifier(iter, reverse);
+            int iterationKey = traversalMode.createTraversalId(iter, reverse);
             // TODO performance: check if the node is already existent in the opposite direction
             // then we could avoid the approximation as we already know the exact complete path!
             double alreadyVisitedWeight = weighting.calcWeight(iter, reverse, currEdge.edge) + currEdge.weightToCompare;

core/src/main/java/com/graphhopper/routing/Dijkstra.java

@@ -85,7 +85,7 @@ private Path runAlgo()
                 if (!accept(iter, currEdge.edge))
                     continue;
 
-                int iterationKey = traversalMode.createIdentifier(iter, false);
+                int iterationKey = traversalMode.createTraversalId(iter, false);
                 double tmpWeight = weighting.calcWeight(iter, false, currEdge.edge) + currEdge.weight;
                 if (Double.isInfinite(tmpWeight))
                     continue;

core/src/main/java/com/graphhopper/routing/DijkstraBidirectionRef.java

@@ -181,7 +181,7 @@ void fillEdges( EdgeEntry currEdge, PriorityQueue<EdgeEntry> prioQueue,
             if (!accept(iter, currEdge.edge))
                 continue;
 
-            int iterationKey = traversalMode.createIdentifier(iter, reverse);
+            int iterationKey = traversalMode.createTraversalId(iter, reverse);
             double tmpWeight = weighting.calcWeight(iter, reverse, currEdge.edge) + currEdge.weight;
             if (Double.isInfinite(tmpWeight))
                 continue;

core/src/main/java/com/graphhopper/routing/DijkstraOneToMany.java

@@ -60,10 +60,7 @@ public DijkstraOneToMany( Graph graph, FlagEncoder encoder, Weighting weighting,
         edgeIds = new int[graph.getNodes()];
         Arrays.fill(edgeIds, EdgeIterator.NO_EDGE);
 
-        if (tMode.isEdgeBased())
-            weights = new double[graph.getAllEdges().getMaxId() * 2];
-        else
-            weights = new double[graph.getNodes()];
+        weights = new double[graph.getNodes()];
 
         Arrays.fill(weights, Double.MAX_VALUE);
 
@@ -173,29 +170,28 @@ public int findEndNode( int from, int to )
             EdgeIterator iter = outEdgeExplorer.setBaseNode(currNode);
             while (iter.next())
             {
-                int adjNode = iter.getAdjNode();
-                int iterationKey = traversalMode.createIdentifier(iter, false);
+                int adjNode = iter.getAdjNode();                
                 int prevEdgeId = edgeIds[adjNode];
                 if (!accept(iter, prevEdgeId))
                     continue;
 
-                double tmpWeight = weighting.calcWeight(iter, false, prevEdgeId) + weights[/*TODO key?*/ currNode];
+                double tmpWeight = weighting.calcWeight(iter, false, prevEdgeId) + weights[currNode];
                 if (Double.isInfinite(tmpWeight))
                     continue;
 
-                double w = weights[iterationKey];
+                double w = weights[adjNode];
                 if (w == Double.MAX_VALUE)
                 {
                     parents[adjNode] = currNode;
-                    weights[iterationKey] = tmpWeight;
+                    weights[adjNode] = tmpWeight;
                     heap.insert_(tmpWeight, adjNode);
                     changedNodes.add(adjNode);
                     edgeIds[adjNode] = iter.getEdge();
 
                 } else if (w > tmpWeight)
                 {
                     parents[adjNode] = currNode;
-                    weights[iterationKey] = tmpWeight;
+                    weights[adjNode] = tmpWeight;
                     heap.update_(tmpWeight, adjNode);
                     changedNodes.add(adjNode);
                     edgeIds[adjNode] = iter.getEdge();

core/src/main/java/com/graphhopper/routing/PathNative.java

@@ -28,14 +28,14 @@
  */
 public class PathNative extends Path
 {
-    int[] parents;
-    int[] pathEdgeIds;
+    private final int[] parentNodes;
+    private final int[] parentEdges;
 
-    public PathNative( Graph g, FlagEncoder encoder, int[] parents, int[] pathEdgeIds )
+    public PathNative( Graph g, FlagEncoder encoder, int[] parentNodes, int[] parentEdges )
     {
         super(g, encoder);
-        this.parents = parents;
-        this.pathEdgeIds = pathEdgeIds;
+        this.parentNodes = parentNodes;
+        this.parentEdges = parentEdges;
     }
 
     /**
@@ -49,12 +49,12 @@ public Path extract()
 
         while (true)
         {
-            int edgeId = pathEdgeIds[endNode];
+            int edgeId = parentEdges[endNode];
             if (!EdgeIterator.Edge.isValid(edgeId))
                 break;
 
             processEdge(edgeId, endNode);
-            endNode = parents[endNode];
+            endNode = parentNodes[endNode];
         }
         reverseOrder();
         return setFound(true);

core/src/main/java/com/graphhopper/routing/util/TraversalMode.java

@@ -53,17 +53,17 @@ public enum TraversalMode
     EDGE_BASED_2DIR_UTURN(true, 2, true);
 
     private final boolean edgeBased;
-    private final int noOfStatus;
+    private final int noOfStates;
     private final boolean uTurnSupport;
 
-    TraversalMode( boolean edgeBased, int noOfStatus, boolean uTurnSupport )
+    TraversalMode( boolean edgeBased, int noOfStates, boolean uTurnSupport )
     {
         this.edgeBased = edgeBased;
-        this.noOfStatus = noOfStatus;
+        this.noOfStates = noOfStates;
         this.uTurnSupport = uTurnSupport;
 
-        if (noOfStatus != 1 && noOfStatus != 2)
-            throw new IllegalArgumentException("Currently only statuses of 1 or 2 are allowed");
+        if (noOfStates != 1 && noOfStates != 2)
+            throw new IllegalArgumentException("Currently only 1 or 2 states allowed");
     }
 
     /**
@@ -76,11 +76,11 @@ public enum TraversalMode
      * backward searches in bidirectional algorithms.
      * @return the identifier to access the shortest path tree
      */
-    public final int createIdentifier( EdgeIteratorState iterState, boolean reverse )
+    public final int createTraversalId( EdgeIteratorState iterState, boolean reverse )
     {
         if (edgeBased)
         {
-            if (noOfStatus == 1)
+            if (noOfStates == 1)
                 return iterState.getEdge();
 
             return GHUtility.createEdgeKey(iterState.getAdjNode(), iterState.getBaseNode(), iterState.getEdge(), reverse);
@@ -89,6 +89,11 @@ public final int createIdentifier( EdgeIteratorState iterState, boolean reverse
         return iterState.getAdjNode();
     }
 
+    public int getNoOfStates()
+    {
+        return noOfStates;
+    }
+        
     public boolean isEdgeBased()
     {
         return edgeBased;

core/src/test/java/com/graphhopper/routing/AbstractRoutingAlgorithmTester.java

@@ -64,7 +64,7 @@ public void testCalcShortestPath()
         Graph graph = createTestGraph();
         Path p = prepareGraph(graph).createAlgo().calcPath(0, 7);
         assertEquals(p.toString(), 13, p.getDistance(), 1e-4);
-        assertEquals(p.toString(), 5, p.calcNodes().size());
+        assertEquals(p.toString(), Helper.createTList(0, 4, 6, 5, 7), p.calcNodes());
     }
 
     // see calc-fastest-graph.svg

core/src/test/java/com/graphhopper/routing/DijkstraOneToManyTest.java

@@ -57,7 +57,7 @@ public DijkstraOneToManyTest( TraversalMode tMode )
     {
         this.traversalmode = tMode;
     }
-    
+
     @Override
     public AlgorithmPreparation prepareGraph( Graph defaultGraph, final FlagEncoder encoder, final Weighting w )
     {
@@ -66,7 +66,7 @@ public AlgorithmPreparation prepareGraph( Graph defaultGraph, final FlagEncoder
             @Override
             public RoutingAlgorithm createAlgo()
             {
-                return new DijkstraOneToMany(_graph, encoder, w, traversalmode);                
+                return new DijkstraOneToMany(_graph, encoder, w, traversalmode);
             }
         }.setGraph(defaultGraph);
     }