Remove PrepareContractionHierarchies#getRoutingAlgorithmFactory

Author: easbar

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

@@ -20,7 +20,6 @@
 import com.carrotsearch.hppc.IntHashSet;
 import com.carrotsearch.hppc.IntSet;
 import com.graphhopper.coll.GHTreeMapComposed;
-import com.graphhopper.routing.RoutingAlgorithmFactory;
 import com.graphhopper.routing.util.AbstractAlgoPreparation;
 import com.graphhopper.routing.util.TraversalMode;
 import com.graphhopper.routing.weighting.Weighting;
@@ -438,10 +437,6 @@ void close() {
         cg.close();
     }
 
-    public RoutingAlgorithmFactory getRoutingAlgorithmFactory() {
-        return new CHRoutingAlgorithmFactory(chGraph);
-    }
-
     private static class Params {
         /**
          * Specifies after how many contracted nodes a full refresh of the queue of remaining/not contracted nodes

core/src/main/java/com/graphhopper/routing/util/TestAlgoCollector.java

@@ -18,7 +18,10 @@
 package com.graphhopper.routing.util;
 
 import com.graphhopper.ResponsePath;
-import com.graphhopper.routing.*;
+import com.graphhopper.routing.AlgorithmOptions;
+import com.graphhopper.routing.Path;
+import com.graphhopper.routing.RoutingAlgorithm;
+import com.graphhopper.routing.RoutingAlgorithmFactorySimple;
 import com.graphhopper.routing.querygraph.QueryGraph;
 import com.graphhopper.storage.CHGraph;
 import com.graphhopper.storage.Graph;
@@ -48,9 +51,8 @@ public TestAlgoCollector assertDistance(EncodingManager encodingManager, AlgoHel
                                             OneRun oneRun) {
         List<Path> altPaths = new ArrayList<>();
         QueryGraph queryGraph = QueryGraph.create(algoEntry.getForQueryGraph(), queryList);
-        RoutingAlgorithmFactory factory = algoEntry.createRoutingFactory();
         for (int i = 0; i < queryList.size() - 1; i++) {
-            RoutingAlgorithm algo = factory.createAlgo(queryGraph, algoEntry.getAlgorithmOptions());
+            RoutingAlgorithm algo = algoEntry.createAlgo(queryGraph);
 
 //            if (!algoEntry.getExpectedAlgo().equals(algo.toString())) {
 //                errors.add("Algorithm expected " + algoEntry.getExpectedAlgo() + " but was " + algo.toString());
@@ -153,8 +155,8 @@ public void setAlgorithmOptions(AlgorithmOptions opts) {
             this.opts = opts;
         }
 
-        public RoutingAlgorithmFactory createRoutingFactory() {
-            return new RoutingAlgorithmFactorySimple();
+        public RoutingAlgorithm createAlgo(Graph graph) {
+            return new RoutingAlgorithmFactorySimple().createAlgo(graph, opts);
         }
 
         public AlgorithmOptions getAlgorithmOptions() {

core/src/test/java/com/graphhopper/routing/DijkstraBidirectionCHTest.java

@@ -136,10 +136,11 @@ public void testBaseGraphMultipleVehicles() {
         RoutingAlgorithmTest.initFootVsCar(carEncoder, footEncoder, g);
 
         // do CH preparation for car
-        RoutingAlgorithmFactory contractedFactory = prepareCH(g, carConfig);
+        prepareCH(g, carConfig);
 
         // use contracted graph for car
-        Path p1 = contractedFactory.createAlgo(g.getCHGraph(carConfig.getName()), carOptions).calcPath(0, 7);
+        CHGraph chGraph = g.getCHGraph(carConfig.getName());
+        Path p1 = new CHRoutingAlgorithmFactory(chGraph).createAlgo(chGraph, carOptions).calcPath(0, 7);
         assertEquals(IntArrayList.from(0, 4, 6, 7), p1.calcNodes());
         assertEquals(p1.toString(), 15000, p1.getDistance(), 1e-6);
 
@@ -250,11 +251,10 @@ private GraphHopperStorage createGHStorage(Weighting weighting) {
         return new GraphBuilder(encodingManager).setCHConfigs(CHConfig.nodeBased(weighting.getName(), weighting)).create();
     }
 
-    private RoutingAlgorithmFactory prepareCH(GraphHopperStorage graphHopperStorage, CHConfig chConfig) {
+    private void prepareCH(GraphHopperStorage graphHopperStorage, CHConfig chConfig) {
         graphHopperStorage.freeze();
         PrepareContractionHierarchies pch = PrepareContractionHierarchies.fromGraphHopperStorage(graphHopperStorage, chConfig);
         pch.doWork();
-        return pch.getRoutingAlgorithmFactory();
     }
 
     private RoutingAlgorithm createCHAlgo(CHGraph chGraph, boolean withSOD, AlgorithmOptions algorithmOptions) {

core/src/test/java/com/graphhopper/routing/DirectedRoutingTest.java

@@ -20,6 +20,7 @@
 
 import com.graphhopper.Repeat;
 import com.graphhopper.RepeatRule;
+import com.graphhopper.routing.ch.CHRoutingAlgorithmFactory;
 import com.graphhopper.routing.ch.PrepareContractionHierarchies;
 import com.graphhopper.routing.lm.LMConfig;
 import com.graphhopper.routing.lm.PrepareLandmarks;
@@ -155,9 +156,9 @@ private BidirRoutingAlgorithm createAlgo(Graph graph) {
             case ASTAR:
                 return new AStarBidirection(graph, graph.wrapWeighting(weighting), TraversalMode.EDGE_BASED);
             case CH_DIJKSTRA:
-                return (BidirRoutingAlgorithm) pch.getRoutingAlgorithmFactory().createAlgo(graph, AlgorithmOptions.start().weighting(weighting).algorithm(DIJKSTRA_BI).build());
+                return (BidirRoutingAlgorithm) new CHRoutingAlgorithmFactory(chGraph).createAlgo(graph, AlgorithmOptions.start().weighting(weighting).algorithm(DIJKSTRA_BI).build());
             case CH_ASTAR:
-                return (BidirRoutingAlgorithm) pch.getRoutingAlgorithmFactory().createAlgo(graph, AlgorithmOptions.start().weighting(weighting).algorithm(ASTAR_BI).build());
+                return (BidirRoutingAlgorithm) new CHRoutingAlgorithmFactory(chGraph).createAlgo(graph, AlgorithmOptions.start().weighting(weighting).algorithm(ASTAR_BI).build());
             case LM:
                 return (BidirRoutingAlgorithm) lm.getRoutingAlgorithmFactory().createAlgo(graph, AlgorithmOptions.start().weighting(weighting).algorithm(ASTAR_BI).traversalMode(TraversalMode.EDGE_BASED).build());
             default:

core/src/test/java/com/graphhopper/routing/RandomCHRoutingTest.java

@@ -1,5 +1,6 @@
 package com.graphhopper.routing;
 
+import com.graphhopper.routing.ch.CHRoutingAlgorithmFactory;
 import com.graphhopper.routing.ch.PrepareContractionHierarchies;
 import com.graphhopper.routing.ev.DecimalEncodedValue;
 import com.graphhopper.routing.querygraph.QueryGraph;
@@ -166,7 +167,7 @@ private void runRandomTest(Random rnd, int numVirtualNodes) {
                     continue;
                 }
 
-                RoutingAlgorithm algo = pch.getRoutingAlgorithmFactory().createAlgo(chQueryGraph, AlgorithmOptions.start().
+                RoutingAlgorithm algo = new CHRoutingAlgorithmFactory(chGraph).createAlgo(chQueryGraph, AlgorithmOptions.start().
                         hints(new PMap().putObject("stall_on_demand", true)).build());
                 Path path = algo.calcPath(from, to);
                 if (!path.isFound()) {

core/src/test/java/com/graphhopper/routing/RandomizedRoutingTest.java

@@ -22,6 +22,7 @@
 import com.carrotsearch.hppc.IntIndexedContainer;
 import com.graphhopper.Repeat;
 import com.graphhopper.RepeatRule;
+import com.graphhopper.routing.ch.CHRoutingAlgorithmFactory;
 import com.graphhopper.routing.ch.PrepareContractionHierarchies;
 import com.graphhopper.routing.lm.LMConfig;
 import com.graphhopper.routing.lm.PerfectApproximator;
@@ -165,9 +166,9 @@ private RoutingAlgorithm createAlgo(Graph graph) {
             case ASTAR_BIDIR:
                 return new AStarBidirection(graph, graph.wrapWeighting(weighting), traversalMode);
             case CH_DIJKSTRA:
-                return pch.getRoutingAlgorithmFactory().createAlgo(graph instanceof QueryGraph ? graph : chGraph, AlgorithmOptions.start().weighting(weighting).algorithm(DIJKSTRA_BI).build());
+                return new CHRoutingAlgorithmFactory(chGraph).createAlgo(graph instanceof QueryGraph ? graph : chGraph, AlgorithmOptions.start().weighting(weighting).algorithm(DIJKSTRA_BI).build());
             case CH_ASTAR:
-                return pch.getRoutingAlgorithmFactory().createAlgo(graph instanceof QueryGraph ? graph : chGraph, AlgorithmOptions.start().weighting(weighting).algorithm(ASTAR_BI).build());
+                return new CHRoutingAlgorithmFactory(chGraph).createAlgo(graph instanceof QueryGraph ? graph : chGraph, AlgorithmOptions.start().weighting(weighting).algorithm(ASTAR_BI).build());
             case LM_BIDIR:
                 return lm.getRoutingAlgorithmFactory().createAlgo(graph, AlgorithmOptions.start().weighting(weighting).algorithm(ASTAR_BI).traversalMode(traversalMode).build());
             case LM_UNIDIR:

core/src/test/java/com/graphhopper/routing/RoutingAlgorithmTest.java

@@ -19,6 +19,7 @@
 
 import com.carrotsearch.hppc.IntArrayList;
 import com.carrotsearch.hppc.IntIndexedContainer;
+import com.graphhopper.routing.ch.CHRoutingAlgorithmFactory;
 import com.graphhopper.routing.ch.PrepareContractionHierarchies;
 import com.graphhopper.routing.ev.BooleanEncodedValue;
 import com.graphhopper.routing.ev.DecimalEncodedValue;
@@ -1170,11 +1171,10 @@ public Path calcPath(GraphHopperStorage graph, Weighting weighting, TraversalMod
                 graph.freeze();
                 pch.doWork();
             }
-            RoutingAlgorithmFactory algoFactory = pch.getRoutingAlgorithmFactory();
             AlgorithmOptions opts = AlgorithmOptions.start()
                     .algorithm(getAlgorithm())
                     .weighting(weighting).traversalMode(traversalMode).maxVisitedNodes(maxVisitedNodes).build();
-            RoutingAlgorithm algo = algoFactory.createAlgo(chGraph, opts);
+            RoutingAlgorithm algo = new CHRoutingAlgorithmFactory(chGraph).createAlgo(chGraph, opts);
             return algo.calcPath(from, to);
         }
 
@@ -1197,11 +1197,10 @@ public Path calcPath(GraphHopperStorage graph, Weighting weighting, TraversalMod
                 pch.doWork();
             }
             QueryGraph queryGraph = QueryGraph.create(chGraph, from, to);
-            RoutingAlgorithmFactory algoFactory = pch.getRoutingAlgorithmFactory();
             AlgorithmOptions opts = AlgorithmOptions.start()
                     .algorithm(getAlgorithm())
                     .weighting(weighting).traversalMode(traversalMode).maxVisitedNodes(maxVisitedNodes).build();
-            RoutingAlgorithm algo = algoFactory.createAlgo(queryGraph, opts);
+            RoutingAlgorithm algo = new CHRoutingAlgorithmFactory(chGraph).createAlgo(queryGraph, opts);
             return algo.calcPath(from.getClosestNode(), to.getClosestNode());
 
         }