-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into defaultLinkChooser-v2
# Conflicts: # input/v1.2/leipzig-v1.2-25pct.config.xml # src/main/java/org/matsim/run/LeipzigRouterPlanAlgorithm.java # src/main/java/org/matsim/run/RunLeipzigScenario.java # src/main/java/org/matsim/run/prepare/NetworkOptions.java # src/main/java/org/matsim/run/prepare/PreparePopulation.java # src/test/java/org/matsim/run/RunLeipzigIntegrationTest.java # src/test/java/org/matsim/run/TimeRestrictedParkingCostHandlerTest.java
- Loading branch information
Showing
29 changed files
with
24,603 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| cff-version: 1.2.0 | ||
| title: MATSim Open Leipzig Scenario | ||
| message: >- | ||
| If you use this software, please cite it using the | ||
| metadata from this file. | ||
| type: software | ||
| authors: | ||
| - given-names: Christian | ||
| family-names: Rakow | ||
| email: [email protected] | ||
| affiliation: Technische Universität Berlin | ||
| orcid: 'https://orcid.org/0000-0003-3760-2243' | ||
| - given-names: Gregor | ||
| family-names: Rybczak | ||
| affiliation: Technische Universität Berlin | ||
| - given-names: Simon | ||
| family-names: Meinhardt | ||
| affiliation: Technische Universität Berlin | ||
|
|
||
| url: "https://github.com/matsim-scenarios/matsim-leipzig" | ||
| date-released: 2023-12-11 | ||
| year: 2023 | ||
| version: 1.3 | ||
| license: GPL-2.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| UTF-8 |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| PROJCS["ETRS_1989_UTM_Zone_32N",GEOGCS["GCS_ETRS_1989",DATUM["D_ETRS_1989",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",9.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] |
Binary file not shown.
8,098 changes: 8,098 additions & 0 deletions
8,098
input/v1.3/drtServiceArea/Leipzig_stadt.shp_drt_stops.csv
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| UTF-8 |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| PROJCS["ETRS_1989_UTM_Zone_32N",GEOGCS["GCS_ETRS_1989",DATUM["D_ETRS_1989",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",9.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]] |
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| <?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-10pct"/> | ||
| <param name="outputDirectory" value="./output/output-leipzig-10pct"/> | ||
| <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="14"/> | ||
| </module> | ||
|
|
||
| <module name="network"> | ||
| <param name="inputNetworkFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.2/input/leipzig-v1.2-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/leipzig/leipzig-v1.3/input/leipzig-v1.3-10pct.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/leipzig/leipzig-v1.2/input/leipzig-v1.2-vehicle-types.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.2/input/leipzig-v1.2-transitSchedule.xml.gz"/> | ||
| <param name="vehiclesFile" | ||
| value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.2/input/leipzig-v1.2-transitVehicles.xml.gz"/> | ||
| <param name="useTransit" value="true"/> | ||
| </module> | ||
|
|
||
| <module name="counts"> | ||
| <param name="inputCountsFile" value="./leipzig-v1.3-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 --> | ||
| <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="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"/> | ||
| <param name="useLanes" value="false" /> | ||
|
|
||
| <param name="vehiclesSource" value="modeVehicleTypesFromVehiclesData"/> | ||
| <param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true"/> | ||
|
|
||
| <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="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> | ||
| <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> | ||
| <!-- Strategies for other subpopulations are added in code --> | ||
| </module> | ||
|
|
||
| <module name="subtourModeChoice"> | ||
| <param name="chainBasedModes" value="car,bike"/> | ||
| <param name="modes" value="car,ride,pt,bike,walk"/> | ||
| <param name="considerCarAvailability" value="true"/> | ||
| <param name="behavior" value="betweenAllAndFewerConstraints"/> | ||
| <param name="probaForRandomSingleTripMode" value="0.5" /> | ||
| <param name="coordDistance" value="100"/> | ||
| </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"> | ||
| <!-- Inflation adjusted --> | ||
| <param name="performing" value="6.67"/> | ||
|
|
||
| <parameterset type="modeParams"> | ||
| <param name="constant" value="0.05589622213000432" /> | ||
| <param name="dailyMonetaryConstant" value="-13.22"/> | ||
| <param name="marginalUtilityOfTraveling_util_hr" value="-2.0" /> | ||
| <param name="monetaryDistanceRate" value="-0.00025"/> | ||
| <param name="mode" value="car"/> | ||
| </parameterset> | ||
| <parameterset type="modeParams"> | ||
| <param name="constant" value="-1.3713277029528415" /> | ||
| <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" /> | ||
| <param name="monetaryDistanceRate" value="-5.0E-4" /> | ||
| <param name="mode" value="ride"/> | ||
| </parameterset> | ||
| <parameterset type="modeParams"> | ||
| <param name="constant" value="-0.38882608663670926" /> | ||
| <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="-7.0" /> | ||
| <param name="mode" value="pt"/> | ||
| </parameterset> | ||
| <parameterset type="modeParams"> | ||
| <param name="constant" value="0.04080644914636075" /> | ||
| <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="-10.0" /> | ||
| <param name="mode" value="bike"/> | ||
| </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="-1.5" /> | ||
| <param name="mode" value="walk"/> | ||
| </parameterset> | ||
|
|
||
| <parameterset type="modeParams" > | ||
| <param name="marginalUtilityOfTraveling_util_hr" value="-10.0" /> | ||
| <param name="monetaryDistanceRate" value="-0.002" /> | ||
| <param name="mode" value="freight" /> | ||
| </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> |
Binary file not shown.
Oops, something went wrong.