chore: update to matsim pr 3390

matsim-org · Sep 10, 2024 · 78ab7a1 · 78ab7a1
1 parent d064e8b
commit 78ab7a1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 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
@@ -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
@@ -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
@@ -20,7 +20,7 @@
 	<properties>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
-		<matsim.version>2025.0-PR3380</matsim.version>
+		<matsim.version>2025.0-PR3390</matsim.version>
 		<junit.version>5.10.1</junit.version>
 	</properties>