Skip to content

Commit

Permalink
Merge pull request #67 from matsim-scenarios/3.1
Browse files Browse the repository at this point in the history
MATSim update
  • Loading branch information
rakow authored Nov 28, 2023
2 parents 190717f + e22ebd1 commit 3b6618e
Show file tree
Hide file tree
Showing 14 changed files with 629 additions and 54 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

V := v3.0
V := v3.1
CRS := EPSG:25832

MEMORY ?= 20G
Expand Down
12 changes: 6 additions & 6 deletions input/test.config.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
<config>
<module name="TimeAllocationMutator">
<module name="timeAllocationMutator">
<param name="mutationRange" value="7200.0"/>
</module>

<module name="controler">
<module name="controller">
<param name="lastIteration" value="1"/>
<param name="overwriteFiles" value="deleteDirectoryIfExists"/>
<param name="runId" value="kelheim"/>
Expand Down Expand Up @@ -43,7 +43,7 @@
<param name="useTransit" value="true"/>
</module>

<module name="planscalcroute">
<module name="routing">
<param name="networkModes" value="car,ride,freight"/>
<parameterset type="teleportedModeParameters">
<param name="beelineDistanceFactor" value="1.3"/>
Expand Down Expand Up @@ -73,7 +73,7 @@
<param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true"/>
</module>

<module name="ReplanningAnnealer" >
<module name="replanningAnnealer" >
<param name="activateAnnealingModule" value="true" />
<parameterset type="AnnealingVariable" >
<param name="annealParameter" value="globalInnovationRate" />
Expand All @@ -87,7 +87,7 @@
<param name="endValue" value="0.01" />
</parameterset>
</module>
<module name="strategy">
<module name="replanning">
<param name="fractionOfIterationsToDisableInnovation" value="0.9"/>
<parameterset type="strategysettings">
<param name="strategyName" value="ChangeExpBeta"/>
Expand Down Expand Up @@ -157,7 +157,7 @@
<param name="vspDefaultsCheckingLevel" value="abort"/>
</module>

<module name="planCalcScore">
<module name="scoring">
<param name="fractionOfIterationsToStartScoreMSA" value="0.9"/>
<param name="writeExperiencedPlans" value="true"/>

Expand Down
12 changes: 6 additions & 6 deletions input/test.with-drt.config.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
<config>
<module name="TimeAllocationMutator">
<module name="timeAllocationMutator">
<param name="mutationRange" value="7200.0"/>
</module>

<module name="controler">
<module name="controller">
<param name="lastIteration" value="1"/>
<param name="overwriteFiles" value="deleteDirectoryIfExists"/>
<param name="runId" value="kelheim"/>
Expand Down Expand Up @@ -42,7 +42,7 @@
<param name="useTransit" value="true"/>
</module>

<module name="planscalcroute">
<module name="routing">
<param name="networkModes" value="car,ride,freight"/>
<parameterset type="teleportedModeParameters">
<param name="beelineDistanceFactor" value="1.3"/>
Expand Down Expand Up @@ -72,7 +72,7 @@
<param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true"/>
</module>

<module name="ReplanningAnnealer" >
<module name="replanningAnnealer" >
<param name="activateAnnealingModule" value="true" />
<parameterset type="AnnealingVariable" >
<param name="annealParameter" value="globalInnovationRate" />
Expand All @@ -86,7 +86,7 @@
<param name="endValue" value="0.01" />
</parameterset>
</module>
<module name="strategy">
<module name="replanning">
<param name="fractionOfIterationsToDisableInnovation" value="0.9"/>
<parameterset type="strategysettings">
<param name="strategyName" value="ChangeExpBeta"/>
Expand Down Expand Up @@ -156,7 +156,7 @@
<param name="vspDefaultsCheckingLevel" value="abort"/>
</module>

<module name="planCalcScore">
<module name="scoring">
<param name="fractionOfIterationsToStartScoreMSA" value="0.9"/>
<param name="writeExperiencedPlans" value="true"/>

Expand Down
343 changes: 343 additions & 0 deletions input/v3.1/kelheim-v3.1-25pct.kexi.config.xml

Large diffs are not rendered by default.

234 changes: 234 additions & 0 deletions input/v3.1/kelheim-v3.1-config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
<?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="controller">
<param name="lastIteration" value="1000"/>
<param name="overwriteFiles" value="failIfDirectoryExists"/>
<param name="runId" value="kelheim-v3.1-25pct"/>
<param name="outputDirectory" value="./output/output-kelheim-v3.1-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/kelheim/kelheim-v3.0/input/kelheim-v3.0-network-with-pt.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/kelheim/kelheim-v3.0/input/kelheim-v3.0-25pct-plans.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/kelheim/kelheim-v3.0/input/kelheim-v3.0-vehicle-types.xml"/>
</module>


