Edge flags refactoring

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

@@ -19,11 +19,13 @@
 
 import com.carrotsearch.hppc.IntHashSet;
 import com.carrotsearch.hppc.IntSet;
+import com.graphhopper.routing.profiles.BooleanEncodedValue;
 import com.graphhopper.routing.util.DefaultEdgeFilter;
 import com.graphhopper.routing.util.FlagEncoder;
 import com.graphhopper.routing.weighting.TurnWeighting;
 import com.graphhopper.storage.CHGraph;
 import com.graphhopper.storage.GraphHopperStorage;
+import com.graphhopper.storage.IntsRef;
 import com.graphhopper.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -189,21 +191,22 @@ private void findAndHandleShortcuts(int node) {
     }
 
     private void countPreviousEdges(int node) {
+        BooleanEncodedValue accessEnc = encoder.getAccessEnc();
         CHEdgeIterator iter = allEdgeExplorer.setBaseNode(node);
         while (iter.next()) {
             if (isContracted(iter.getAdjNode()))
                 continue;
-            if (iter.isForward(encoder)) {
+            if (iter.get(accessEnc)) {
                 numPrevEdges++;
             }
-            if (iter.isBackward(encoder)) {
+            if (iter.getReverse(accessEnc)) {
                 numPrevEdges++;
             }
             if (!iter.isShortcut()) {
-                if (iter.isForward(encoder)) {
+                if (iter.get(accessEnc)) {
                     numPrevOrigEdges++;
                 }
-                if (iter.isBackward(encoder)) {
+                if (iter.getReverse(accessEnc)) {
                     numPrevOrigEdges++;
                 }
             } else {
@@ -295,9 +298,12 @@ private CHEntry doAddShortcut(CHEntry edgeFrom, CHEntry edgeTo) {
         LOGGER.trace("Adding shortcut from {} to {}, weight: {}, firstOrigEdge: {}, lastOrigEdge: {}",
                 from, adjNode, edgeTo.weight, edgeFrom.getParent().incEdge, edgeTo.incEdge);
         CHEdgeIteratorState shortcut = prepareGraph.shortcut(from, adjNode);
-        long direction = PrepareEncoder.getScFwdDir();
+        int direction = PrepareEncoder.getScFwdDir();
         // we need to set flags first because they overwrite weight etc
-        shortcut.setFlags(direction);
+        // TODO NOW creating a new intsref every time here is probably not efficient ?
+        IntsRef intsRef = new IntsRef(1);
+        intsRef.ints[0] = direction;
+        shortcut.setFlags(intsRef);
         shortcut.setSkippedEdges(edgeFrom.edge, edgeTo.edge)
                 // this is a bit of a hack, we misuse incEdge of edgeFrom's parent to store the first orig edge
                 .setFirstAndLastOrigEdges(edgeFrom.getParent().incEdge, edgeTo.incEdge)

core/src/main/java/com/graphhopper/routing/weighting/AbstractWeighting.java

@@ -47,7 +47,7 @@ protected AbstractWeighting(FlagEncoder encoder) {
     @Override
     public long calcMillis(EdgeIteratorState edgeState, boolean reverse, int prevOrNextEdgeId) {
         if (reverse && !edgeState.getReverse(accessEnc) || !reverse && !edgeState.get(accessEnc))
-            throw new IllegalStateException("Calculating time should not require to read speed from edge in wrong direction. "
+            throw new IllegalStateException("Calculating time should not require to read speed from edge in wrong direction. " +
                     "(" + edgeState.getBaseNode() + " - " + edgeState.getAdjNode() + ") "
                             + edgeState.fetchWayGeometry(3) + " " + edgeState.getDistance() + " "
                             + "Reverse:" + reverse + ", fwd:" + edgeState.get(accessEnc) + ", bwd:" + edgeState.getReverse(accessEnc));

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

@@ -27,10 +27,7 @@
 import com.graphhopper.routing.weighting.ShortestWeighting;
 import com.graphhopper.routing.weighting.TurnWeighting;
 import com.graphhopper.routing.weighting.Weighting;
-import com.graphhopper.storage.CHGraph;
-import com.graphhopper.storage.GraphBuilder;
-import com.graphhopper.storage.GraphHopperStorage;
-import com.graphhopper.storage.TurnCostExtension;
+import com.graphhopper.storage.*;
 import com.graphhopper.util.CHEdgeIteratorState;
 import com.graphhopper.util.EdgeIteratorState;
 import com.graphhopper.util.GHUtility;
@@ -633,7 +630,10 @@ private AbstractBidirectionEdgeCHNoSOD createAlgo() {
     private void addShortcut(int from, int to, int firstOrigEdge, int lastOrigEdge, int skipped1, int skipped2, double weight) {
         CHEdgeIteratorState shortcut = chGraph.shortcut(from, to);
         // we need to set flags first because they overwrite weight etc
-        shortcut.setFlags(PrepareEncoder.getScFwdDir());
+        // TODO NOW: is this the way to go ?
+        IntsRef intsRef = new IntsRef(1);
+        intsRef.ints[0] = PrepareEncoder.getScFwdDir();
+        shortcut.setFlags(intsRef);
         shortcut.setFirstAndLastOrigEdges(firstOrigEdge, lastOrigEdge).setSkippedEdges(skipped1, skipped2).setWeight(weight);
     }
 

core/src/test/java/com/graphhopper/routing/ch/EdgeBasedNodeContractorTest.java

@@ -20,6 +20,7 @@
 
 import com.graphhopper.Repeat;
 import com.graphhopper.RepeatRule;
+import com.graphhopper.routing.profiles.BooleanEncodedValue;
 import com.graphhopper.routing.util.AllCHEdgesIterator;
 import com.graphhopper.routing.util.CarFlagEncoder;
 import com.graphhopper.routing.util.EncodingManager;
@@ -1434,10 +1435,11 @@ private Set<Shortcut> getCurrentShortcuts() {
         AllCHEdgesIterator iter = chGraph.getAllEdges();
         while (iter.next()) {
             if (iter.isShortcut()) {
+                BooleanEncodedValue accessEnc = encoder.getAccessEnc();
                 shortcuts.add(new Shortcut(
                         iter.getBaseNode(), iter.getAdjNode(),
                         iter.getOrigEdgeFirst(), iter.getOrigEdgeLast(), iter.getSkippedEdge1(), iter.getSkippedEdge2(), iter.getWeight(),
-                        iter.isForward(encoder), iter.isBackward(encoder)
+                        iter.get(accessEnc), iter.getReverse(accessEnc)
                 ));
             }
         }

core/src/test/java/com/graphhopper/routing/util/DefaultEdgeFilterTest.java

@@ -25,6 +25,7 @@
 import com.graphhopper.storage.CHGraph;
 import com.graphhopper.storage.GraphBuilder;
 import com.graphhopper.storage.GraphHopperStorage;
+import com.graphhopper.storage.IntsRef;
 import com.graphhopper.util.CHEdgeExplorer;
 import com.graphhopper.util.CHEdgeIterator;
 import com.graphhopper.util.CHEdgeIteratorState;
@@ -70,7 +71,10 @@ public void testAccept_fwdLoopShortcut_acceptedByInExplorer() {
 
     private void addShortcut(CHGraph chGraph, int from, int to, boolean fwd, int firstOrigEdge, int lastOrigEdge) {
         CHEdgeIteratorState shortcut = chGraph.shortcut(from, to);
-        shortcut.setFlags(fwd ? PrepareEncoder.getScFwdDir() : PrepareEncoder.getScBwdDir());
+        // TODO NOW is this the way to go ?
+        IntsRef intsRef = new IntsRef(1);
+        intsRef.ints[0] = fwd ? PrepareEncoder.getScFwdDir() : PrepareEncoder.getScBwdDir();
+        shortcut.setFlags(intsRef);
         shortcut.setFirstAndLastOrigEdges(firstOrigEdge, lastOrigEdge);
     }
 

core/src/test/java/com/graphhopper/storage/GraphHopperStorageCHTest.java

@@ -445,7 +445,10 @@ public void testAddShortcut_edgeBased() {
     private void addShortcut(CHGraph chGraph, int from, int to, boolean fwd, int firstOrigEdge, int lastOrigEdge,
                              int skipEdge1, int skipEdge2, int distance) {
         CHEdgeIteratorState shortcut = chGraph.shortcut(from, to);
-        shortcut.setFlags(fwd ? PrepareEncoder.getScFwdDir() : PrepareEncoder.getScBwdDir());
+        // TODO NOW is this the way to go ?
+        IntsRef intsRef = new IntsRef(1);
+        intsRef.ints[0] = fwd ? PrepareEncoder.getScFwdDir() : PrepareEncoder.getScBwdDir();
+        shortcut.setFlags(intsRef);
         shortcut.setFirstAndLastOrigEdges(firstOrigEdge, lastOrigEdge).setSkippedEdges(skipEdge1, skipEdge2).setDistance(distance);
     }