Edge CH speedup (graphhopper#1542)

* speed up of edge based CH

* Makes use of Graph#getBaseNode also in queries.

Signed-off-by: easbar <[email protected]>

* Renames getBaseNode->getOtherNode.

Signed-off-by: easbar <[email protected]>

* minor tweak

* Adds back EdgeAcces#getOtherNode (was removed in master).

Signed-off-by: easbar <[email protected]>


Co-authored-by: easbar <[email protected]>

Author: karussell

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

@@ -159,8 +159,8 @@ protected int getOrigEdgeId(EdgeIteratorState edge, boolean reverse) {
 
     @Override
     protected int getTraversalId(EdgeIteratorState edge, int origEdgeId, boolean reverse) {
-        EdgeIteratorState iterState = graph.getEdgeIteratorState(origEdgeId, edge.getAdjNode());
-        return GHUtility.createEdgeKey(iterState.getBaseNode(), iterState.getAdjNode(), iterState.getEdge(), reverse);
+        int baseNode = graph.getOtherNode(origEdgeId, edge.getAdjNode());
+        return GHUtility.createEdgeKey(baseNode, edge.getAdjNode(), origEdgeId, reverse);
     }
 
     @Override

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

@@ -746,6 +746,14 @@ public GraphExtension getExtension() {
         return wrappedExtension;
     }
 
+    @Override
+    public int getOtherNode(int edge, int node) {
+        if (isVirtualEdge(edge)) {
+            return getEdgeIteratorState(edge, node).getBaseNode();
+        }
+        return mainGraph.getOtherNode(edge, node);
+    }
+
     private UnsupportedOperationException exc() {
         return new UnsupportedOperationException("QueryGraph cannot be modified.");
     }

core/src/main/java/com/graphhopper/routing/ch/WitnessPathSearcher.java

@@ -24,7 +24,6 @@
 import com.graphhopper.routing.util.DefaultEdgeFilter;
 import com.graphhopper.routing.weighting.TurnWeighting;
 import com.graphhopper.storage.CHGraph;
-import com.graphhopper.storage.GraphHopperStorage;
 import com.graphhopper.util.*;
 
 import java.util.Arrays;
@@ -61,7 +60,6 @@
  * searches.
  *
  * @author easbar
- *
  */
 public class WitnessPathSearcher {
     private static final int NO_NODE = -1;
@@ -476,7 +474,8 @@ private CHEntry getEntryForKey(int edgeKey) {
     }
 
     private int getEdgeKey(int edge, int adjNode) {
-        return GHUtility.getEdgeKey(chGraph, edge, adjNode, false);
+        int baseNode = chGraph.getOtherNode(edge, adjNode);
+        return GHUtility.createEdgeKey(baseNode, adjNode, edge, false);
     }
 
     private double calcTurnWeight(int inEdge, int viaNode, int outEdge) {

core/src/main/java/com/graphhopper/storage/BaseGraph.java

@@ -794,6 +794,12 @@ public GraphExtension getExtension() {
         return extStorage;
     }
 
+    @Override
+    public int getOtherNode(int edge, int node) {
+        long edgePointer = edgeAccess.toPointer(edge);
+        return edgeAccess.getOtherNode(node, edgePointer);
+    }
+
     public void setAdditionalEdgeField(long edgePointer, int value) {
         if (extStorage.isRequireEdgeField() && E_ADDITIONAL >= 0)
             edges.setInt(edgePointer + E_ADDITIONAL, value);

core/src/main/java/com/graphhopper/storage/CHGraph.java

@@ -93,4 +93,5 @@ public interface CHGraph extends Graph {
      * @return true if contraction can be started (add shortcuts and set levels), false otherwise
      */
     boolean isReadyForContraction();
+
 }

core/src/main/java/com/graphhopper/storage/CHGraphImpl.java

@@ -234,6 +234,13 @@ public boolean isReadyForContraction() {
         return isReadyForContraction;
     }
 
+    @Override
+    public int getOtherNode(int edge, int node) {
+        EdgeAccess edgeAccess = isShortcut(edge) ? chEdgeAccess : baseGraph.edgeAccess;
+        long edgePointer = edgeAccess.toPointer(edge);
+        return edgeAccess.getOtherNode(node, edgePointer);
+    }
+
     void _prepareForContraction() {
         if (isReadyForContraction) {
             return;

core/src/main/java/com/graphhopper/storage/EdgeAccess.java

@@ -142,6 +142,11 @@ final int getLinkB(long edgePointer) {
         return edges.getInt(edgePointer + E_LINKB);
     }
 
+    final int getOtherNode(int nodeThis, long edgePointer) {
+        int nodeA = getNodeA(edgePointer);
+        return nodeThis == nodeA ? getNodeB(edgePointer) : nodeA;
+    }
+
     /**
      * Writes plain edge information to the edges index
      */

core/src/main/java/com/graphhopper/storage/Graph.java

@@ -82,6 +82,11 @@ public interface Graph {
      */
     EdgeIteratorState getEdgeIteratorState(int edgeId, int adjNode);
 
+    /**
+     * @return the 'opposite' node of a given edge, so if there is an edge 3-2 and node =2 this returns 3
+     */
+    int getOtherNode(int edge, int node);
+
     /**
      * @return all edges in this graph, where baseNode will be the smaller node.
      */
@@ -114,4 +119,5 @@ public interface Graph {
      * @return the graph extension like a TurnCostExtension
      */
     GraphExtension getExtension();
+
 }

core/src/main/java/com/graphhopper/storage/GraphHopperStorage.java

@@ -462,6 +462,11 @@ public GraphExtension getExtension() {
         return baseGraph.getExtension();
     }
 
+    @Override
+    public int getOtherNode(int edge, int node) {
+        return baseGraph.getOtherNode(edge, node);
+    }
+
     private Collection<CHGraphImpl> getAllCHGraphs() {
         // todo: this method is only used to have a 'view' on the two collections. we could also create this only once
         // as long as the graph collections are only modified in the constructor (otherwise we would have to make sure

reader-gtfs/src/main/java/com/graphhopper/reader/gtfs/GraphSupport.java

@@ -304,6 +304,11 @@ public Graph copyTo(Graph g) {
             public GraphExtension getExtension() {
                 throw new UnsupportedOperationException();
             }
+
+            @Override
+            public int getOtherNode(int edge, int node) {
+                throw new UnsupportedOperationException();
+            }
         };
     }
 }

reader-gtfs/src/main/java/com/graphhopper/reader/gtfs/RealtimeFeed.java

@@ -245,6 +245,11 @@ public Graph copyTo(Graph g) {
             public GraphExtension getExtension() {
                 throw new RuntimeException();
             }
+
+            @Override
+            public int getOtherNode(int edge, int node) {
+                throw new UnsupportedOperationException();
+            }
         };
 
         Map<GtfsStorage.Validity, Integer> operatingDayPatterns = new HashMap<>(staticGtfs.getOperatingDayPatterns());

reader-gtfs/src/main/java/com/graphhopper/reader/gtfs/WrapperGraph.java

@@ -289,4 +289,9 @@ public Graph copyTo(Graph g) {
     public GraphExtension getExtension() {
         return baseGraph.getExtension();
     }
+
+    @Override
+    public int getOtherNode(int edge, int node) {
+        return baseGraph.getOtherNode(edge, node);
+    }
 }