preparing release config

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file. 
 
-### 6.4 (2024-12)
+### 6.4 (2025-01)
 - Improved facility locations
   - OSM tag filtering has been improved to reduce number of wrongly assigned facility types
 - Update work location assignment within Berlin
@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file.
   - Bikes are not simulated on the network, and no link events generated yet. This will likely be added in future versions.
   - The road network includes bike infrastructure and corresponding attributes
   - The bike infrastructure is not fully complete yet, and has to be carefully evaluated first for bike centric studies
-  - The avg. bike speed has been set to match Srv2018 survey data (~10.3 km/h)
+  - The avg. bike speed has been set to match SrV2018 survey data (~10.3 km/h)
 - New dashboards 
   - PT Transit viewer
   - Emissions

Makefile

@@ -329,13 +329,18 @@ $p/berlin-$V-25pct.plans-initial.xml.gz: $p/berlin-$V-facilities.xml.gz $p/berli
 
 $p/berlin-$V-10pct.plans.xml.gz:
 	$(sc) prepare clean-population\
-	 --plans mode-choice-10pct-default-v2/runs/008/008.output_plans.xml.gz\
+	 --plans mode-choice-10pct-baseline/runs/008/008.output_plans.xml.gz\
 	 --remove-unselected-plans\
 	 --output $@
 
 	$(sc) prepare downsample-population $@\
 		--sample-size 0.1\
-		--samples 0.03 0.01 0.001\
+		--samples 0.01 0.001\
+
+	$(sc) prepare clean-population\
+	 	--plans choice-experiments/baseline/runs/008/008.output_plans.xml.gz\
+	 	--remove-unselected-plans\
+	 	--output $(subst 10pct,3pct,$@)
 
 
 $p/berlin-$V.drt-by-rndLocations-10000vehicles-4seats.xml.gz: $p/berlin-$V-network.xml.gz

input/v6.4/berlin-v6.4.config.xml

@@ -20,23 +20,23 @@
 		<param name="numberOfThreads" value="16"/>
 	</module>
 	<module name="network">
-		<param name="inputNetworkFile" value="./berlin-v6.4-network-with-pt.xml.gz"/>
+		<param name="inputNetworkFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.4/input/berlin-v6.4-network-with-pt.xml.gz"/>
 	</module>
 	<module name="plans">
-		<param name="inputPlansFile" value="./berlin-v6.4-10pct.plans-initial.xml.gz"/>
+		<param name="inputPlansFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.4/input/berlin-v6.4-10pct.plans.xml.gz"/>
 		<param name="removingUnnecessaryPlanAttributes" value="true"/>
 	</module>
 	<module name="vehicles">
-		<param name="vehiclesFile" value="./berlin-v6.4-vehicleTypes.xml"/>
+		<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.4/input/berlin-v6.4-vehicleTypes.xml"/>
 	</module>
 	<module name="transit">
-		<param name="transitScheduleFile" value="./berlin-v6.4-transitSchedule.xml.gz"/>
+		<param name="transitScheduleFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.4/input/berlin-v6.4-transitSchedule.xml.gz"/>
 		<param name="useTransit" value="true"/>
-		<param name="vehiclesFile" value="./berlin-v6.4-transitVehicles.xml.gz"/>
+		<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.4/input/berlin-v6.4-transitVehicles.xml.gz"/>
 	</module>
 	<module name="facilities">
 		<param name="facilitiesSource" value="fromFile"/>
-		<param name="inputFacilitiesFile" value="./berlin-v6.4-facilities.xml.gz"/>
+		<param name="inputFacilitiesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.4/input/berlin-v6.4-facilities.xml.gz"/>
 	</module>
 	<module name="routing">
 		<param name="networkModes" value="car,truck,freight,ride,bike"/>
@@ -114,7 +114,7 @@
 			<param name="performing" value="6.88"/>
 
 			<parameterset type="modeParams">
-				<param name="constant" value="-0.5341414592094356" />
+				<param name="constant" value="-0.487593225702316" />
 				<!-- result of the calibration, lower than full vehicle ownership cost which gave too unattractive car mode in calibration -->
 				<param name="dailyMonetaryConstant" value="-5.0" />
 				<param name="dailyUtilityConstant" value="0" />
