From de7990d63b46f43a07629b9fffbbb8a451100069 Mon Sep 17 00:00:00 2001
From: GregorRyb <rybczak@vsp.tu-berlin.de>
Date: Fri, 17 May 2024 15:59:36 +0200
Subject: [PATCH 1/2] update pt and car cost

---
 .../input/metropole-ruhr-v2.0-3pct.config.xml              | 7 ++++---
 src/main/java/org/matsim/prepare/CreateSupply.java         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml b/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml
index 0c5f1de..e5fecf7 100644
--- a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml
+++ b/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml
@@ -111,10 +111,10 @@
 		<parameterset type="scoringParameters" >
 			<parameterset type="modeParams" >
 				<param name="mode" value="car" />
-				<param name="dailyMonetaryConstant" value="-5.3" />
+				<param name="dailyMonetaryConstant" value="-14.13" />
 				<param name="constant" value="0.8379675427416293" />
 				<param name="marginalUtilityOfTraveling_util_hr" value="-1.0" />
-				<param name="monetaryDistanceRate" value="-0.0002" />
+				<param name="monetaryDistanceRate" value="-0.000268" />
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="ride" />
@@ -124,7 +124,8 @@
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="pt" />
-				<param name="dailyMonetaryConstant" value="-2.15" />
+				<!-- 49 EUR Ticket  -->
+				<param name="dailyMonetaryConstant" value="-2.35" />
 				<param name="constant" value="0.07469218978843763" />
 				<param name="marginalUtilityOfTraveling_util_hr" value="-3.0" />
 			</parameterset>
diff --git a/src/main/java/org/matsim/prepare/CreateSupply.java b/src/main/java/org/matsim/prepare/CreateSupply.java
index 34c67da..cc1492f 100644
--- a/src/main/java/org/matsim/prepare/CreateSupply.java
+++ b/src/main/java/org/matsim/prepare/CreateSupply.java
@@ -69,7 +69,7 @@ public enum NetworkResolution {Low, Medium, High}
 	//private static final String gtfsDataDate2 = "2021-02-04";
 	private static final String gtfsDataDate2 = "2021-08-19";
 
-	private static final String gtfsData1Prefix = "vrr";
+	private static final String gtfsData1Prefix = "nrw";
 	//private static final String gtfsData2Prefix = "nwl";
 	private static final String gtfsData2Prefix = "fern";
 

From b456267e0c4a0df944d0274467feebb46dc06962 Mon Sep 17 00:00:00 2001
From: GregorRyb <rybczak@vsp.tu-berlin.de>
Date: Fri, 17 May 2024 17:25:08 +0200
Subject: [PATCH 2/2] update ride params and some renaming

---
 .../input/metropole-ruhr-v2.0-3pct.config.xml | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml b/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml
index e5fecf7..4337bb5 100644
--- a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml
+++ b/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0-3pct.config.xml
@@ -4,7 +4,7 @@
 	<module name="TimeAllocationMutator" >
 		<param name="mutationRange" value="7200.0" />
 	</module>
-	<module name="controler">
+	<module name="controller">
 		<param name="lastIteration" value="400"/>
 		<param name="overwriteFiles" value="deleteDirectoryIfExists"/>
 		<param name="runId" value="metropole-ruhr-v2.0-3pct"/>
@@ -38,7 +38,7 @@
 		<param name="vehiclesFile"
 			   value="./metropole-ruhr-v1.4-transitVehicles.xml.gz"/>
 	</module>
-	<module name="planscalcroute">
+	<module name="routing">
 		<param name="networkModes" value="car,ride,bike"/>
 		<parameterset type="teleportedModeParameters">
 			<param name="mode" value="walk"/>
@@ -104,39 +104,49 @@
 		<param name="analyzedModes" value="car,bike" />
 	</module>
 	<module name="vspExperimental" >
-		<param name="vspDefaultsCheckingLevel" value="warn" />
+		<param name="vspDefaultsCheckingLevel" value="abort" />
 	</module>
-	<module name="planCalcScore" >
+	<module name="
+">
 		<param name="fractionOfIterationsToStartScoreMSA" value="1.0" />
 		<parameterset type="scoringParameters" >
+			<param name="marginalUtilityOfMoney" value="1.0"/>
+			<!-- car prices 2012->2022: inflation (110.2-91.7)/91.7 = 0.2017448
+			Euro/m: 0.000124*(1+0.2017448) = 0.00014901635 -->
+			<!-- 6.0 -> inflation adjusted (2017->2022) -->
+			<param name="performing" value="6.88"/>
 			<parameterset type="modeParams" >
 				<param name="mode" value="car" />
+				<!-- see: https://docs.google.com/spreadsheets/d/1HzWpmmws1dBJuo-1Z0TnJ6-w4vD7eXBTUUEu68Hl9Q4/edit#gid=550988004  -->
 				<param name="dailyMonetaryConstant" value="-14.13" />
 				<param name="constant" value="0.8379675427416293" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-1.0" />
+				<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
 				<param name="monetaryDistanceRate" value="-0.000268" />
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="ride" />
 				<param name="constant" value="-2.2644332732845336" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-3.0" />
-				<param name="monetaryDistanceRate" value="-0.0002" />
+				<!-- alpha=2, gamma=1.0 -->
+				<!-- (alpha+gamma)*beta_performing+(alpha+1)*car_marginalUtilityOfDistance_util_m -->
+				<param name="marginalUtilityOfTraveling_util_hr" value="-20.64" />
+				<!-- alpha*car_monetaryDistanceRate -->
+				<param name="monetaryDistanceRate" value="-0.00536" />
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="pt" />
 				<!-- 49 EUR Ticket  -->
 				<param name="dailyMonetaryConstant" value="-2.35" />
 				<param name="constant" value="0.07469218978843763" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-3.0" />
+				<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="bike" />
 				<param name="constant" value="-0.1502904438227941" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-7.0" />
+				<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
 			</parameterset>
 			<parameterset type="modeParams" >
 				<param name="mode" value="walk" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-2.5" />
+				<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
 				<param name="constant" value="0.0" />
 			</parameterset>
 		</parameterset>