Skip to content

Commit

Permalink
updates for release version
Browse files Browse the repository at this point in the history
  • Loading branch information
@rakow
rakow committed Nov 6, 2023
1 parent 8461a2c commit a4eddb0
Show file tree
Hide file tree
Showing 11 changed files with 156 additions and 495 deletions.
12 changes: 12 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ eval-opt: $p/berlin-initial-$V-25pct.experienced_plans.xml.gz
--config $p/berlin-$V-base-calib.config.xml


# TODO: these needs to be renamed to plans-initial, because they are uncalibrated at this stage
# These depend on the output of optimization runs
$p/berlin-$V-25pct.plans.xml.gz: $p/berlin-$V-facilities.xml.gz $p/berlin-$V-network.xml.gz $p/berlin-goodsTraffic-$V-25pct.plans.xml.gz $p/berlin-longHaulFreight-$V-25pct.plans.xml.gz
$(sc) prepare filter-relevant-agents\
Expand All @@ -298,6 +299,17 @@ $p/berlin-$V-25pct.plans.xml.gz: $p/berlin-$V-facilities.xml.gz $p/berlin-$V-net
--sample-size 0.25\
--samples 0.1 0.01 0.001\

clean-plans:
$(sc) prepare clean-population\
--plans mode-choice-final-25pct/runs/004/004.output_plans.xml.gz\
--remove-unselected-plans\
--output mode-choice-final-25pct/runs/004/berlin-$V-25pct.plans.xml.gz

$(sc) prepare clean-population\
--plans mode-choice-final/runs/004/004.output_plans.xml.gz\
--remove-unselected-plans\
--output mode-choice-final/runs/004/berlin-$V-10pct.plans.xml.gz

prepare-calibration: $p/berlin-cadyts-input-$V-25pct.plans.xml.gz $p/berlin-$V-network-with-pt.xml.gz $p/berlin-$V-counts-car-vmz.xml.gz
echo "Done"

Expand Down
162 changes: 0 additions & 162 deletions input/v6.0/berlin-v6.0-base-calib.config.xml
View file

This file was deleted.

Binary file added input/v6.0/berlin-v6.0-counts-car-vmz.xml.gz
View file
Binary file not shown.
Binary file added input/v6.0/berlin-v6.0-counts-hgv-vmz.xml.gz
View file
Binary file not shown.
94 changes: 60 additions & 34 deletions ...lin-v6.0-base-calib_prices2022.config.xml → input/v6.0/berlin-v6.0.config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
<config>
<module name="TimeAllocationMutator">
<param name="mutationRange" value="3600.0"/>
<param name="mutationRange" value="1800.0"/>
</module>
<module name="controler">
<param name="lastIteration" value="500"/>
<param name="overwriteFiles" value="failIfDirectoryExists"/>
<param name="runId" value="berlin-v6.0-calib"/>
<param name="outputDirectory" value="./output/berlin-v6.0-calib"/>
<param name="runId" value="berlin-v6.0"/>
<param name="outputDirectory" value="./output/berlin-v6.0-25pct"/>
<param name="writeEventsInterval" value="100"/>
<param name="writePlansInterval" value="100"/>
<param name="routingAlgorithmType" value="SpeedyALT"/>
Expand All @@ -19,24 +19,24 @@
<param name="numberOfThreads" value="16"/>
</module>
<module name="network">
<param name="inputNetworkFile" value="./berlin-v6.0-network-with-pt.xml.gz"/>
<param name="inputNetworkFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.0/input/berlin-v6.0-network-with-pt.xml.gz"/>
</module>
<module name="plans">
<param name="inputPlansFile" value="./berlin-v6.0-25pct.plans.xml.gz"/>
<param name="inputPlansFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.0/input/berlin-v6.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/berlin/berlin-v5.5-10pct/input/berlin-v5-mode-vehicle-types.xml"/>
</module>
<module name="transit">
<param name="transitScheduleFile" value="./berlin-v6.0-transitSchedule.xml.gz"/>
<param name="transitScheduleFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.0/input/berlin-v6.0-transitSchedule.xml.gz"/>
<param name="useTransit" value="true"/>
<param name="vehiclesFile" value="./berlin-v6.0-transitVehicles.xml.gz"/>
<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.0/input/berlin-v6.0-transitVehicles.xml.gz"/>
</module>
<module name="facilities">
<param name="facilitiesSource" value="fromFile"/>
<param name="inputFacilitiesFile" value="./berlin-v6.0-facilities.xml.gz"/>
<param name="inputFacilitiesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.0/input/berlin-v6.0-facilities.xml.gz"/>
</module>
<module name="planscalcroute">
<param name="networkModes" value="car,freight,ride"/>
Expand Down Expand Up @@ -81,6 +81,15 @@
</module>
-->

