improve Measurement for block_area to fix graphhopper#1961 (graphhopper#1963)

Author: karussell

.travis.yml

@@ -30,10 +30,6 @@ before_install:
   - 'wget https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh'
   - nvm install $NODE_VERSION
 
-# avoid increase of memory via travis https://github.com/travis-ci/travis-ci/issues/8408
-before_script:
-  - _JAVA_OPTIONS=
-
 # Undo `_JAVA_OPTIONS` environment variable; see https://github.com/travis-ci/travis-ci/issues/8408
 before_script:
   - _JAVA_OPTIONS=

benchmark/benchmark.sh

@@ -57,7 +57,8 @@ prepare.min_oneway_network_size=10000 \
 spatial_rules.borders_directory=${BORDERS_DIRECTORY} \
 measurement.json=true \
 measurement.count=5000 \
-measurement.use_measurement_time_as_ref_time=${USE_MEASUREMENT_TIME_AS_REF_TIME}
+measurement.use_measurement_time_as_ref_time=${USE_MEASUREMENT_TIME_AS_REF_TIME} \
+"measurement.block_area=49.394664,11.144428,49.348388,11.144943,49.355768,11.227169,49.411643,11.227512"
 
 # 2 - big map: node-based CH + landmarks (edge- & node-based for LM)
 java -cp tools/target/graphhopper-tools-*-jar-with-dependencies.jar com.graphhopper.tools.Measurement \
@@ -79,4 +80,5 @@ prepare.min_oneway_network_size=10000 \
 spatial_rules.borders_directory=${BORDERS_DIRECTORY} \
 measurement.json=true \
 measurement.count=5000 \
-measurement.use_measurement_time_as_ref_time=${USE_MEASUREMENT_TIME_AS_REF_TIME}
+measurement.use_measurement_time_as_ref_time=${USE_MEASUREMENT_TIME_AS_REF_TIME} \
+"measurement.block_area=49.394664,11.144428,49.348388,11.144943,49.355768,11.227169,49.411643,11.227512"

tools/src/main/java/com/graphhopper/tools/Measurement.java

