Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.5.superblocks #91

Open
wants to merge 27 commits into
base: 5.5.superblocks
Choose a base branch
from
Open

5.5.superblocks #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
256a929
new superblocks scenarios
mkreuschner Aug 30, 2021
9fd9d8f
Merge branch 'matsim-scenarios:5.5.superblocks' into 5.5.superblocks
mkreuschner Aug 30, 2021
1fb395e
latest update superblocks
mkreuschner Nov 2, 2021
f29131c
Merge branch '5.5.superblocks' of https://github.com/mkreuschner/mats…
mkreuschner Nov 4, 2021
85828bf
analysis updates
mkreuschner Nov 22, 2021
26ce735
analysis updates 2.0
mkreuschner Nov 22, 2021
2ef4185
update hbefa-files
kt86 Nov 24, 2021
fc68fa4
Delete RunOfflineAirPollutionAnalysisA100.java
mkreuschner Nov 25, 2021
655025e
Delete RunOfflineAirPollutionAnalysisA25.java
mkreuschner Nov 25, 2021
eac2ada
Delete RunOfflineAirPollutionAnalysisA50.java
mkreuschner Nov 25, 2021
51e2c1f
Delete RunOfflineAirPollutionAnalysisA75.java
mkreuschner Nov 25, 2021
5a26c62
Delete RunOfflineAirPollutionAnalysisC100.java
mkreuschner Nov 25, 2021
0eaeeb2
Delete RunOfflineAirPollutionAnalysisC25.java
mkreuschner Nov 25, 2021
e373b24
Delete RunOfflineAirPollutionAnalysisC50.java
mkreuschner Nov 25, 2021
62ba835
Delete RunOfflineAirPollutionAnalysisC75.java
mkreuschner Nov 25, 2021
c2c4bf7
use only average tables
kt86 Nov 25, 2021
d5c4f69
no need for transit vehicles
kt86 Nov 29, 2021
da5a611
set all non-car and non-freight vehicleTypes to non-hbefa; inlining, …
kt86 Nov 29, 2021
4db77f6
Updates 3.0 and cleaning before handing-in
mkreuschner Dec 27, 2021
4c4ae06
Delete src/main/java/META-INF directory
mkreuschner Dec 27, 2021
7cae3eb
Last updates and cleaning before handing-in
mkreuschner Dec 27, 2021
ccb7fa4
Merge remote-tracking branch 'origin/5.5.superblocks' into 5.5.superb…
mkreuschner Dec 27, 2021
cf9281f
Updates 3.0 and cleaning before handing-in
mkreuschner Dec 27, 2021
40b3e0d
new run script for policy scenarios plus more flexibility for network…
tschlenther Feb 10, 2022
2490fca
re-route entire car trips and not just the main leg
tschlenther Feb 18, 2022
19f9f2b
update to make it smarter - less files
mkreuschner Feb 19, 2022
cbf85f7
bug fix (clean right network) and some code cleaning
tschlenther Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<!-- Repository for MATSim releases (MATSim is not on Maven central) -->
<repository>
<id>matsim</id>
<url>https://repo.matsim.org/repository/matsim</url>
<url>https://dl.bintray.com/matsim/matsim</url>
</repository>

<repository>
Expand Down Expand Up @@ -157,13 +157,14 @@
<dependency>
<groupId>com.github.matsim-vsp</groupId>
<artifactId>opt-drt</artifactId>
<version>d61d2c8294</version>
<version>e955606ea4</version>
</dependency>

<dependency>
<groupId>com.github.matsim-vsp</groupId>
<artifactId>matsim-analysis</artifactId>
<version>933a6dd</version>
<version>v3.2</version>
<!-- <version>94a0b679d7</version> -->
</dependency>

