Does some clean-up.

Signed-off-by: ammagamma <contactammagamma@gmail.com>
graphhopper · May 17, 2018 · 21b7870 · 21b7870
1 parent 298d969
commit 21b7870
Show file tree

Hide file tree

Showing 6 changed files with 191 additions and 442 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/ch/EdgeBasedNodeContractor.java b/core/src/main/java/com/graphhopper/routing/ch/EdgeBasedNodeContractor.java
@@ -77,15 +77,12 @@ public class EdgeBasedNodeContractor extends AbstractNodeContractor {
     private int numPolledEdges;
     private int numSearches;
 
-    private final PMap options;
-
     public EdgeBasedNodeContractor(Directory dir, GraphHopperStorage ghStorage, CHGraph prepareGraph,
                                    TurnWeighting turnWeighting, PMap options) {
         super(dir, ghStorage, prepareGraph, turnWeighting);
         this.turnWeighting = turnWeighting;
         this.encoder = turnWeighting.getFlagEncoder();
         this.witnessSearchStrategy = new TurnReplacementSearch();
-        this.options = options;
     }
 
     @Override
@@ -95,9 +92,8 @@ public void initFromGraph() {
         legacyWitnessPathFinder = arrayBasedWitnessPathFinder ?
                 new ArrayBasedLegacyWitnessPathFinder(prepareGraph, turnWeighting, TraversalMode.EDGE_BASED_2DIR, maxLevel) :
                 new MapBasedLegacyWitnessPathFinder(prepareGraph, turnWeighting, TraversalMode.EDGE_BASED_2DIR, maxLevel);
-        witnessPathSearcher = arrayBasedWitnessPathFinder ?
+        WitnessPathSearcher.Config config = new WitnessPathSearcher.Config();
-                new WitnessPathSearcher(ghStorage, prepareGraph, turnWeighting, options) :
+        witnessPathSearcher = new WitnessPathSearcher(ghStorage, prepareGraph, turnWeighting, config);
-                new MapWitnessPathSearcher(ghStorage, prepareGraph, turnWeighting, options);
         DefaultEdgeFilter inEdgeFilter = new DefaultEdgeFilter(encoder, true, false);
         DefaultEdgeFilter outEdgeFilter = new DefaultEdgeFilter(encoder, false, true);
         inEdgeExplorer = prepareGraph.createEdgeExplorer(inEdgeFilter);
@@ -547,7 +543,7 @@ public String getStatisticsString() {
         String result = String.format("searches: %10s, polled-edges: %10s, stats(calc): %s, stats(contract): %s, %s",
                 nf(totalNumSearches), nf(totalNumPolledEdges),
                 countingShortcutHandler.getStats(), addingShortcutHandler.getStats(),
-                searchType == SearchType.AGGRESSIVE ? witnessPathSearcher.getStatusString() : legacyWitnessPathFinder.getStatusString());
+                searchType == SearchType.AGGRESSIVE ? witnessPathSearcher.getStatisticsString() : legacyWitnessPathFinder.getStatusString());
         countingShortcutHandler.resetStats();
         addingShortcutHandler.resetStats();
         legacyWitnessPathFinder.resetStats();

diff --git a/core/src/main/java/com/graphhopper/routing/ch/MapWitnessPathSearcher.java b/core/src/main/java/com/graphhopper/routing/ch/MapWitnessPathSearcher.java
diff --git a/core/src/main/java/com/graphhopper/routing/ch/OnFlyStatisticsCalculator.java b/core/src/main/java/com/graphhopper/routing/ch/OnFlyStatisticsCalculator.java
@@ -28,7 +28,7 @@ class OnFlyStatisticsCalculator {
     private double mean;
     private double varianceHelper;
 
-    void addObservation(int value) {
+    void addObservation(long value) {
         count++;
         double delta = value - mean;
         mean += delta / count;