Skip to content

Commit

Permalink
remove calls to now-removed method from tests
Browse files Browse the repository at this point in the history
  • Loading branch information
tduberne committed Apr 18, 2024
1 parent 716c126 commit 2a28aab
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class OneToManyPathCalculatorTest {
private final IdMap<Node, Node> nodeMap = new IdMap<>(Node.class);

private final TravelTime travelTime = new FreeSpeedTravelTime();
private final LeastCostPathTree dijkstraTree = new LeastCostPathTree(SpeedyGraphBuilder.build(network, TransportMode.car), travelTime,
private final LeastCostPathTree dijkstraTree = new LeastCostPathTree(SpeedyGraphBuilder.build(network), travelTime,
new TimeAsTravelDisutility(travelTime));

@BeforeEach
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public class SpeedyMultiSourceALTBackwardTest {

private final TravelTime travelTime = new FreeSpeedTravelTime();
private final TravelDisutility travelDisutility = new TimeAsTravelDisutility(travelTime);
private final SpeedyGraph speedyGraph = SpeedyGraphBuilder.build(network, TransportMode.car);
private final SpeedyGraph speedyGraph = SpeedyGraphBuilder.build(network);
private final SpeedyALTData landmarks = new SpeedyALTData(speedyGraph, 3, travelDisutility);
private final SpeedyMultiSourceALT multiSourceALT = new SpeedyMultiSourceALT(landmarks, travelTime,
travelDisutility);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public class SpeedyMultiSourceALTForwardTest {

private final TravelTime travelTime = new FreeSpeedTravelTime();
private final TravelDisutility travelDisutility = new TimeAsTravelDisutility(travelTime);
private final SpeedyGraph speedyGraph = SpeedyGraphBuilder.build(network, TransportMode.car);
private final SpeedyGraph speedyGraph = SpeedyGraphBuilder.build(network);
private final SpeedyALTData landmarks = new SpeedyALTData(speedyGraph, 3, travelDisutility);
private final SpeedyMultiSourceALT multiSourceALT = new SpeedyMultiSourceALT(landmarks, travelTime,
travelDisutility);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class SpeedyALTTest extends AbstractLeastCostPathCalculatorTest {
@Override
protected LeastCostPathCalculator getLeastCostPathCalculator(final Network network) {
FreespeedTravelTimeAndDisutility travelTimeCostCalculator = new FreespeedTravelTimeAndDisutility(new ScoringConfigGroup());
SpeedyGraph g = SpeedyGraphBuilder.build(network, TransportMode.car);
SpeedyGraph g = SpeedyGraphBuilder.build(network);
SpeedyALTData altData = new SpeedyALTData(g, 16, travelTimeCostCalculator);
return new SpeedyALT(altData, travelTimeCostCalculator, travelTimeCostCalculator);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class SpeedyDijkstraTest extends AbstractLeastCostPathCalculatorTest {
@Override
protected LeastCostPathCalculator getLeastCostPathCalculator(final Network network) {
FreespeedTravelTimeAndDisutility travelTimeCostCalculator = new FreespeedTravelTimeAndDisutility(new ScoringConfigGroup());
SpeedyGraph g = SpeedyGraphBuilder.build(network, TransportMode.car);
SpeedyGraph g = SpeedyGraphBuilder.build(network);
return new SpeedyDijkstra(g, travelTimeCostCalculator, travelTimeCostCalculator);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public void testShortRestrictionsForReuse() {

/** Checks that none of the provided paths exist in the graph based on the provided network */
private static void verifyGraph(Network network, String fromNode, String[][] forbiddenPaths) {
SpeedyGraph graph = SpeedyGraphBuilder.build(network, TransportMode.car);
SpeedyGraph graph = SpeedyGraphBuilder.build(network);
Node realFromNode = network.getNodes().get(Id.create(fromNode, Node.class));

for (String[] path : forbiddenPaths) {
Expand Down Expand Up @@ -213,7 +213,7 @@ private static boolean findPath(SpeedyGraph graph, int nodeIndex, String[] path)
}

private static SpeedyGraph runTest(Network network, String fromNode, String toNode, String... expectedPath) {
SpeedyGraph graph = SpeedyGraphBuilder.build(network, TransportMode.car);
SpeedyGraph graph = SpeedyGraphBuilder.build(network);
FreespeedTravelTimeAndDisutility freespeed = new FreespeedTravelTimeAndDisutility(new ScoringConfigGroup());
SpeedyDijkstra dijkstra = new SpeedyDijkstra(graph, freespeed, freespeed);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void testConstruction() {
Fixture f = new Fixture();
Network network = f.network;

SpeedyGraph graph = SpeedyGraphBuilder.build(network, TransportMode.car);
SpeedyGraph graph = SpeedyGraphBuilder.build(network);

// test out-links

Expand Down

0 comments on commit 2a28aab

Please sign in to comment.