@@ -125,7 +125,7 @@
 				<param name="mode" value="car" />
 			</parameterset>
 			<parameterset type="modeParams">
-				<param name="constant" value="-1.239769570936421" />
+				<param name="constant" value="-1.153972863285258" />
 				<param name="dailyMonetaryConstant" value="0.0" />
 				<param name="dailyUtilityConstant" value="0.0" />
 				<param name="marginalUtilityOfDistance_util_m" value="0.0" />
@@ -137,7 +137,7 @@
 				<param name="mode" value="ride" />
 			</parameterset>
 			<parameterset type="modeParams">
-				<param name="constant" value="0.3971116779265561" />
+				<param name="constant" value="0.43220302370275404" />
 				<!-- 2022: 4-trips AB 10Euro -> 2.5 Eu/trip. yearly 761 Eu / 250 days = 3.04 Eu/day -->
 				<param name="dailyMonetaryConstant" value="-3.0" />
 				<param name="dailyUtilityConstant" value="0.0" />
@@ -147,7 +147,7 @@
 				<param name="mode" value="pt" />
 			</parameterset>
 			<parameterset type="modeParams">
-				<param name="constant" value="-1.3538876325441798" />
+				<param name="constant" value="-0.8720995248245994" />
 				<param name="dailyMonetaryConstant" value="0.0" />
 				<param name="dailyUtilityConstant" value="0.0" />
 				<param name="marginalUtilityOfDistance_util_m" value="0.0" />

pom.xml

@@ -6,7 +6,7 @@
 		<artifactId>matsim-all</artifactId>
 
 		<!-- PR-labelled release -->
-		<version>2025.0-PR3544</version>
+		<version>2025.0-PR3648</version>
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
 <!--		<version>2025.0-SNAPSHOT</version>-->

src/main/java/org/matsim/dashboard/BerlinDashboardProvider.java

@@ -7,10 +7,7 @@
 import org.matsim.simwrapper.Dashboard;
 import org.matsim.simwrapper.DashboardProvider;
 import org.matsim.simwrapper.SimWrapper;
-import org.matsim.simwrapper.dashboard.EmissionsDashboard;
-import org.matsim.simwrapper.dashboard.TrafficCountsDashboard;
-import org.matsim.simwrapper.dashboard.TravelTimeComparisonDashboard;
-import org.matsim.simwrapper.dashboard.TripDashboard;
+import org.matsim.simwrapper.dashboard.*;
 
 import java.util.List;
 import java.util.Set;
@@ -32,6 +29,7 @@ public List<Dashboard> getDashboards(Config config, SimWrapper simWrapper) {
 			trips,
 			new TravelTimeComparisonDashboard(ApplicationUtils.resolve(config.getContext(), "berlin-v" + OpenBerlinScenario.VERSION + "-routes-ref.csv.gz")),
 			new EmissionsDashboard(config.global().getCoordinateSystem()),
+			new NoiseDashboard(config.global().getCoordinateSystem()),
 			new TrafficCountsDashboard()
 				.withModes(TransportMode.car, Set.of(TransportMode.car))
 				.withModes(TransportMode.truck, Set.of(TransportMode.truck, "freight"))

src/main/java/org/matsim/run/policies/OpenBerlinChoiceExperiment.java

@@ -10,6 +10,7 @@
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.ReplanningConfigGroup;
+import org.matsim.core.config.groups.VspExperimentalConfigGroup;
 import org.matsim.core.controler.Controler;
 import org.matsim.core.replanning.choosers.BalancedInnovationStrategyChooser;
 import org.matsim.core.replanning.strategies.DefaultPlanStrategiesModule;
@@ -102,6 +103,9 @@ protected Config prepareConfig(Config config) {
 				DefaultPlanStrategiesModule.DefaultSelector.BestScore
 			);
 
+			// Best score requires disabling consistency checking
+			config.vspExperimental().setVspDefaultsCheckingLevel(VspExperimentalConfigGroup.VspDefaultsCheckingLevel.warn);
+
 			// Experiments are without time mutation
 			removeStrategy(config, DefaultPlanStrategiesModule.DefaultStrategy.TimeAllocationMutator);