Prevent running CH contraction twice on the same CHGraph

graphhopper · Oct 22, 2019 · 5668e4d · 5668e4d
1 parent 643ddbc
commit 5668e4d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 12 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/ch/PrepareContractionHierarchies.java b/core/src/main/java/com/graphhopper/routing/ch/PrepareContractionHierarchies.java
@@ -116,6 +116,9 @@ public void doSpecificWork() {
         if (!prepareGraph.isReadyForContraction()) {
             throw new IllegalStateException("Given CHGraph has not been frozen yet");
         }
+        if (prepareGraph.getEdges() > prepareGraph.getBaseGraph().getEdges()) {
+            throw new IllegalStateException("Given CHGraph has been contracted already");
+        }
         allSW.start();
         initFromGraph();
         runGraphContraction();

diff --git a/core/src/test/java/com/graphhopper/routing/AStarBidirectionEdgeCHTest.java b/core/src/test/java/com/graphhopper/routing/AStarBidirectionEdgeCHTest.java
@@ -55,9 +55,12 @@ protected GraphHopperStorage createGHStorage(
     @Override
     public RoutingAlgorithmFactory createFactory(GraphHopperStorage ghStorage, AlgorithmOptions opts) {
         ghStorage.freeze();
-        PrepareContractionHierarchies ch = PrepareContractionHierarchies.fromGraphHopperStorage(
-                ghStorage, CHProfile.edgeBased(opts.getWeighting(), INFINITE_U_TURN_COSTS));
-        ch.doWork();
+        CHGraph chGraph = ghStorage.getCHGraph(CHProfile.edgeBased(opts.getWeighting(), INFINITE_U_TURN_COSTS));
+        PrepareContractionHierarchies ch = new PrepareContractionHierarchies(chGraph);
+        // make sure the contraction runs only once
+        if (chGraph.getEdges() == chGraph.getBaseGraph().getEdges()) {
+            ch.doWork();
+        }
         return ch;
     }
 

diff --git a/core/src/test/java/com/graphhopper/routing/DijkstraBidirectionCHTest.java b/core/src/test/java/com/graphhopper/routing/DijkstraBidirectionCHTest.java
@@ -26,7 +26,6 @@
 import com.graphhopper.routing.weighting.ShortestWeighting;
 import com.graphhopper.routing.weighting.Weighting;
 import com.graphhopper.storage.*;
-import com.graphhopper.util.CHEdgeIteratorState;
 import com.graphhopper.util.EdgeIteratorState;
 import com.graphhopper.util.GHUtility;
 import com.graphhopper.util.Parameters;
@@ -59,9 +58,12 @@ protected GraphHopperStorage createGHStorage(EncodingManager em,
     @Override
     public RoutingAlgorithmFactory createFactory(GraphHopperStorage ghStorage, AlgorithmOptions opts) {
         ghStorage.freeze();
-        PrepareContractionHierarchies ch = PrepareContractionHierarchies.fromGraphHopperStorage(
-                ghStorage, CHProfile.nodeBased(opts.getWeighting()));
-        ch.doWork();
+        CHGraph chGraph = ghStorage.getCHGraph(CHProfile.nodeBased(opts.getWeighting()));
+        PrepareContractionHierarchies ch = new PrepareContractionHierarchies(chGraph);
+        // make sure the contraction runs only once
+        if (chGraph.getEdges() == chGraph.getBaseGraph().getEdges()) {
+            ch.doWork();
+        }
         return ch;
     }
 

diff --git a/core/src/test/java/com/graphhopper/routing/DijkstraBidirectionEdgeCHTest.java b/core/src/test/java/com/graphhopper/routing/DijkstraBidirectionEdgeCHTest.java
@@ -46,9 +46,13 @@ protected GraphHopperStorage createGHStorage(
     @Override
     public RoutingAlgorithmFactory createFactory(GraphHopperStorage ghStorage, AlgorithmOptions opts) {
         ghStorage.freeze();
-        PrepareContractionHierarchies ch = PrepareContractionHierarchies.fromGraphHopperStorage(
-                ghStorage, CHProfile.edgeBased(opts.getWeighting(), INFINITE_U_TURN_COSTS));
-        ch.doWork();
+        CHProfile chProfile = CHProfile.edgeBased(opts.getWeighting(), INFINITE_U_TURN_COSTS);
+        CHGraph chGraph = ghStorage.getCHGraph(chProfile);
+        PrepareContractionHierarchies ch = new PrepareContractionHierarchies(chGraph);
+        // make sure the contraction runs only once
+        if (chGraph.getEdges() == chGraph.getBaseGraph().getEdges()) {
+            ch.doWork();
+        }
         return ch;
     }
 

diff --git a/core/src/test/java/com/graphhopper/routing/ch/PrepareContractionHierarchiesTest.java b/core/src/test/java/com/graphhopper/routing/ch/PrepareContractionHierarchiesTest.java
@@ -353,7 +353,7 @@ public void testUnpackingOrder() {
         CHGraph lg = g.getCHGraph();
         initUnpackingGraph(g, lg, weighting);
         PrepareContractionHierarchies prepare = createPrepareContractionHierarchies(g, lg);
-        prepare.doWork();
+        // do not call prepare.doWork() here
         RoutingAlgorithm algo = prepare.createAlgo(lg, new AlgorithmOptions(DIJKSTRA_BI, weighting, tMode));
         Path p = algo.calcPath(10, 6);
         assertEquals(7, p.getDistance(), 1e-5);
@@ -368,7 +368,7 @@ public void testUnpackingOrder_Fastest() {
         initUnpackingGraph(g, lg, w);
 
         PrepareContractionHierarchies prepare = createPrepareContractionHierarchies(g, lg);
-        prepare.doWork();
+        // do not call prepare.doWork() here
         RoutingAlgorithm algo = prepare.createAlgo(lg, new AlgorithmOptions(DIJKSTRA_BI, weighting, tMode));
         Path p = algo.calcPath(10, 6);
         assertEquals(7, p.getDistance(), 1e-1);