Use Astar by default for edge-based CH (graphhopper#2054)

Author: easbar

core/src/main/java/com/graphhopper/routing/AStarBidirectionEdgeCHNoSOD.java

@@ -107,7 +107,6 @@ private double getMinCurrToPathWeight() {
         return currTo.weight + weightApprox.approximate(currTo.adjNode, true);
     }
 
-
     @Override
     public String getName() {
         return "astarbi|ch|edge_based|no_sod";

core/src/main/java/com/graphhopper/routing/Router.java

@@ -49,7 +49,8 @@
 
 import static com.graphhopper.routing.weighting.Weighting.INFINITE_U_TURN_COSTS;
 import static com.graphhopper.util.Helper.DIST_EARTH;
-import static com.graphhopper.util.Parameters.Algorithms.*;
+import static com.graphhopper.util.Parameters.Algorithms.ALT_ROUTE;
+import static com.graphhopper.util.Parameters.Algorithms.ROUND_TRIP;
 import static com.graphhopper.util.Parameters.Routing.CURBSIDE;
 import static com.graphhopper.util.Parameters.Routing.POINT_HINT;
 
@@ -133,10 +134,7 @@ public List<Path> route(GHRequest request, GHResponse ghRsp) {
             }
             ghRsp.addDebugInfo("tmode:" + tMode.toString());
 
-            String algoStr = request.getAlgorithm();
-            if (algoStr.isEmpty())
-                algoStr = chEnabled && !disableCH ? DIJKSTRA_BI : ASTAR_BI;
-            RoutingTemplate routingTemplate = createRoutingTemplate(request, ghRsp, algoStr, weighting);
+            RoutingTemplate routingTemplate = createRoutingTemplate(request, ghRsp, request.getAlgorithm(), weighting);
 
             StopWatch sw = new StopWatch().start();
             List<QueryResult> qResults = routingTemplate.lookup(request.getPoints());
@@ -150,7 +148,7 @@ public List<Path> route(GHRequest request, GHResponse ghRsp) {
                 throw new IllegalArgumentException("The max_visited_nodes parameter has to be below or equal to:" + routerConfig.getMaxVisitedNodes());
 
             AlgorithmOptions algoOpts = AlgorithmOptions.start().
-                    algorithm(algoStr).
+                    algorithm(request.getAlgorithm()).
                     traversalMode(tMode).
                     weighting(weighting).
                     maxVisitedNodes(maxVisitedNodesForRequest).

core/src/main/java/com/graphhopper/routing/RoutingAlgorithmFactorySimple.java

@@ -44,7 +44,7 @@ public RoutingAlgorithm createAlgo(Graph g, AlgorithmOptions opts) {
         } else if (DIJKSTRA.equalsIgnoreCase(algoStr)) {
             ra = new Dijkstra(g, weighting, opts.getTraversalMode());
 
-        } else if (ASTAR_BI.equalsIgnoreCase(algoStr)) {
+        } else if (ASTAR_BI.equalsIgnoreCase(algoStr) || Helper.isEmpty(opts.getAlgorithm())) {
             AStarBidirection aStarBi = new AStarBidirection(g, weighting,
                     opts.getTraversalMode());
             aStarBi.setApproximation(getApproximation(ASTAR_BI, opts, g.getNodeAccess()));

core/src/main/java/com/graphhopper/routing/ch/CHRoutingAlgorithmFactory.java

@@ -21,6 +21,7 @@
 import com.graphhopper.routing.*;
 import com.graphhopper.routing.weighting.Weighting;
 import com.graphhopper.storage.*;
+import com.graphhopper.util.Helper;
 
 import static com.graphhopper.util.Parameters.Algorithms.*;
 
@@ -37,7 +38,7 @@ public RoutingAlgorithm createAlgo(Graph graph, AlgorithmOptions opts) {
         // graph we have to use: the CH graph. Same with  opts.weighting: The CHConfig already contains a weighting
         // and we cannot really use it here. The real reason we do this the way its done atm is that graph might be
         // a QueryGraph that wraps (our) CHGraph.
-        RoutingAlgorithm algo = doCreateAlgo(graph, opts);
+        RoutingAlgorithm algo = doCreateAlgo(graph, AlgorithmOptions.start(opts).weighting(getWeighting()).build());
         algo.setMaxVisitedNodes(opts.getMaxVisitedNodes());
         return algo;
     }
@@ -50,16 +51,16 @@ private RoutingAlgorithm doCreateAlgo(Graph graph, AlgorithmOptions opts) {
             if (turnCostStorage == null) {
                 throw new IllegalArgumentException("For edge-based CH you need a turn cost extension");
             }
-            RoutingCHGraph g = new RoutingCHGraphImpl(graph, graph.wrapWeighting(getWeighting()));
+            RoutingCHGraph g = new RoutingCHGraphImpl(graph, graph.wrapWeighting(opts.getWeighting()));
             return createAlgoEdgeBased(g, opts);
         } else {
-            RoutingCHGraph g = new RoutingCHGraphImpl(graph, chConfig.getWeighting());
+            RoutingCHGraph g = new RoutingCHGraphImpl(graph, opts.getWeighting());
             return createAlgoNodeBased(g, opts);
         }
     }
 
     private RoutingAlgorithm createAlgoEdgeBased(RoutingCHGraph g, AlgorithmOptions opts) {
-        if (ASTAR_BI.equals(opts.getAlgorithm())) {
+        if (ASTAR_BI.equals(opts.getAlgorithm()) || Helper.isEmpty(opts.getAlgorithm())) {
             return new AStarBidirectionEdgeCHNoSOD(g)
                     .setApproximation(RoutingAlgorithmFactorySimple.getApproximation(ASTAR_BI, opts, g.getGraph().getNodeAccess()));
         } else if (DIJKSTRA_BI.equals(opts.getAlgorithm())) {
@@ -75,7 +76,7 @@ private RoutingAlgorithm createAlgoNodeBased(RoutingCHGraph g, AlgorithmOptions
         if (ASTAR_BI.equals(opts.getAlgorithm())) {
             return new AStarBidirectionCH(g)
                     .setApproximation(RoutingAlgorithmFactorySimple.getApproximation(ASTAR_BI, opts, g.getGraph().getNodeAccess()));
-        } else if (DIJKSTRA_BI.equals(opts.getAlgorithm())) {
+        } else if (DIJKSTRA_BI.equals(opts.getAlgorithm()) || Helper.isEmpty(opts.getAlgorithm())) {
             if (opts.getHints().getBool("stall_on_demand", true)) {
                 return new DijkstraBidirectionCH(g);
             } else {

core/src/main/java/com/graphhopper/routing/lm/LMRoutingAlgorithmFactory.java

@@ -22,6 +22,7 @@
 import com.graphhopper.routing.*;
 import com.graphhopper.routing.weighting.Weighting;
 import com.graphhopper.storage.Graph;
+import com.graphhopper.util.Helper;
 import com.graphhopper.util.Parameters;
 
 import static com.graphhopper.util.Parameters.Algorithms.*;
@@ -58,7 +59,7 @@ public RoutingAlgorithm createAlgo(Graph g, AlgorithmOptions opts) {
             algo.setApproximation(getApproximator(g, activeLM, epsilon));
             algo.setMaxVisitedNodes(opts.getMaxVisitedNodes());
             return algo;
-        } else if (ASTAR_BI.equalsIgnoreCase(algoStr)) {
+        } else if (ASTAR_BI.equalsIgnoreCase(algoStr) || Helper.isEmpty(opts.getAlgorithm())) {
             double epsilon = opts.getHints().getDouble(Parameters.Algorithms.AStarBi.EPSILON, 1);
             AStarBidirection algo = new AStarBidirection(g, weighting, opts.getTraversalMode());
             algo.setApproximation(getApproximator(g, activeLM, epsilon));