From 849f0149e5768df68d29c0462c9fe3a8a2af1aee Mon Sep 17 00:00:00 2001
From: rakow <rakow@vsp.tu-berlin.de>
Date: Mon, 23 Oct 2023 14:41:13 +0200
Subject: [PATCH] update config, small cleanup

---
 input/v1.2/leipzig-v1.2-25pct.config.xml      |  55 ++--
 .../leipzig-v1.2-25pct_prices2021.config.xml  | 311 ------------------
 input/v1.2/leipzig-v1.2-drt.config.xml        | 114 +++++++
 .../org/matsim/run/RunLeipzigScenario.java    |   5 +-
 4 files changed, 143 insertions(+), 342 deletions(-)
 delete mode 100644 input/v1.2/leipzig-v1.2-25pct_prices2021.config.xml
 create mode 100644 input/v1.2/leipzig-v1.2-drt.config.xml

diff --git a/input/v1.2/leipzig-v1.2-25pct.config.xml b/input/v1.2/leipzig-v1.2-25pct.config.xml
index 3125f7bd..db3dd3de 100644
--- a/input/v1.2/leipzig-v1.2-25pct.config.xml
+++ b/input/v1.2/leipzig-v1.2-25pct.config.xml
@@ -45,9 +45,9 @@
         <param name="useTransit" value="true"/>
     </module>
 
-	<module name="counts">
-		<param name="inputCountsFile" value="./leipzig-v1.2-counts-car-bast.xml.gz"/>
-	</module>
+    <module name="counts">
+        <param name="inputCountsFile" value="./leipzig-v1.2-counts-car-bast.xml.gz"/>
+    </module>
 
     <module name="planscalcroute">
         <!-- Some typical teleportation routing params are set by default, such as for walk and bike.  Setting this switch to "true" will clear them.  Note that this will also clear settings for helper modes such as for non_network_walk -->
@@ -61,12 +61,11 @@
     </module>
 
     <module name="qsim">
-		    <param name="startTime" value="00:00:00"/>
-		    <param name="endTime" value="36:00:00"/>
-		    <param name="flowCapacityFactor" value="0.25"/>
-		    <param name="mainMode" value="car,freight"/>
-		    <param name="numberOfThreads" value="8"/>
-
+        <param name="startTime" value="00:00:00"/>
+        <param name="endTime" value="36:00:00"/>
+        <param name="flowCapacityFactor" value="0.25"/>
+        <param name="mainMode" value="car,freight"/>
+        <param name="numberOfThreads" value="8"/>
         <param name="storageCapacityFactor" value="0.25"/>
         <param name="stuckTime" value="30.0"/>
         <param name="trafficDynamics" value="kinematicWaves"/>
@@ -75,24 +74,24 @@
         <param name="vehiclesSource" value="modeVehicleTypesFromVehiclesData"/>
         <param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true"/>
 
-        <param name="simEndtimeInterpretation" value="minOfEndtimeAndMobsimFinished" />
+        <param name="simEndtimeInterpretation" value="onlyUseEndtime" />
         <param name="simStarttimeInterpretation" value="onlyUseStarttime" />
     </module>
 
