Use Graph#edge instead of CHGraph#edge

graphhopper · Nov 26, 2019 · 6ed437d · 6ed437d
1 parent ee9bf6a
commit 6ed437d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -14,10 +14,10 @@ run_measurement:
     - export BENCHMARK_DIR=/ext_data/
     - export BENCHMARK_RESULT_DIR=${BENCHMARK_DIR}results/$(date '+%d-%m-%Y-%s%N')/
     - export BENCHMARK_SMALL_MAP_NAME=bayern-190101.osm.pbf
-    - export BENCHMARK_BIG_MAP_NAME=germany-190101.osm.pbf
     - export BENCHMARK_SMALL_MAP_URL=http://download.geofabrik.de/europe/germany/${BENCHMARK_SMALL_MAP_NAME}
-    - export BENCHMARK_BIG_MAP_URL=http://download.geofabrik.de/europe/${BENCHMARK_BIG_MAP_NAME}
     - export BENCHMARK_SMALL_MAP_PATH=${BENCHMARK_DIR}osm/${BENCHMARK_SMALL_MAP_NAME}
+    - export BENCHMARK_BIG_MAP_NAME=germany-190101.osm.pbf
+    - export BENCHMARK_BIG_MAP_URL=http://download.geofabrik.de/europe/${BENCHMARK_BIG_MAP_NAME}
     - export BENCHMARK_BIG_MAP_PATH=${BENCHMARK_DIR}osm/${BENCHMARK_BIG_MAP_NAME}
     - mkdir -p ${BENCHMARK_DIR}osm
     - mvn $MAVEN_CLI_OPTS package -DskipTests -pl tools -am

diff --git a/core/src/test/java/com/graphhopper/storage/GraphHopperStorageCHTest.java b/core/src/test/java/com/graphhopper/storage/GraphHopperStorageCHTest.java
@@ -44,7 +44,7 @@
  * @author Peter Karich
  */
 public class GraphHopperStorageCHTest extends GraphHopperStorageTest {
-    protected CHGraph getGraph(GraphHopperStorage ghStorage) {
+    private CHGraph getGraph(GraphHopperStorage ghStorage) {
         return ghStorage.getCHGraph();
     }
 
@@ -105,42 +105,40 @@ public void testPrios() {
     @Test
     public void testEdgeFilter() {
         graph = createGHStorage();
-        CHGraph g = getGraph(graph);
-        g.edge(0, 1, 10, true);
-        g.edge(0, 2, 20, true);
-        g.edge(2, 3, 30, true);
-        g.edge(10, 11, 1, true);
-
+        graph.edge(0, 1, 10, true);
+        graph.edge(0, 2, 20, true);
+        graph.edge(2, 3, 30, true);
+        graph.edge(10, 11, 1, true);
         graph.freeze();
-        g.shortcut(3, 4, PrepareEncoder.getScDirMask(), 0, NO_EDGE, NO_EDGE);
-        g.shortcut(0, 4, PrepareEncoder.getScDirMask(), 0, NO_EDGE, NO_EDGE);
-        g.setLevel(0, 1);
-        g.setLevel(4, 1);
 
-        EdgeIterator iter = g.createEdgeExplorer(new LevelEdgeFilter(g)).setBaseNode(0);
+        CHGraph lg = getGraph(graph);
+        lg.shortcut(3, 4, PrepareEncoder.getScDirMask(), 0, NO_EDGE, NO_EDGE);
+        lg.shortcut(0, 4, PrepareEncoder.getScDirMask(), 0, NO_EDGE, NO_EDGE);
+        lg.setLevel(0, 1);
+        lg.setLevel(4, 1);
+
+        EdgeIterator iter = lg.createEdgeExplorer(new LevelEdgeFilter(lg)).setBaseNode(0);
         assertEquals(1, GHUtility.count(iter));
-        iter = g.createEdgeExplorer().setBaseNode(2);
+        iter = lg.createEdgeExplorer().setBaseNode(2);
         assertEquals(2, GHUtility.count(iter));
 
-        int sc = g.shortcut(5, 6, PrepareEncoder.getScDirMask(), 0, 1, 2);
-        CHEdgeIteratorState tmpIter = g.getEdgeIteratorState(sc, 6);
+        int sc = lg.shortcut(5, 6, PrepareEncoder.getScDirMask(), 0, 1, 2);
+        CHEdgeIteratorState tmpIter = lg.getEdgeIteratorState(sc, 6);
         assertEquals(1, tmpIter.getSkippedEdge1());
         assertEquals(2, tmpIter.getSkippedEdge2());
     }
 
     @Test
     public void testDisconnectEdge() {
         graph = createGHStorage();
-        CHGraph lg = getGraph(graph);
-
-        EdgeExplorer chCarOutExplorer = lg.createEdgeExplorer(carOutFilter);
-        EdgeExplorer tmpCarInExplorer = lg.createEdgeExplorer(carInFilter);
-
         EdgeExplorer baseCarOutExplorer = graph.createEdgeExplorer(carOutFilter);
-
         // only remove edges
-        lg.edge(4, 1, 30, true);
+        graph.edge(4, 1, 30, true);
         graph.freeze();
+
+        CHGraph lg = getGraph(graph);
+        EdgeExplorer chCarOutExplorer = lg.createEdgeExplorer(carOutFilter);
+        EdgeExplorer tmpCarInExplorer = lg.createEdgeExplorer(carInFilter);
         lg.shortcut(1, 2, PrepareEncoder.getScDirMask(), 0, 10, 11);
         lg.shortcut(1, 0, PrepareEncoder.getScFwdDir(), 0, 12, 13);
         lg.shortcut(3, 1, PrepareEncoder.getScFwdDir(), 0, 14, 15);