From 78ab7a1c91081ed33ef3a84086d4002a78766bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20H=C3=B6rl?= Date: Tue, 10 Sep 2024 17:16:22 +0200 Subject: [PATCH] chore: update to matsim pr 3390 --- .../org/matsim/alonso_mora/DiversionTest.java | 17 +++++++++++++++++ .../matsim/alonso_mora/glpk/GlpkExamplesIT.java | 5 ++++- pom.xml | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/org/matsim/alonso_mora/DiversionTest.java b/core/src/test/java/org/matsim/alonso_mora/DiversionTest.java index 254dea0..b4490ff 100644 --- a/core/src/test/java/org/matsim/alonso_mora/DiversionTest.java +++ b/core/src/test/java/org/matsim/alonso_mora/DiversionTest.java @@ -58,6 +58,7 @@ import org.matsim.core.mobsim.framework.MobsimTimer; import org.matsim.core.mobsim.framework.events.MobsimBeforeSimStepEvent; import org.matsim.core.mobsim.framework.listeners.MobsimBeforeSimStepListener; +import org.matsim.core.network.algorithms.NetworkCleaner; import org.matsim.core.router.DijkstraFactory; import org.matsim.core.router.costcalculators.OnlyTimeDependentTravelDisutility; import org.matsim.core.router.util.LeastCostPathCalculator; @@ -166,6 +167,14 @@ public void testRepeatedSameDestinationDiversions() { link.setLength(1000.0); network.addLink(link); } + + Node fromNode = network.getNodes().get(Id.createNodeId("n9")); + Node toNode = network.getNodes().get(Id.createNodeId("n0")); + Link link = networkFactory.createLink(Id.createLinkId("return"), fromNode, toNode); + link.setFreespeed(1e-3); + link.setCapacity(1e9); + link.setLength(1e9); + network.addLink(link); } FleetSpecification fleetSpecification = new FleetSpecificationImpl(); @@ -492,6 +501,14 @@ public void testRepeatedDiversionToDifferentDestinationRightBeforeLastLink() { link.setLength(1000.0); network.addLink(link); } + + Node fromNode = network.getNodes().get(Id.createNodeId("n10")); + Node toNode = network.getNodes().get(Id.createNodeId("n0")); + Link link = networkFactory.createLink(Id.createLinkId("return"), fromNode, toNode); + link.setFreespeed(1e-3); + link.setCapacity(1e9); + link.setLength(1e9); + network.addLink(link); } FleetSpecification fleetSpecification = new FleetSpecificationImpl(); diff --git a/glpk/src/test/java/org/matsim/alonso_mora/glpk/GlpkExamplesIT.java b/glpk/src/test/java/org/matsim/alonso_mora/glpk/GlpkExamplesIT.java index 569ca2f..009b886 100644 --- a/glpk/src/test/java/org/matsim/alonso_mora/glpk/GlpkExamplesIT.java +++ b/glpk/src/test/java/org/matsim/alonso_mora/glpk/GlpkExamplesIT.java @@ -26,6 +26,7 @@ import org.matsim.alonso_mora.MultiModeAlonsoMoraConfigGroup; import org.matsim.api.core.v01.Id; import org.matsim.api.core.v01.Scenario; +import org.matsim.contrib.common.zones.systems.grid.square.SquareGridZoneSystemParams; import org.matsim.contrib.drt.routing.DrtRoute; import org.matsim.contrib.drt.routing.DrtRouteFactory; import org.matsim.contrib.drt.run.DrtConfigGroup; @@ -67,7 +68,9 @@ public class GlpkExamplesIT { public void testRunAlonsoMoraWithGlpk() { Id.resetCaches(); URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_drt_config.xml"); - Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(), + DvrpConfigGroup dvrpConfigGroup = new DvrpConfigGroup(); + dvrpConfigGroup.getTravelTimeMatrixParams().addParameterSet(new SquareGridZoneSystemParams()); + Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), dvrpConfigGroup, new MultiModeAlonsoMoraConfigGroup(), new OTFVisConfigGroup()); AlonsoMoraConfigGroup amConfig = new AlonsoMoraConfigGroup(); diff --git a/pom.xml b/pom.xml index 970c9d9..e5ec4dc 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 21 21 - 2025.0-PR3380 + 2025.0-PR3390 5.10.1