-	<module name="ReplanningAnnealer" >
-		<param name="activateAnnealingModule" value="true" />
-		<parameterset type="AnnealingVariable" >
-			<param name="annealParameter" value="globalInnovationRate" />
-			<param name="annealType" value="sigmoid" />
-			<param name="defaultSubpopulation" value="person" />
-			<!-- this parameter enters the exponential and sigmoid formulas. May be an iteration or a share, i.e. 0.5 for halfLife at 50% of iterations. Exponential: startValue / exp(it/halfLife) -->
-			<param name="halfLife" value="0.5" />
-			<!-- sigmoid: 1/(1+e^(shapeFactor*(it - halfLife))); geometric: startValue * shapeFactor^it; msa: startValue / it^shapeFactor -->
-			<param name="shapeFactor" value="0.01" />
-			<param name="startValue" value="0.45" />
-			<param name="endValue" value="0.01" />
-		</parameterset>
-	</module>
+    <module name="ReplanningAnnealer" >
+        <param name="activateAnnealingModule" value="true" />
+        <parameterset type="AnnealingVariable" >
+            <param name="annealParameter" value="globalInnovationRate" />
+            <param name="annealType" value="sigmoid" />
+            <param name="defaultSubpopulation" value="person" />
+            <!-- this parameter enters the exponential and sigmoid formulas. May be an iteration or a share, i.e. 0.5 for halfLife at 50% of iterations. Exponential: startValue / exp(it/halfLife) -->
+            <param name="halfLife" value="0.5" />
+            <!-- sigmoid: 1/(1+e^(shapeFactor*(it - halfLife))); geometric: startValue * shapeFactor^it; msa: startValue / it^shapeFactor -->
+            <param name="shapeFactor" value="0.01" />
+            <param name="startValue" value="0.45" />
+            <param name="endValue" value="0.01" />
+        </parameterset>
+    </module>
     <module name="strategy">
         <param name="fractionOfIterationsToDisableInnovation" value="0.9"/>
         <parameterset type="strategysettings">
@@ -115,7 +114,7 @@
             <param name="subpopulation" value="person"/>
             <param name="weight" value="0.10"/>
         </parameterset>
-		<!-- Strategies for other subpopulations are added in code -->
+        <!-- Strategies for other subpopulations are added in code -->
     </module>
 
     <module name="subtourModeChoice">
@@ -150,8 +149,8 @@
         <param name="writeExperiencedPlans" value="true"/>
 
         <parameterset type="scoringParameters">
-			<!-- Inflation adjusted  -->
-			<param name="performing" value="6.67"/>
+            <!-- Inflation adjusted  -->
+            <param name="performing" value="6.67"/>
 
             <parameterset type="modeParams">
                 <param name="constant" value="-1.4"/>
@@ -162,7 +161,7 @@
             </parameterset>
             <parameterset type="modeParams">
                 <param name="constant" value="-0.0"/>
-				<!-- #(2.0+1.0)*6+(2.0+1)*0.5 -->
+                <!-- #(2.0+1.0)*6+(2.0+1)*0.5 -->
                 <param name="marginalUtilityOfTraveling_util_hr" value="-19.5"/>
                 <param name="mode" value="ride"/>
                 <param name="monetaryDistanceRate" value="-0.0005"/>