@@ -113,7 +113,7 @@ void start(PMap args) throws IOException {
         put("measurement.gitinfo", args.getString("measurement.gitinfo", ""));
         int count = args.getInt("measurement.count", 5000);
         put("measurement.map", args.getString("datareader.file", "unknown"));
-
+        String blockAreaStr = args.getString("measurement.block_area", "");
         final boolean useMeasurementTimeAsRefTime = args.getBool("measurement.use_measurement_time_as_ref_time", false);
         if (useMeasurementTimeAsRefTime && !useJson) {
             throw new IllegalArgumentException("Using measurement time as reference time only works with json files");
@@ -185,16 +185,16 @@ protected DataReader importData() throws IOException {
             GHBitSet allowedEdges = printGraphDetails(g, vehicleStr);
             printMiscUnitPerfTests(g, isCH, encoder, count * 100, allowedEdges);
             printLocationIndexQuery(g, hopper.getLocationIndex(), count);
-            String blockAreaStr = "49.394664,11.144428,49.348388,11.144943,49.355768,11.227169,49.411643,11.227512";
+
             if (runSlow) {
                 printTimeOfRouteQuery(hopper, new QuerySettings("routing", vehicleStr, count / 20, isCH, isLM).
                         withInstructions());
-                if (encoder.supportsTurnCosts()) {
+                if (encoder.supportsTurnCosts())
                     printTimeOfRouteQuery(hopper, new QuerySettings("routing_edge", vehicleStr, count / 20, isCH, isLM).
                             withInstructions().edgeBased());
-                }
-                printTimeOfRouteQuery(hopper, new QuerySettings("routing_block_area", vehicleStr, count / 20, isCH, isLM).
-                        withInstructions().blockArea(blockAreaStr));
+                if (!blockAreaStr.isEmpty())
+                    printTimeOfRouteQuery(hopper, new QuerySettings("routing_block_area", vehicleStr, count / 20, isCH, isLM).
+                            withInstructions().blockArea(blockAreaStr));
             }
 
             if (hopper.getLMPreparationHandler().isEnabled()) {
@@ -210,8 +210,9 @@ protected DataReader importData() throws IOException {
                 }
 
                 final int blockAreaActiveLMCount = 8;
-                printTimeOfRouteQuery(hopper, new QuerySettings("routingLM" + blockAreaActiveLMCount + "_block_area", vehicleStr, count / 4, isCH, isLM).
-                        withInstructions().activeLandmarks(blockAreaActiveLMCount).blockArea(blockAreaStr));
+                if (!blockAreaStr.isEmpty())
+                    printTimeOfRouteQuery(hopper, new QuerySettings("routingLM" + blockAreaActiveLMCount + "_block_area", vehicleStr, count / 4, isCH, isLM).
+                            withInstructions().activeLandmarks(blockAreaActiveLMCount).blockArea(blockAreaStr));
                 // compareRouting(hopper, vehicleStr, count / 5);
             }
 
@@ -628,7 +629,8 @@ private void printTimeOfRouteQuery(final GraphHopper hopper, final QuerySettings
         final AtomicInteger failedCount = new AtomicInteger(0);
         final DistanceCalc distCalc = new DistanceCalcEarth();
 
-        final EdgeExplorer edgeExplorer = g.createEdgeExplorer(DefaultEdgeFilter.allEdges(hopper.getEncodingManager().getEncoder(querySettings.vehicle)));
+        final EdgeFilter edgeFilter = DefaultEdgeFilter.allEdges(hopper.getEncodingManager().getEncoder(querySettings.vehicle));
+        final EdgeExplorer edgeExplorer = g.createEdgeExplorer(edgeFilter);
         final AtomicLong visitedNodesSum = new AtomicLong(0);
         final AtomicLong maxVisitedNodes = new AtomicLong(0);
 //        final AtomicLong extractTimeSum = new AtomicLong(0);
@@ -641,15 +643,34 @@ private void printTimeOfRouteQuery(final GraphHopper hopper, final QuerySettings
         MiniPerfTest miniPerf = new MiniPerfTest() {
             @Override
             public int doCalc(boolean warmup, int run) {
-                int from = rand.nextInt(maxNode);
-                int to = rand.nextInt(maxNode);
-                double fromLat = na.getLatitude(from);
-                double fromLon = na.getLongitude(from);
-                double toLat = na.getLatitude(to);
-                double toLon = na.getLongitude(to);
-                GHRequest req = new GHRequest(fromLat, fromLon, toLat, toLon).
-                        setWeighting(weighting).
-                        setVehicle(querySettings.vehicle);
+                int from = -1, to = -1;
+                Double fromLat = null, fromLon = null, toLat = null, toLon = null;
+                GHRequest req = null;
+
+                for (int i = 0; i < 5; i++) {
+                    from = rand.nextInt(maxNode);
+                    to = rand.nextInt(maxNode);
+                    fromLat = na.getLatitude(from);
+                    fromLon = na.getLongitude(from);
+                    toLat = na.getLatitude(to);
+                    toLon = na.getLongitude(to);
+                    req = new GHRequest(fromLat, fromLon, toLat, toLon).
+                            setWeighting(weighting).
+                            setVehicle(querySettings.vehicle);
+
+                    if (querySettings.blockArea == null)
+                        break;
+
+                    try {
+                        req.getHints().putObject(BLOCK_AREA, querySettings.blockArea);
+                        GraphEdgeIdFinder.createBlockArea(hopper.getGraphHopperStorage(), hopper.getLocationIndex(), req.getPoints(), req.getHints(), edgeFilter);
+                        break;
+                    } catch (IllegalArgumentException ex) {
+                        if (i >= 4)
+                            throw new RuntimeException("Give up after 5 trials. Cannot find points outside of the block_area "
+                                    + querySettings.blockArea + " - too big block_area or map too small? Request:" + req);
+                    }
+                }
 
                 req.getHints().putObject(CH.DISABLE, !querySettings.ch).
                         putObject("stall_on_demand", querySettings.sod).
@@ -671,9 +692,6 @@ public int doCalc(boolean warmup, int run) {
                     req.getHints().putObject(Parameters.Routing.WAY_POINT_MAX_DISTANCE, 0);
                 }
 
-                if (querySettings.blockArea != null)
-                    req.getHints().putObject(BLOCK_AREA, querySettings.blockArea);
-
                 if (querySettings.withPointHints) {
                     EdgeIterator iter = edgeExplorer.setBaseNode(from);
                     if (!iter.next())