From 2a28aab0b1fb6ddfceea594874c80b552876ab45 Mon Sep 17 00:00:00 2001 From: Thibaut Dubernet Date: Thu, 18 Apr 2024 13:50:07 +0200 Subject: [PATCH] remove calls to now-removed method from tests --- .../matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java | 2 +- .../core/router/speedy/SpeedyMultiSourceALTBackwardTest.java | 2 +- .../core/router/speedy/SpeedyMultiSourceALTForwardTest.java | 2 +- .../java/org/matsim/core/router/speedy/SpeedyALTTest.java | 2 +- .../org/matsim/core/router/speedy/SpeedyDijkstraTest.java | 2 +- .../org/matsim/core/router/speedy/SpeedyGraphBuilderTest.java | 4 ++-- .../java/org/matsim/core/router/speedy/SpeedyGraphTest.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java index 5c00ea7af1c..46497ef7852 100644 --- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java +++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java @@ -67,7 +67,7 @@ public class OneToManyPathCalculatorTest { private final IdMap 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 diff --git a/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTBackwardTest.java b/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTBackwardTest.java index e866a5387bb..06d8986af53 100644 --- a/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTBackwardTest.java +++ b/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTBackwardTest.java @@ -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); diff --git a/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTForwardTest.java b/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTForwardTest.java index b83c8cb581b..40c190308b6 100644 --- a/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTForwardTest.java +++ b/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTForwardTest.java @@ -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); diff --git a/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyALTTest.java b/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyALTTest.java index 71ab8a75b7d..28cbd1650f7 100644 --- a/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyALTTest.java +++ b/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyALTTest.java @@ -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); } diff --git a/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyDijkstraTest.java b/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyDijkstraTest.java index fe435780bda..57fc033d287 100644 --- a/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyDijkstraTest.java +++ b/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyDijkstraTest.java @@ -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); } diff --git a/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyGraphBuilderTest.java b/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyGraphBuilderTest.java index ff50d9c5433..36681cecbd4 100644 --- a/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyGraphBuilderTest.java +++ b/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyGraphBuilderTest.java @@ -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) { @@ -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); diff --git a/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyGraphTest.java b/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyGraphTest.java index bdbae010ed8..162fc907e31 100644 --- a/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyGraphTest.java +++ b/matsim/src/test/java/org/matsim/core/router/speedy/SpeedyGraphTest.java @@ -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