Use keys instead of edges for turn weight in edge-based witness search

Author: easbar

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

@@ -26,7 +26,6 @@
 import java.util.PriorityQueue;
 
 import static com.graphhopper.util.EdgeIterator.NO_EDGE;
-import static com.graphhopper.util.GHUtility.getEdgeFromEdgeKey;
 
 /**
  * Used to find 'bridge-paths' during edge-based CH preparation. Bridge-paths are paths that start and end at neighbor
@@ -71,7 +70,7 @@ public IntObjectMap<BridePathEntry> find(int startInEdgeKey, int startNode, int
                 if (iter.getAdjNode() == centerNode) {
                     // We arrived at the center node, so we keep expanding the search
                     double weight = currEntry.weight +
-                            graph.getTurnWeight(getEdgeFromEdgeKey(currEntry.incEdgeKey), currEntry.adjNode, getEdgeFromEdgeKey(iter.getOrigEdgeKeyFirst())) +
+                            graph.getTurnWeight(currEntry.incEdgeKey, currEntry.adjNode, iter.getOrigEdgeKeyFirst()) +
                             iter.getWeight();
                     if (Double.isInfinite(weight))
                         continue;
@@ -95,14 +94,14 @@ public IntObjectMap<BridePathEntry> find(int startInEdgeKey, int startNode, int
                     // there is a target edge, so we add a bridge path entry for it. We do not continue the search from the
                     // neighbor node anymore
                     double weight = currEntry.weight +
-                            graph.getTurnWeight(getEdgeFromEdgeKey(currEntry.incEdgeKey), currEntry.adjNode, getEdgeFromEdgeKey(iter.getOrigEdgeKeyFirst())) +
+                            graph.getTurnWeight(currEntry.incEdgeKey, currEntry.adjNode, iter.getOrigEdgeKeyFirst()) +
                             iter.getWeight();
                     if (Double.isInfinite(weight))
                         continue;
                     PrepareGraphOrigEdgeIterator origOutIter = origOutExplorer.setBaseNode(iter.getAdjNode());
                     while (origOutIter.next()) {
                         double totalWeight = weight + graph.getTurnWeight(
-                                getEdgeFromEdgeKey(iter.getOrigEdgeKeyLast()), iter.getAdjNode(), getEdgeFromEdgeKey(origOutIter.getOrigEdgeKeyFirst()));
+                                iter.getOrigEdgeKeyLast(), iter.getAdjNode(), origOutIter.getOrigEdgeKeyFirst());
                         if (Double.isInfinite(totalWeight))
                             continue;
                         BridePathEntry resEntry = result.get(origOutIter.getOrigEdgeKeyFirst());

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

@@ -254,8 +254,8 @@ public PrepareGraphOrigEdgeExplorer createInOrigEdgeExplorer() {
         return origGraph.createInOrigEdgeExplorer();
     }
 
-    public double getTurnWeight(int inEdge, int viaNode, int outEdge) {
-        return turnCostFunction.getTurnWeight(inEdge, viaNode, outEdge);
+    public double getTurnWeight(int inEdgeKey, int viaNode, int outEdgeKey) {
+        return turnCostFunction.getTurnWeight(GHUtility.getEdgeFromEdgeKey(inEdgeKey), viaNode, GHUtility.getEdgeFromEdgeKey(outEdgeKey));
     }
 
     public IntContainer disconnect(int node) {

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

@@ -217,7 +217,7 @@ private void findAndHandlePrepareShortcuts(int node, PrepareShortcutHandler shor
                     long addedShortcutKey = BitUtil.LITTLE.combineIntsToLong(root.firstEdgeKey, bridgePath.value.chEntry.incEdgeKey);
                     if (!addedShortcuts.add(addedShortcutKey))
                         continue;
-                    double initialTurnCost = prepareGraph.getTurnWeight(getEdgeFromEdgeKey(origInKey), sourceNode, getEdgeFromEdgeKey(root.firstEdgeKey));
+                    double initialTurnCost = prepareGraph.getTurnWeight(origInKey, sourceNode, root.firstEdgeKey);
                     bridgePath.value.chEntry.weight -= initialTurnCost;
                     LOGGER.trace("Adding shortcuts for target entry {}", bridgePath.value.chEntry);
                     // todo: re-implement loop-avoidance heuristic as it existed in GH 1.0? it did not work the

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

@@ -24,7 +24,6 @@
 import java.util.Arrays;
 import java.util.Locale;
 
-import static com.graphhopper.util.GHUtility.getEdgeFromEdgeKey;
 import static com.graphhopper.util.Helper.nf;
 
 /**
@@ -129,7 +128,7 @@ public double runSearch(int targetNode, int targetEdgeKey, double acceptedWeight
             final int edgeKey = GHUtility.reverseEdgeKey(inIter.getOrigEdgeKeyLast());
             if (weights[edgeKey] == Double.POSITIVE_INFINITY)
                 continue;
-            double weight = weights[edgeKey] + calcTurnWeight(getEdgeFromEdgeKey(edgeKey), targetNode, getEdgeFromEdgeKey(targetEdgeKey));
+            double weight = weights[edgeKey] + calcTurnWeight(edgeKey, targetNode, targetEdgeKey);
             if (weight < acceptedWeight || (weight == acceptedWeight && (parents[edgeKey] < 0 || !isPathToCenter(parents[edgeKey]))))
                 return weight;
         }
@@ -152,7 +151,7 @@ public double runSearch(int targetNode, int targetEdgeKey, double acceptedWeight
                 // being recognized as witnesses when there are double zero weight loops at the source node
                 if (currNode == sourceNode && iter.getAdjNode() == sourceNode && iter.getWeight() < MAX_ZERO_WEIGHT_LOOP)
                     continue;
-                final double weight = weights[currKey] + calcTurnWeight(getEdgeFromEdgeKey(currKey), currNode, getEdgeFromEdgeKey(iter.getOrigEdgeKeyFirst())) + iter.getWeight();
+                final double weight = weights[currKey] + calcTurnWeight(currKey, currNode, iter.getOrigEdgeKeyFirst()) + iter.getWeight();
                 if (Double.isInfinite(weight))
                     continue;
                 final int key = iter.getOrigEdgeKeyLast();
@@ -164,7 +163,7 @@ public double runSearch(int targetNode, int targetEdgeKey, double acceptedWeight
                     changedEdges.add(key);
                     dijkstraHeap.insert(weight, key);
                     if (iter.getAdjNode() == targetNode && (!isPathToCenter(currKey) || parents[currKey] < 0))
-                        foundWeight = Math.min(foundWeight, weight + calcTurnWeight(getEdgeFromEdgeKey(key), targetNode, getEdgeFromEdgeKey(targetEdgeKey)));
+                        foundWeight = Math.min(foundWeight, weight + calcTurnWeight(key, targetNode, targetEdgeKey));
                 } else if (weight < weights[key]
                         // if weights are equal make sure we prefer witness paths over bridge paths
                         || (weight == weights[key] && !isPathToCenter(currKey))) {
@@ -174,7 +173,7 @@ public double runSearch(int targetNode, int targetEdgeKey, double acceptedWeight
                     setAdjNodeAndPathToCenter(key, iter.getAdjNode(), isPathToCenter);
                     dijkstraHeap.update(weight, key);
                     if (iter.getAdjNode() == targetNode && (!isPathToCenter(currKey) || parents[currKey] < 0))
-                        foundWeight = Math.min(foundWeight, weight + calcTurnWeight(getEdgeFromEdgeKey(key), targetNode, getEdgeFromEdgeKey(targetEdgeKey)));
+                        foundWeight = Math.min(foundWeight, weight + calcTurnWeight(key, targetNode, targetEdgeKey));
                 }
             }
             if (foundWeight <= acceptedWeight)
@@ -258,8 +257,8 @@ private void resetEntry(int key) {
         setAdjNodeAndPathToCenter(key, NO_NODE, false);
     }
 
-    private double calcTurnWeight(int inEdge, int viaNode, int outEdge) {
-        return prepareGraph.getTurnWeight(inEdge, viaNode, outEdge);
+    private double calcTurnWeight(int inEdgeKey, int viaNode, int outEdgeKey) {
+        return prepareGraph.getTurnWeight(inEdgeKey, viaNode, outEdgeKey);
     }
 
     static class Stats {