Skip to content

Commit

Permalink
Merge pull request #47 from matsim-scenarios/version-update
Browse files Browse the repository at this point in the history 
v1.3.1 Update
  • Loading branch information
@GregorRyb
GregorRyb authored Mar 12, 2024
2 parents d191bf8 + 7971b6f commit 618f45a
Show file tree
Hide file tree
Showing 28 changed files with 987 additions and 836 deletions.
117 changes: 0 additions & 117 deletions .mvn/wrapper/MavenWrapperDownloader.java
View file

This file was deleted.

20 changes: 18 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ input/$V/leipzig-$V-25pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.
$(sc) prepare population $@ --phase post\
--shp $(shared)/matsim-input-files/senozon/20210520_leipzig/dilutionArea.shp --shp-crs $(CRS)\
--output $@
# we added trips and so on so we need to ensure plans are consisten with subTourModeChoice
# we added trips and so on so we need to ensure plans are consistent with subTourModeChoice
$(sc) prepare fix-subtour-modes --input $@ --coord-dist 100 --output $@

$(sc) prepare extract-home-coordinates $@ --csv input/$V/leipzig-$V-homes.csv
Expand Down
212 changes: 212 additions & 0 deletions input/v1.3/leipzig-v1.3.1-10pct.config.xml
View file
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="controller">
<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.3/input/leipzig-v1.3-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.1-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.3/input/leipzig-v1.3-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.3/input/leipzig-v1.3-transitSchedule.xml.gz"/>
<param name="vehiclesFile"
value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/leipzig/leipzig-v1.3/input/leipzig-v1.3-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="routing">
<!-- 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="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>
<!-- 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="scoring">
<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.11346535613817503" />
<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.4376276717111751" />
<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.4267240307172857" />
<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.13902836420856232" />
<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>
Loading

0 comments on commit 618f45a

Please sign in to comment.