Fix camel/snake case for periodic measurements

graphhopper · Dec 28, 2019 · f674be2 · f674be2
1 parent dcf4389
commit f674be2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/benchmark/benchmark.sh b/benchmark/benchmark.sh
@@ -52,7 +52,7 @@ prepare.min_network_size=10000 \
 prepare.min_oneway_network_size=10000 \
 measurement.json=true \
 measurement.count=5000 \
-measurement.useMeasurementTimeAsRefTime=${USE_MEASUREMENT_TIME_AS_REF_TIME}
+measurement.use_measurement_time_as_ref_time=${USE_MEASUREMENT_TIME_AS_REF_TIME}
 
 # 2 - big map: node-based CH + landmarks
 java -cp tools/target/graphhopper-tools-*-jar-with-dependencies.jar com.graphhopper.tools.Measurement \
@@ -72,4 +72,4 @@ prepare.min_network_size=10000 \
 prepare.min_oneway_network_size=10000 \
 measurement.json=true \
 measurement.count=5000 \
-measurement.useMeasurementTimeAsRefTime=${USE_MEASUREMENT_TIME_AS_REF_TIME}
+measurement.use_measurement_time_as_ref_time=${USE_MEASUREMENT_TIME_AS_REF_TIME}
diff --git a/tools/src/main/java/com/graphhopper/tools/Measurement.java b/tools/src/main/java/com/graphhopper/tools/Measurement.java
@@ -96,6 +96,11 @@ void start(CmdArgs args) throws IOException {
         int count = args.getInt("measurement.count", 5000);
         put("measurement.map", args.get("datareader.file", "unknown"));
 
+        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");
+        }
+
         GraphHopper hopper = new GraphHopperOSM() {
             @Override
             protected void prepareCH(boolean closeEarly) {
@@ -234,7 +239,7 @@ protected DataReader importData() throws IOException {
                 writeSummary(summaryLocation, propLocation);
             }
             if (useJson) {
-                storeJson(propLocation, args.getBool("measurement.useMeasurementTimeAsRefTime", false));
+                storeJson(propLocation, useMeasurementTimeAsRefTime);
             } else {
                 storeProperties(propLocation);
             }