<dependency>
Expand Down Expand Up @@ -272,16 +273,6 @@
<!-- This bit merges the various GeoTools META-INF/services files -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
Expand Down
154 changes: 154 additions & 0 deletions scenarios/berlin-v5.5-10pct/input/berlin-v5.5-10pct.config_ScenarioA100.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?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="500" />
<param name="overwriteFiles" value="failIfDirectoryExists" />
<param name="runId" value="berlin-v5.5-10pct" />
<param name="outputDirectory" value="./scenarios/berlin-v5.5-10pct/output-berlin-drt-v5.5-10pct" />
<param name="writeEventsInterval" value="50" />
<param name="writePlansInterval" value="50" />
</module>
<module name="global" >
<param name="coordinateSystem" value="EPSG:31468" />
<param name="insistingOnDeprecatedConfigVersion" value="false" />
<param name="numberOfThreads" value="8" />
</module>
<module name="network" >
<param name="inputNetworkFile" value="/Users/moritzkreuschner/Desktop/MasterThesis/coding/modified-networks/A/Network-modifiedA100.xml.gz" />
</module>
<module name="plans" >
<param name="inputPlansFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v5.5-10pct/input/berlin-v5.5-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/berlin/berlin-v5.5-10pct/input/berlin-v5-mode-vehicle-types.xml" />
</module>
<module name="transit" >
<param name="transitScheduleFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v5.5-10pct/input/berlin-v5.5-transit-schedule.xml.gz" />
<param name="useTransit" value="true" />
<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.5-transit-vehicles.xml.gz" />
</module>
<module name="planscalcroute" >
<param name="networkModes" value="car,freight,ride" />
<parameterset type="teleportedModeParameters" >
<param name="beelineDistanceFactor" value="1.3" />
<param name="mode" value="bicycle" />
<param name="teleportedModeSpeed" value="3.1388889" />
</parameterset>
<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.1" />
<param name="mainMode" value="car,freight" />
<param name="numberOfThreads" value="8" />
<param name="startTime" value="00:00:00" />
<param name="storageCapacityFactor" value="0.1" />
<param name="stuckTime" value="30.0" />
<param name="trafficDynamics" value="kinematicWaves" />
<param name="vehiclesSource" value="modeVehicleTypesFromVehiclesData" />
<param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true" />
</module>
<module name="strategy" >
<param name="fractionOfIterationsToDisableInnovation" value="0.8" />
<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.05" />
</parameterset>
<parameterset type="strategysettings" >
<param name="strategyName" value="SubtourModeChoice" />
<param name="subpopulation" value="person" />
<param name="weight" value="0.05" />
</parameterset>
<parameterset type="strategysettings" >
<param name="strategyName" value="TimeAllocationMutator" />
<param name="subpopulation" value="person" />
<param name="weight" value="0.05" />
</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,bicycle" />
<param name="modes" value="car,pt,bicycle,walk" />
</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" />
</module>
<module name="vspExperimental" >
<param name="vspDefaultsCheckingLevel" value="abort" />
</module>
<module name="planCalcScore" >
<param name="fractionOfIterationsToStartScoreMSA" value="1.0" />
<parameterset type="scoringParameters" >
<param name="marginalUtilityOfMoney" value="0.6" />
<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.0002" />
<param name="dailyMonetaryConstant" value="-5.3" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="-0.0" />
<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
<param name="mode" value="ride" />
<param name="monetaryDistanceRate" value="-0.0002" />
<param name="dailyMonetaryConstant" value="-0.0" />
</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="dailyMonetaryConstant" value="-2.1" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="-1.8" />
<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
<param name="mode" value="bicycle" />
</parameterset>
<parameterset type="modeParams" >
<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
<param name="mode" value="walk" />
</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>
154 changes: 154 additions & 0 deletions scenarios/berlin-v5.5-10pct/input/berlin-v5.5-10pct.config_ScenarioA25.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?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="500" />
<param name="overwriteFiles" value="failIfDirectoryExists" />
<param name="runId" value="berlin-v5.5-10pct" />
<param name="outputDirectory" value="./scenarios/berlin-v5.5-10pct/output-berlin-drt-v5.5-10pct" />
<param name="writeEventsInterval" value="50" />
<param name="writePlansInterval" value="50" />
</module>
<module name="global" >
<param name="coordinateSystem" value="EPSG:31468" />
<param name="insistingOnDeprecatedConfigVersion" value="false" />
<param name="numberOfThreads" value="8" />
</module>
<module name="network" >
<param name="inputNetworkFile" value="/Users/moritzkreuschner/Desktop/MasterThesis/coding/modified-networks/A/Network-modifiedA25.xml.gz" />
</module>
<module name="plans" >
<param name="inputPlansFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v5.5-10pct/input/berlin-v5.5-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/berlin/berlin-v5.5-10pct/input/berlin-v5-mode-vehicle-types.xml" />
</module>
<module name="transit" >
<param name="transitScheduleFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v5.5-10pct/input/berlin-v5.5-transit-schedule.xml.gz" />
<param name="useTransit" value="true" />
<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.5-transit-vehicles.xml.gz" />
</module>
<module name="planscalcroute" >
<param name="networkModes" value="car,freight,ride" />
<parameterset type="teleportedModeParameters" >
<param name="beelineDistanceFactor" value="1.3" />
<param name="mode" value="bicycle" />
<param name="teleportedModeSpeed" value="3.1388889" />
</parameterset>
<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.1" />
<param name="mainMode" value="car,freight" />
<param name="numberOfThreads" value="8" />
<param name="startTime" value="00:00:00" />
<param name="storageCapacityFactor" value="0.1" />
<param name="stuckTime" value="30.0" />
<param name="trafficDynamics" value="kinematicWaves" />
<param name="vehiclesSource" value="modeVehicleTypesFromVehiclesData" />
<param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true" />
</module>
<module name="strategy" >
<param name="fractionOfIterationsToDisableInnovation" value="0.8" />
<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.05" />
</parameterset>
<parameterset type="strategysettings" >
<param name="strategyName" value="SubtourModeChoice" />
<param name="subpopulation" value="person" />
<param name="weight" value="0.05" />
</parameterset>
<parameterset type="strategysettings" >
<param name="strategyName" value="TimeAllocationMutator" />
<param name="subpopulation" value="person" />
<param name="weight" value="0.05" />
</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,bicycle" />
<param name="modes" value="car,pt,bicycle,walk" />
</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" />
</module>
<module name="vspExperimental" >
<param name="vspDefaultsCheckingLevel" value="abort" />
</module>
<module name="planCalcScore" >
<param name="fractionOfIterationsToStartScoreMSA" value="1.0" />
<parameterset type="scoringParameters" >
<param name="marginalUtilityOfMoney" value="0.6" />
<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.0002" />
<param name="dailyMonetaryConstant" value="-5.3" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="-0.0" />
<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
<param name="mode" value="ride" />
<param name="monetaryDistanceRate" value="-0.0002" />
<param name="dailyMonetaryConstant" value="-0.0" />
</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="dailyMonetaryConstant" value="-2.1" />
</parameterset>
<parameterset type="modeParams" >
<param name="constant" value="-1.8" />
<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
<param name="mode" value="bicycle" />
</parameterset>
<parameterset type="modeParams" >
<param name="marginalUtilityOfTraveling_util_hr" value="0.0" />
<param name="mode" value="walk" />
</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