automatically set ride scoring params based on car params, update mat…

…sim-libs for that
matsim-scenarios · Aug 16, 2024 · 7ea07ac · 7ea07ac
1 parent c308161
commit 7ea07ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>matsim-all</artifactId>
 
 		<!-- PR-labelled release -->
-		<version>2025.0-PR3402</version>
+		<version>2025.0-PR3410</version>
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
 <!--		<version>2025.0-SNAPSHOT</version>-->

diff --git a/src/main/java/org/matsim/run/OpenBerlinScenario.java b/src/main/java/org/matsim/run/OpenBerlinScenario.java
@@ -6,6 +6,7 @@
 import org.matsim.api.core.v01.TransportMode;
 import org.matsim.application.MATSimApplication;
 import org.matsim.application.options.SampleOptions;
+import org.matsim.contrib.vsp.scoring.RideScoringParamsFromCarParams;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.ReplanningConfigGroup;
@@ -59,6 +60,8 @@ protected Config prepareConfig(Config config) {
 			config.plans().setInputFile(sample.adjustName(config.plans().getInputFile()));
 		}
 
+		// overwrite ride scoring params with values derived from car
+		RideScoringParamsFromCarParams.setRideScoringParamsBasedOnCarParams(config.scoring(), 1.0);
 		Activities.addScoringParams(config, true);
 
 		// Required for all calibration strategies