update RunKelheimScenario to allow pt to work

matsim-scenarios · May 23, 2024 · 95133fd · 95133fd
1 parent 48ca6e7
commit 95133fd
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/src/main/java/org/matsim/run/RunKelheimScenario.java b/src/main/java/org/matsim/run/RunKelheimScenario.java
@@ -1,5 +1,6 @@
 package org.matsim.run;
 
+import ch.sbb.matsim.config.SwissRailRaptorConfigGroup;
 import ch.sbb.matsim.routing.pt.raptor.SwissRailRaptorModule;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
@@ -167,9 +168,6 @@ protected Config prepareConfig(Config config) {
 		config.controller().setLastIteration(0);
 
 		// stuff needed for accessibility
-
-
-
 		SnzActivities.addScoringParams(config);
 
 		config.controller().setOutputDirectory(sample.adjustName(config.controller().getOutputDirectory()));
@@ -198,9 +196,6 @@ protected Config prepareConfig(Config config) {
 
 		if (drt) {
 
-			// yyyyyyy added to avoid following error "java.lang.RuntimeException: DynAgents require simulation to start from the very beginning. Set 'QSim.simStarttimeInterpretation' to onlyUseStarttime" -JR May'24
-			config.qsim().setSimStarttimeInterpretation(QSimConfigGroup.StarttimeInterpretation.onlyUseStarttime);
-
 			config.addModule(new MultiModeDrtConfigGroup(DrtWithExtensionsConfigGroup::new));
 
 			MultiModeDrtConfigGroup multiModeDrtConfig = ConfigUtils.addOrGetModule(config, MultiModeDrtConfigGroup.class);
@@ -219,6 +214,14 @@ protected Config prepareConfig(Config config) {
 
 		if (acc) {
 
+			// yyyyyyy TODO: added to avoid following error "java.lang.RuntimeException: DynAgents require simulation to start from the very beginning. Set 'QSim.simStarttimeInterpretation' to onlyUseStarttime" -JR May'24
+			config.qsim().setSimStarttimeInterpretation(QSimConfigGroup.StarttimeInterpretation.onlyUseStarttime);
+
+
+			// yyyyyyy TODO: had to turn off intermodal pt access/egress because "= this.routingModules.get(mode) = null" in DefaultRaptorStopFinder. No drt router present...
+			SwissRailRaptorConfigGroup swissRailRaptorConfigGroup = ConfigUtils.addOrGetModule(config, SwissRailRaptorConfigGroup.class);
+			swissRailRaptorConfigGroup.setUseIntermodalAccessEgress(false);
+
 			MultiModeDrtConfigGroup multiModeDrtConfig = ConfigUtils.addOrGetModule(config, MultiModeDrtConfigGroup.class);
 			for (DrtConfigGroup drtConfigGroup : multiModeDrtConfig.getModalElements()) {
 				//TODO: temp, allow accessibility computations to occur more than 1.5km away from drt stops.
@@ -249,11 +252,11 @@ protected Config prepareConfig(Config config) {
 			accConfig.setBoundingBoxBottom(mapCenterY - num_rows*tileSize - tileSize/2);
 			accConfig.setBoundingBoxTop(mapCenterY + num_rows*tileSize + tileSize/2);
 			accConfig.setTileSize_m((int) tileSize);
-			accConfig.setTimeOfDay(14 * 60 * 60.);
-			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.freespeed, true); // works
-			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.car, true); // works
+			accConfig.setTimeOfDay(15.5 * 60 * 60.);
+			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.freespeed, false); // works
+			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.car, false); // works
 //			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.bike, false); // ??
-//			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.pt, true); // doesn't work
+			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.pt, true); // works
 			accConfig.setComputingAccessibilityForMode(Modes4Accessibility.estimatedDrt, true); // works
 		}