<module name="transit">
<param name="transitScheduleFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/kelheim/kelheim-v3.0/input/kelheim-v3.0-transitSchedule.xml.gz"/>
<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/kelheim/kelheim-v3.0/input/kelheim-v3.0-transitVehicles.xml.gz"/>
<param name="useTransit" value="true"/>
</module>

<module name="routing">
<param name="networkModes" value="car,ride,freight"/>
<parameterset type="teleportedModeParameters">
<param name="beelineDistanceFactor" value="1.3"/>
<param name="mode" value="walk"/>
<param name="teleportedModeSpeed" value="1.0555556"/>
</parameterset>
<parameterset type="teleportedModeParameters">
<param name="beelineDistanceFactor" value="1.3"/>
<param name="mode" value="bike"/>
<param name="teleportedModeSpeed" value="3.1388889"/>
</parameterset>
</module>

<module name="qsim">
<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="storageCapacityFactor" value="0.25"/>
<param name="stuckTime" value="30.0"/>
<param name="trafficDynamics" value="kinematicWaves"/>
<param name="linkDynamics" value="FIFO"/>
<param name="useLanes" value="false"/>

<param name="vehiclesSource" value="modeVehicleTypesFromVehiclesData"/>
<param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true"/>
</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.6" />
<param name="endValue" value="0.01" />
</parameterset>
</module>
<module name="replanning">
<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>
<parameterset type="strategysettings">
<param name="strategyName" value="SubtourModeChoice"/>
<param name="subpopulation" value="person"/>
<param name="weight" value="0.10"/>
</parameterset>
<parameterset type="strategysettings">
<param name="strategyName" value="TimeAllocationMutator"/>
<param name="subpopulation" value="person"/>
<param name="weight" value="0.10"/>
</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,ride"/>
<param name="considerCarAvailability" value="true"/>
<param name="behavior" value="betweenAllAndFewerConstraints"/>
<param name="probaForRandomSingleTripMode" value="0.5"/>
<param name="coordDistance" value="100"/>
</module>

<!--
<module name="informedModeChoice">
<param name="modes" value="car,ride,pt,bike,walk"/>
<param name="topK" value="5"/>
</module>
-->

<module name="transitRouter">
<param name="extensionRadius" value="500.0"/>
</module>

<module name="travelTimeCalculator">
<param name="analyzedModes" value="car,freight"/>

<!-- Not implemented for link2link routing -->
<param name="separateModes" value="false"/>

<!-- 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="scoring">
<param name="fractionOfIterationsToStartScoreMSA" value="0.9"/>
<param name="writeExperiencedPlans" value="true"/>

<parameterset type="scoringParameters">
<!-- mode ASCs come from auto-calibration-->
<!-- For a bit of documentation on the non-zero marginal utilities per m, see the following link-->
<!-- https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/kelheim/kelheim-v3.0/input/matsim-kelheim-v3.0-calibration-mode-parameters.pdf -->
<param name="waitingPt" value="-1.6"/>

<parameterset type="modeParams" >
<param name="constant" value="0.10908902922956654" />
<param name="dailyMonetaryConstant" value="-5.3" />
<param name="dailyUtilityConstant" value="0.0" />
<param name="marginalUtilityOfDistance_util_m" value="0.0" />
<param name="marginalUtilityOfTraveling_util_hr" value="-0.0" />
<param name="mode" value="car" />
<param name="monetaryDistanceRate" value="-2.0E-4" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="-0.44874536876610344" />
<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="-12.0" /> <!-- see comment above-->
<param name="mode" value="ride" />
<param name="monetaryDistanceRate" value="-2.0E-4" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="0.0449751479497542" />
<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="-0.0" />
<param name="mode" value="pt" />
<param name="monetaryDistanceRate" value="0.0" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="-0.9059637590522914" />
<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="-3.0" /> <!-- see comment above-->
<param name="mode" value="bike" />
<param name="monetaryDistanceRate" value="0.0" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="0.0" />
<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="-0.0" />
<param name="mode" value="walk" />
<param name="monetaryDistanceRate" value="0.0" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="0.0" />
<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="-0.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>
</config>
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>matsim-all</artifactId>

<!-- PR-labelled release -->
<version>16.0-PR2750</version>
<version>16.0-PR2878</version>

<!-- snapshot == not recommended: rather use PR-labelled release!-->
<!-- <version>16.0-SNAPSHOT</matsim.version>-->
Expand Down Expand Up @@ -181,13 +181,13 @@
<dependency>
<groupId>one.util</groupId>
<artifactId>streamex</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.13.0</version>
</dependency>

</dependencies>
Expand Down
Loading

0 comments on commit 3b6618e

Please sign in to comment.