<module name="simwrapper" >
<parameterset type="params" >
<param name="context" value="" />
<param name="mapCenter" value="13.39,52.51" />
<param name="mapZoomLevel" value="9.1" />
<param name="sampleSize" value="0.25" />
<param name="shp" value="./area/area.shp" />
</parameterset>
</module>

<module name="transitRouter">
<param name="directWalkFactor" value="1.0"/>
Expand All @@ -94,7 +103,6 @@
<param name="vspDefaultsCheckingLevel" value="abort"/>
</module>


<module name="planCalcScore">
<param name="fractionOfIterationsToStartScoreMSA" value="0.8"/>
<parameterset type="scoringParameters">
Expand All @@ -107,41 +115,59 @@
<param name="performing" value="6.88"/>

<parameterset type="modeParams">
<param name="constant" value="-1.0"/>
<param name="marginalUtilityOfTraveling_util_hr" value="0.0"/>
<param name="mode" value="car"/>
<param name="monetaryDistanceRate" value="-0.00026"/>
<param name="dailyMonetaryConstant" value="-14.1"/>
<param name="constant" value="-0.30077680258110934" />
<param name="dailyMonetaryConstant" value="-14.1" />
<param name="dailyUtilityConstant" value="10.98" />
<param name="marginalUtilityOfDistance_util_m" value="1.4E-4" />
<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
<param name="monetaryDistanceRate" value="-2.6E-4" />
<param name="mode" value="car" />
</parameterset>
<parameterset type="modeParams">
<param name="constant" value="-1.0"/>
<param name="constant" value="-1.1996407419918727" />
<param name="dailyMonetaryConstant" value="0.0" />
<param name="dailyUtilityConstant" value="0.0" />
<param name="marginalUtilityOfDistance_util_m" value="3.5E-4" />
<!-- (alpha+gamma)*beta_performing+(alpha+1)*mgl_util_travelling_car -->
<!-- (2.0+1.0)*6+(2.0+1)*0.0 -->
<param name="marginalUtilityOfTraveling_util_hr" value="-18.0"/>
<param name="mode" value="ride"/>
<param name="monetaryDistanceRate" value="-0.00052"/> <!-- 2*car -->
<param name="dailyMonetaryConstant" value="-0.0"/>
<param name="marginalUtilityOfTraveling_util_hr" value="-10.32" />
<param name="mode" value="ride" />
</parameterset>
<parameterset type="modeParams">
<param name="marginalUtilityOfTraveling_util_hr" value="0.0"/>
<param name="mode" value="freight"/>
<param name="monetaryDistanceRate" value="-0.0004"/>
</parameterset>
<parameterset type="modeParams">
<param name="constant" value="-0.3"/>
<param name="marginalUtilityOfTraveling_util_hr" value="0.0"/>
<param name="mode" value="pt"/>
<param name="constant" value="-0.38627376236312827" />
<!-- 4-trips AB 10Euro -> 2.5 Eu/trip. yearly 761 Eu / 250 days = 3.04 Eu/day -->
<param name="dailyMonetaryConstant" value="-3.0"/>
<param name="dailyMonetaryConstant" value="-3.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="monetaryDistanceRate" value="0.0" />
<param name="mode" value="pt" />
</parameterset>
<parameterset type="modeParams">
<param name="constant" value="-1.8"/>
<param name="marginalUtilityOfTraveling_util_hr" value="0.0"/>
<param name="mode" value="bike"/>
<param name="constant" value="-2.1384635949005277" />
<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="monetaryDistanceRate" value="0.0" />
<param name="mode" value="bike" />
</parameterset>
<parameterset type="modeParams">
<param name="marginalUtilityOfTraveling_util_hr" value="0.0"/>
<param name="mode" value="walk"/>
<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="monetaryDistanceRate" value="0.0" />
<param name="mode" value="walk" />
</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="monetaryDistanceRate" value="-4.0E-4" />
<param name="mode" value="freight" />
</parameterset>
</parameterset>
</module>
Expand Down
Loading

0 comments on commit a4eddb0

Please sign in to comment.