Skip to content

Commit 32e6583

Browse files
author
Peter
committed
fixed bug in measurement
1 parent a652176 commit 32e6583

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public class PrepareContractionHierarchies extends AbstractAlgoPreparation<Prepa
9595

9696
public PrepareContractionHierarchies() {
9797
type(new ShortestCalc());
98-
//vehicle(new CarFlagEncoder());
9998
originalEdges = new RAMDirectory().findCreate("originalEdges");
10099
originalEdges.create(1000);
101100
}

core/src/main/java/com/graphhopper/util/Measurement.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import com.graphhopper.routing.RoutingAlgorithm;
2424
import com.graphhopper.routing.ch.PrepareContractionHierarchies;
2525
import com.graphhopper.routing.util.AlgorithmPreparation;
26-
import com.graphhopper.routing.util.CarFlagEncoder;
2726
import com.graphhopper.routing.util.EncodingManager;
27+
import com.graphhopper.routing.util.FlagEncoder;
2828
import com.graphhopper.routing.util.NoOpAlgorithmPreparation;
2929
import com.graphhopper.storage.Directory;
3030
import com.graphhopper.storage.Graph;
@@ -84,19 +84,20 @@ void start(CmdArgs args) {
8484
throw new IllegalStateException("Cannot load existing levelgraph at " + graphLocation);
8585
// TODO make sure the graph is unprepared!
8686

87+
final FlagEncoder vehicle = encodingManager.getEncoder("CAR");
8788
StopWatch sw = new StopWatch().start();
8889
try {
8990
printGraphDetails(g);
9091
AlgorithmPreparation prepare;
9192
if (doPrepare) {
92-
PrepareContractionHierarchies p = new PrepareContractionHierarchies().graph(g);
93+
PrepareContractionHierarchies p = new PrepareContractionHierarchies().vehicle(vehicle).graph(g);
9394
logger.info("nodes:" + g.nodes() + ", edges:" + g.getAllEdges().maxId());
9495
printPreparationDetails(g, p);
9596
prepare = p;
9697
} else {
9798
prepare = new NoOpAlgorithmPreparation() {
9899
@Override public RoutingAlgorithm createAlgo() {
99-
return new Dijkstra(_graph, encodingManager.getEncoder("CAR"));
100+
return new Dijkstra(_graph, vehicle);
100101
}
101102
}.graph(g);
102103
}

0 commit comments

Comments
 (0)