diff --git a/input/v1.2/leipzig-v1.2-25pct_prices2021.config.xml b/input/v1.2/leipzig-v1.2-25pct_prices2021.config.xml
deleted file mode 100644
index 0bfe9fcc..00000000
--- a/input/v1.2/leipzig-v1.2-25pct_prices2021.config.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
-<config>
-    <module name="TimeAllocationMutator">
-        <param name="mutationRange" value="7200.0"/>
-    </module>
-
-    <module name="controler">
-        <param name="lastIteration" value="600"/>
-        <param name="overwriteFiles" value="failIfDirectoryExists"/>
-        <param name="runId" value="leipzig-25pct"/>
-        <param name="outputDirectory" value="./output/output-leipzig-25pct"/>
-        <param name="writeEventsInterval" value="100"/>
-        <param name="writePlansInterval" value="100"/>
-        <param name="enableLinkToLinkRouting" value="false" />
-        <param name="routingAlgorithmType" value="SpeedyALT"/>
-    </module>
-
-    <module name="global">
-        <param name="coordinateSystem" value="EPSG:25832"/>
-        <param name="insistingOnDeprecatedConfigVersion" value="false"/>
-        <param name="numberOfThreads" value="6"/>
-    </module>
-
-    <module name="network">
-        <param name="inputNetworkFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/drt-base-case/leipzig-v1.1-network-with-pt-drt.xml.gz"/>
-        <param name="laneDefinitionsFile" value="null" />
-    </module>
-
-    <module name="plans">
-        <param name="inputPlansFile"
-               value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/drt-base-case/leipzig-v1.1-25pct.plans-drt.xml.gz"/>
-        <param name="removingUnnecessaryPlanAttributes" value="true"/>
-    </module>
-
-    <module name="vehicles">
-        <param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/drt-base-case/leipzig-v1.1-vehicle-types-with-drt-scaledFleet.xml"/>
-    </module>
-
-    <module name="transit">
-        <param name="transitScheduleFile"
-               value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/drt-base-case/leipzig-v1.1-transitSchedule_intermodal.xml.gz"/>
-        <param name="vehiclesFile"
-               value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/leipzig-v1.1-transitVehicles.xml.gz"/>
-        <param name="useTransit" value="true"/>
-    </module>
-
-    <module name="planscalcroute">
-        <!-- Some typical teleportation routing params are set by default, such as for walk and bike.  Setting this switch to "true" will clear them.  Note that this will also clear settings for helper modes such as for non_network_walk -->
-        <param name="clearDefaultTeleportedModeParams" value="true" />
-        <param name="networkModes" value="car,ride,bike,freight"/>
-        <parameterset type="teleportedModeParameters">
-            <param name="beelineDistanceFactor" value="1.3"/>
-            <param name="mode" value="walk"/>
-            <param name="teleportedModeSpeed" value="1.0555556"/>
-        </parameterset>
-    </module>
-
-    <module name="qsim">
-        <param name="endTime" value="36:00:00"/>
-        <param name="flowCapacityFactor" value="0.25"/>
-        <param name="mainMode" value="car,freight"/>
-        <param name="numberOfThreads" value="8"/>
-        <param name="startTime" value="00:00:00"/>
-        <param name="storageCapacityFactor" value="0.25"/>
-        <param name="stuckTime" value="30.0"/>
-        <param name="trafficDynamics" value="kinematicWaves"/>
-        <param name="useLanes" value="false" />
-
-        <param name="vehiclesSource" value="modeVehicleTypesFromVehiclesData"/>
-        <param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true"/>
-
-        <!-- Options required for DVRP -->
-        <param name="simEndtimeInterpretation" value="onlyUseEndtime" />
-        <param name="simStarttimeInterpretation" value="onlyUseStarttime" />
-    </module>
-
-    <module name="strategy">
-        <param name="fractionOfIterationsToDisableInnovation" value="0.9"/>
-        <parameterset type="strategysettings">
-            <param name="strategyName" value="ChangeExpBeta"/>
-            <param name="subpopulation" value="person"/>
-            <param name="weight" value="0.85"/>
-        </parameterset>
-        <parameterset type="strategysettings">
-            <param name="strategyName" value="ReRoute"/>
-            <param name="subpopulation" value="person"/>
-            <param name="weight" value="0.10"/>
-        </parameterset>
-        <!-- Fade out subtour mode choice strategy -->
-        <parameterset type="strategysettings">
-            <param name="strategyName" value="SubtourModeChoice"/>
-            <param name="subpopulation" value="person"/>
-            <param name="weight" value="0.10"/>
-        </parameterset>
-        <!-- Also disabled in end phase of runs -->
-        <parameterset type="strategysettings">
-            <param name="strategyName" value="TimeAllocationMutator"/>
-            <param name="subpopulation" value="person"/>
-            <param name="weight" value="0.025"/>
-        </parameterset>
-
-        <parameterset type="strategysettings" >
-            <param name="strategyName" value="ChangeExpBeta" />
-            <param name="subpopulation" value="freight" />
-            <param name="weight" value="0.95" />
-        </parameterset>
-        <parameterset type="strategysettings" >
-            <param name="strategyName" value="ReRoute" />
-            <param name="subpopulation" value="freight" />
-            <param name="weight" value="0.05" />
-        </parameterset>
-    </module>
-
-    <module name="subtourModeChoice">
-        <param name="chainBasedModes" value="car,bike"/>
-        <param name="modes" value="car,pt,bike,walk"/>
-        <param name="considerCarAvailability" value="true"/>
-        <param name="behavior" value="betweenAllAndFewerConstraints"/>
-        <param name="probaForRandomSingleTripMode" value="0.5" />
-        <param name="coordDistance" value="50"/>
-    </module>
-
-    <module name="changeMode">
-        <param name="modes" value="car,pt,bike,walk" />
-        <param name="ignoreCarAvailability" value="false" />
-    </module>
-
-    <module name="transitRouter">
-        <param name="extensionRadius" value="500.0"/>
-    </module>
-
-    <module name="travelTimeCalculator">
-        <param name="analyzedModes" value="car,freight"/>
-
-        <param name="separateModes" value="true"/>
-
-        <!-- Needed for lane specific routing times -->
-        <param name="calculateLinkToLinkTravelTimes" value="false" />
-        <param name="calculateLinkTravelTimes" value="true" />
-    </module>
-
-    <module name="vspExperimental">
-        <param name="vspDefaultsCheckingLevel" value="abort"/>
-    </module>
-
-    <module name="planCalcScore">
-        <param name="fractionOfIterationsToStartScoreMSA" value="0.9"/>
-        <param name="writeExperiencedPlans" value="true"/>
-
-        <parameterset type="scoringParameters">
-
-            <parameterset type="modeParams">
-                <param name="constant" value="-1.4"/>
-                <param name="marginalUtilityOfTraveling_util_hr" value="-0.5"/>
-                <param name="mode" value="car"/>
-                <param name="monetaryDistanceRate" value="-0.00025"/>
-                <param name="dailyMonetaryConstant" value="-13.22"/>
-            </parameterset>
-            <parameterset type="modeParams">
-                <param name="constant" value="-0.80"/>
-                <param name="marginalUtilityOfTraveling_util_hr" value="-19.5"/>
-                <param name="mode" value="ride"/>
-                <param name="monetaryDistanceRate" value="-0.0005"/>
-                <param name="dailyMonetaryConstant" value="-0.0"/>
-            </parameterset>
-            <parameterset type="modeParams">
-                <param name="constant" value="-0.7"/>
-                <param name="dailyMonetaryConstant" value="0.0" />
-                <param name="dailyUtilityConstant" value="0.0" />
-                <param name="marginalUtilityOfDistance_util_m" value="0.0" />
-                <param name="marginalUtilityOfTraveling_util_hr" value="-2.0"/>
-                <param name="mode" value="pt"/>
-                <param name="dailyMonetaryConstant" value="-2.3"/>
-            </parameterset>
-            <parameterset type="modeParams">
-                <param name="constant" value="-1.9"/>
-                <param name="marginalUtilityOfTraveling_util_hr" value="-5.0"/>
-                <param name="mode" value="bike"/>
-            </parameterset>
-            <parameterset type="modeParams">
-                <param name="marginalUtilityOfTraveling_util_hr" value="-1.5"/>
-                <param name="mode" value="walk"/>
-            </parameterset>
-
-            <parameterset type="modeParams" >
-                <param name="marginalUtilityOfTraveling_util_hr" value="-10.0" />
-                <param name="mode" value="freight" />
-                <param name="monetaryDistanceRate" value="-0.002" />
-            </parameterset>
-
-        </parameterset>
-    </module>
-
-    <module name="transitRouter">
-        <!-- Factor with which direct walk generalized cost is multiplied before it is compared to the pt generalized cost.  Set to a very high value to reduce direct walk results. -->
-        <param name="directWalkFactor" value="1.0"/>
-        <!-- maximum beeline distance between stops that agents could transfer to by walking -->
-        <param name="maxBeelineWalkConnectionDistance" value="300.0"/>
-    </module>
-
-    <module name="dvrp" >
-        <!-- Mode of which the network will be used for throwing events and hence calculating travel times. Default is car. -->
-        <param name="mobsimMode" value="car" />
-        <!-- Mode of which the network will be used for routing vehicles, calculating travel times, etc. (fleet operator's perspective). If null, no mode filtering is done; the standard network (Scenario.getNetwork()) is used -->
-        <param name="networkModes" value="drtNorth,drtSoutheast"/>
-
-        <!-- Used for estimation of travel times for VrpOptimizer by means of the exponential moving average. The weighting decrease, alpha, must be in (0,1]. We suggest small values of alpha, e.g. 0.05. The averaging starts from the initial travel time estimates. If not provided, the free-speed TTs is used as the initial estimates For more info see comments in: VrpTravelTimeEstimator, VrpTravelTimeModules, DvrpModule. -->
-        <param name="travelTimeEstimationAlpha" value="0.05" />
-        <parameterset type="travelTimeMatrix">
-            <param name="cellSize" value="200"/>
-        </parameterset>
-    </module>
-
-    <module name="multiModeDrt">
-        <parameterset type="drt">
-            <param name="mode" value="drtNorth"/>
-            <parameterset type="ExtensiveInsertionSearch"/>
-            <!-- If true, the startLink is changed to last link in the current schedule, so the taxi starts the next day at the link where it stopped operating the day before. False by default. -->
-            <param name="changeStartLinkToLastLinkInSchedule" value="false"/>
-            <!-- Defines the slope of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Alpha should not be smaller than 1. -->
-            <param name="maxTravelTimeAlpha" value="1.5"/>
-            <!-- Defines the shift of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Beta should not be smaller than 0. -->
-            <param name="maxTravelTimeBeta" value="1200.0"/>
-            <!-- Max wait time for the bus to come (optimisation constraint). -->
-            <param name="maxWaitTime" value="1200.0"/>
-            <!-- Maximum walk distance to next stop location in stationbased system. -->
-            <param name="maxWalkDistance" value="1500.0"/>
-
-            <!-- Operational Scheme, either door2door or stopbased. door2door by default -->
-            <!-- As long as there is no stops-file we have to keep it door2door or serviceAreBased -->
-            <param name="operationalScheme" value="stopbased"/>
-            <!-- If true, the max travel and wait times of a submitted request are considered hard constraints (the request gets rejected if one of the constraints is violated). If false, the max travel and wait times are considered soft constraints (insertion of a request that violates one of the constraints is allowed, but its cost is increased by additional penalty to make it relatively less attractive). Penalisation of insertions can be customised by injecting a customised InsertionCostCalculator.PenaltyCalculator -->
-            <param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false" />
-
-            <!-- allows to configure a service area per drt mode. Used with serviceArea Operational Scheme -->
-            <!-- <param name="drtServiceAreaShapeFile" value="drtServiceArea/preliminary-serviceArea-leipzig-utm32n.shp"/> -->
-
-            <!-- Bus stop duration. -->
-            <param name="stopDuration" value="60.0"/>
-
-            <!-- Stop locations file (transit schedule format, but without lines) for DRT stops. Used only for the stopbased mode -->
-            <param name="transitStopFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/drt-base-case/leipzig-v1.1-drt-stops-north.xml"/>
-            <!-- Limit the operation of vehicles to links (of the 'dvrp_routing' network) with 'allowedModes' containing this 'mode'. For backward compatibility, the value is set to false by default - this means that the vehicles are allowed to operate on all links of the 'dvrp_routing' network. The 'dvrp_routing' is defined by DvrpConfigGroup.networkModes) -->
-            <param name="useModeFilteredSubnetwork" value="true" />
-
-            <!-- Writes out detailed DRT customer stats in each iteration. True by default. -->
-            <param name="writeDetailedCustomerStats" value="true"/>
-
-            <!-- <parameterset type="zonalSystem">
-                <param name="zonesGeneration" value="ShapeFile"/>
-                <param name="zonesShapeFile" value="drtServiceArea/serviceArea-leipzig-utm32n.shp" />
-            </parameterset>
-
-            <parameterset type="rebalancing">
-                <parameterset type="minCostFlowRebalancingStrategy">
-                    <param name="targetAlpha" value="0.5"/>
-                    <param name="targetBeta" value="0.5"/>
-                </parameterset>
-            </parameterset> -->
-        </parameterset>
-        <parameterset type="drt">
-            <param name="mode" value="drtSoutheast"/>
-            <parameterset type="ExtensiveInsertionSearch"/>
-            <!-- If true, the startLink is changed to last link in the current schedule, so the taxi starts the next day at the link where it stopped operating the day before. False by default. -->
-            <param name="changeStartLinkToLastLinkInSchedule" value="false"/>
-            <!-- Defines the slope of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Alpha should not be smaller than 1. -->
-            <param name="maxTravelTimeAlpha" value="1.5"/>
-            <!-- Defines the shift of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Beta should not be smaller than 0. -->
-            <param name="maxTravelTimeBeta" value="1200.0"/>
-            <!-- Max wait time for the bus to come (optimisation constraint). -->
-            <param name="maxWaitTime" value="1200.0"/>
-            <!-- Maximum walk distance to next stop location in stationbased system. -->
-            <param name="maxWalkDistance" value="1500.0"/>
-
-            <!-- Operational Scheme, either door2door or stopbased. door2door by default -->
-            <!-- As long as there is no stops-file we have to keep it door2door or serviceAreBased -->
-            <param name="operationalScheme" value="stopbased"/>
-            <!-- If true, the max travel and wait times of a submitted request are considered hard constraints (the request gets rejected if one of the constraints is violated). If false, the max travel and wait times are considered soft constraints (insertion of a request that violates one of the constraints is allowed, but its cost is increased by additional penalty to make it relatively less attractive). Penalisation of insertions can be customised by injecting a customised InsertionCostCalculator.PenaltyCalculator -->
-            <param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false" />
-
-            <!-- allows to configure a service area per drt mode. Used with serviceArea Operational Scheme -->
-            <!-- <param name="drtServiceAreaShapeFile" value="drtServiceArea/preliminary-serviceArea-leipzig-utm32n.shp"/> -->
-
-            <!-- Bus stop duration. -->
-            <param name="stopDuration" value="60.0"/>
-
-            <!-- Stop locations file (transit schedule format, but without lines) for DRT stops. Used only for the stopbased mode -->
-            <param name="transitStopFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/drt-base-case/leipzig-v1.1-drt-stops-southeast.xml"/>
-            <!-- Limit the operation of vehicles to links (of the 'dvrp_routing' network) with 'allowedModes' containing this 'mode'. For backward compatibility, the value is set to false by default - this means that the vehicles are allowed to operate on all links of the 'dvrp_routing' network. The 'dvrp_routing' is defined by DvrpConfigGroup.networkModes) -->
-            <param name="useModeFilteredSubnetwork" value="true" />
-
-            <!-- Writes out detailed DRT customer stats in each iteration. True by default. -->
-            <param name="writeDetailedCustomerStats" value="true"/>
-
-            <!-- <parameterset type="zonalSystem">
-                <param name="zonesGeneration" value="ShapeFile"/>
-                <param name="zonesShapeFile" value="drtServiceArea/serviceArea-leipzig-utm32n.shp" />
-            </parameterset>
-
-            <parameterset type="rebalancing">
-                <parameterset type="minCostFlowRebalancingStrategy">
-                    <param name="targetAlpha" value="0.5"/>
-                    <param name="targetBeta" value="0.5"/>
-                </parameterset>
-            </parameterset> -->
-        </parameterset>
-
-    </module>
-
-</config>
diff --git a/input/v1.2/leipzig-v1.2-drt.config.xml b/input/v1.2/leipzig-v1.2-drt.config.xml
new file mode 100644
index 00000000..f003057a
--- /dev/null
+++ b/input/v1.2/leipzig-v1.2-drt.config.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
+<config>
+
+	<module name="dvrp">
+		<!-- Mode of which the network will be used for throwing events and hence calculating travel times. Default is car. -->
+		<param name="mobsimMode" value="car"/>
+		<!-- Mode of which the network will be used for routing vehicles, calculating travel times, etc. (fleet operator's perspective). If null, no mode filtering is done; the standard network (Scenario.getNetwork()) is used -->
+		<param name="networkModes" value="drtNorth,drtSoutheast"/>
+
+		<!-- Used for estimation of travel times for VrpOptimizer by means of the exponential moving average. The weighting decrease, alpha, must be in (0,1]. We suggest small values of alpha, e.g. 0.05. The averaging starts from the initial travel time estimates. If not provided, the free-speed TTs is used as the initial estimates For more info see comments in: VrpTravelTimeEstimator, VrpTravelTimeModules, DvrpModule. -->
+		<param name="travelTimeEstimationAlpha" value="0.05"/>
+		<parameterset type="travelTimeMatrix">
+			<param name="cellSize" value="200"/>
+		</parameterset>
+	</module>
+
+	<module name="multiModeDrt">
+		<parameterset type="drt">
+			<param name="mode" value="drtNorth"/>
+			<parameterset type="ExtensiveInsertionSearch"/>
+			<!-- If true, the startLink is changed to last link in the current schedule, so the taxi starts the next day at the link where it stopped operating the day before. False by default. -->
+			<param name="changeStartLinkToLastLinkInSchedule" value="false"/>
+			<!-- Defines the slope of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Alpha should not be smaller than 1. -->
+			<param name="maxTravelTimeAlpha" value="1.5"/>
+			<!-- Defines the shift of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Beta should not be smaller than 0. -->
+			<param name="maxTravelTimeBeta" value="1200.0"/>
+			<!-- Max wait time for the bus to come (optimisation constraint). -->
+			<param name="maxWaitTime" value="1200.0"/>
+			<!-- Maximum walk distance to next stop location in stationbased system. -->
+			<param name="maxWalkDistance" value="1500.0"/>
+
+			<!-- Operational Scheme, either door2door or stopbased. door2door by default -->
+			<!-- As long as there is no stops-file we have to keep it door2door or serviceAreBased -->
+			<param name="operationalScheme" value="stopbased"/>
+			<!-- If true, the max travel and wait times of a submitted request are considered hard constraints (the request gets rejected if one of the constraints is violated). If false, the max travel and wait times are considered soft constraints (insertion of a request that violates one of the constraints is allowed, but its cost is increased by additional penalty to make it relatively less attractive). Penalisation of insertions can be customised by injecting a customised InsertionCostCalculator.PenaltyCalculator -->
+			<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
+
+			<!-- allows to configure a service area per drt mode. Used with serviceArea Operational Scheme -->
+			<!-- <param name="drtServiceAreaShapeFile" value="drtServiceArea/preliminary-serviceArea-leipzig-utm32n.shp"/> -->
+
+			<!-- Bus stop duration. -->
+			<param name="stopDuration" value="60.0"/>
+
+			<!-- Stop locations file (transit schedule format, but without lines) for DRT stops. Used only for the stopbased mode -->
+			<param name="transitStopFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/drt-base-case/leipzig-v1.1-drt-stops-north.xml"/>
+			<!-- Limit the operation of vehicles to links (of the 'dvrp_routing' network) with 'allowedModes' containing this 'mode'. For backward compatibility, the value is set to false by default - this means that the vehicles are allowed to operate on all links of the 'dvrp_routing' network. The 'dvrp_routing' is defined by DvrpConfigGroup.networkModes) -->
+			<param name="useModeFilteredSubnetwork" value="true"/>
+
+			<!-- Writes out detailed DRT customer stats in each iteration. True by default. -->
+			<param name="writeDetailedCustomerStats" value="true"/>
+
+			<!-- <parameterset type="zonalSystem">
+				<param name="zonesGeneration" value="ShapeFile"/>
+				<param name="zonesShapeFile" value="drtServiceArea/serviceArea-leipzig-utm32n.shp" />
+			</parameterset>
+
+			<parameterset type="rebalancing">
+				<parameterset type="minCostFlowRebalancingStrategy">
+					<param name="targetAlpha" value="0.5"/>
+					<param name="targetBeta" value="0.5"/>
+				</parameterset>
+			</parameterset> -->
+		</parameterset>
+		<parameterset type="drt">
+			<param name="mode" value="drtSoutheast"/>
+			<parameterset type="ExtensiveInsertionSearch"/>
+			<!-- If true, the startLink is changed to last link in the current schedule, so the taxi starts the next day at the link where it stopped operating the day before. False by default. -->
+			<param name="changeStartLinkToLastLinkInSchedule" value="false"/>
+			<!-- Defines the slope of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Alpha should not be smaller than 1. -->
+			<param name="maxTravelTimeAlpha" value="1.5"/>
+			<!-- Defines the shift of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Beta should not be smaller than 0. -->
+			<param name="maxTravelTimeBeta" value="1200.0"/>
+			<!-- Max wait time for the bus to come (optimisation constraint). -->
+			<param name="maxWaitTime" value="1200.0"/>
+			<!-- Maximum walk distance to next stop location in stationbased system. -->
+			<param name="maxWalkDistance" value="1500.0"/>
+
+			<!-- Operational Scheme, either door2door or stopbased. door2door by default -->
+			<!-- As long as there is no stops-file we have to keep it door2door or serviceAreBased -->
+			<param name="operationalScheme" value="stopbased"/>
+			<!-- If true, the max travel and wait times of a submitted request are considered hard constraints (the request gets rejected if one of the constraints is violated). If false, the max travel and wait times are considered soft constraints (insertion of a request that violates one of the constraints is allowed, but its cost is increased by additional penalty to make it relatively less attractive). Penalisation of insertions can be customised by injecting a customised InsertionCostCalculator.PenaltyCalculator -->
+			<param name="rejectRequestIfMaxWaitOrTravelTimeViolated" value="false"/>
+
+			<!-- allows to configure a service area per drt mode. Used with serviceArea Operational Scheme -->
+			<!-- <param name="drtServiceAreaShapeFile" value="drtServiceArea/preliminary-serviceArea-leipzig-utm32n.shp"/> -->
+
+			<!-- Bus stop duration. -->
+			<param name="stopDuration" value="60.0"/>
+
+			<!-- Stop locations file (transit schedule format, but without lines) for DRT stops. Used only for the stopbased mode -->
+			<param name="transitStopFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.1/input/drt-base-case/leipzig-v1.1-drt-stops-southeast.xml"/>
+			<!-- Limit the operation of vehicles to links (of the 'dvrp_routing' network) with 'allowedModes' containing this 'mode'. For backward compatibility, the value is set to false by default - this means that the vehicles are allowed to operate on all links of the 'dvrp_routing' network. The 'dvrp_routing' is defined by DvrpConfigGroup.networkModes) -->
+			<param name="useModeFilteredSubnetwork" value="true"/>
+
+			<!-- Writes out detailed DRT customer stats in each iteration. True by default. -->
+			<param name="writeDetailedCustomerStats" value="true"/>
+
+			<!-- <parameterset type="zonalSystem">
+				<param name="zonesGeneration" value="ShapeFile"/>
+				<param name="zonesShapeFile" value="drtServiceArea/serviceArea-leipzig-utm32n.shp" />
+			</parameterset>
+
+			<parameterset type="rebalancing">
+				<parameterset type="minCostFlowRebalancingStrategy">
+					<param name="targetAlpha" value="0.5"/>
+					<param name="targetBeta" value="0.5"/>
+				</parameterset>
+			</parameterset> -->
+		</parameterset>
+
+	</module>
+
+</config>
diff --git a/src/main/java/org/matsim/run/RunLeipzigScenario.java b/src/main/java/org/matsim/run/RunLeipzigScenario.java
index 76daa053..f3583be0 100644
--- a/src/main/java/org/matsim/run/RunLeipzigScenario.java
+++ b/src/main/java/org/matsim/run/RunLeipzigScenario.java
@@ -203,7 +203,7 @@ protected Config prepareConfig(Config config) {
 		// We need to use coordinates only, otherwise subtour constraints will be violated by the parking re-routing, because it may change link/facility ids
 		config.facilities().setFacilitiesSource(FacilitiesConfigGroup.FacilitiesSource.none);
 
-		switch ((bike)) {
+		switch (bike) {
 			case onNetworkWithStandardMatsim -> {
 				// bike is routed on the network per the xml config.
 
@@ -259,7 +259,7 @@ protected Config prepareConfig(Config config) {
 				}
 			}
 
-			default -> throw new IllegalStateException("Unexpected value: " + (bike));
+			default -> throw new IllegalStateException("Unexpected value: " + bike);
 		}
 
 		if (networkOpt.hasParkingCostArea()) {
@@ -296,7 +296,6 @@ protected void prepareControler(Controler controler) {
 			@Override
 			public void install() {
 				install(new LeipzigPtFareModule());
-				install(new SwissRailRaptorModule());
 
 				addTravelTimeBinding(TransportMode.ride).to(networkTravelTime());
 				addTravelDisutilityFactoryBinding(TransportMode.ride).to(carTravelDisutilityFactoryKey());