Skip to content

Commit

Permalink
renamed files
Browse files Browse the repository at this point in the history
  • Loading branch information
paulheinr committed Nov 21, 2024
1 parent d09627f commit a480a53
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<module name="controller">
<param name="lastIteration" value="400"/>
<param name="overwriteFiles" value="deleteDirectoryIfExists"/>
<param name="runId" value="metropole-ruhr-v2.0-3pct"/>
<param name="outputDirectory" value="./scenarios/output/output_metropole-ruhr-v2.0-3pct/"/>
<param name="runId" value="metropole-ruhr-v2024.0-3pct"/>
<param name="outputDirectory" value="./scenarios/output/output_metropole-ruhr-v2024.0-3pct/"/>
<param name="writeEventsInterval" value="100"/>
<param name="writePlansInterval" value="100"/>
<param name="routingAlgorithmType" value="SpeedyALT"/>
Expand All @@ -21,11 +21,11 @@
</module>
<module name="network">
<param name="inputNetworkFile"
value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0.network_resolutionHigh-with-pt.xml.gz"/>
value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2024/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.network_resolutionHigh-with-pt.xml.gz"/>
</module>
<module name="plans">
<param name="inputPlansFile"
value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0-3pct.plans.xml.gz"/>
value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2024/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-3pct.plans.xml.gz"/>
<param name="removingUnnecessaryPlanAttributes" value="true"/>
</module>
<module name="vehicles">
Expand All @@ -34,13 +34,13 @@
</module>
<module name="transit">
<param name="transitScheduleFile"
value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0-transitSchedule.xml.gz"/>
value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2024/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-transitSchedule.xml.gz"/>
<param name="useTransit" value="true"/>
<param name="vehiclesFile"
value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0-transitVehicles.xml.gz"/>
value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2024/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-transitVehicles.xml.gz"/>
</module>
<module name="counts">
<param name="inputCountsFile" value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2024.0.counts.xml.gz"/>
<param name="inputCountsFile" value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2024/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.counts.xml.gz"/>
<param name="countsScaleFactor" value="0.03"/>
</module>
<module name="routing">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,25 @@
<length meter="7.5"/>
<width meter="1.0"/>
<passengerCarEquivalents pce="3.5"/>
<networkMode networkMode="car"/>
</vehicleType>
<vehicleType id="truck18t">
<length meter="7.5"/>
<width meter="1.0"/>
<passengerCarEquivalents pce="3.5"/>
<networkMode networkMode="car"/>
</vehicleType>
<vehicleType id="truck40t">
<length meter="7.5"/>
<width meter="1.0"/>
<passengerCarEquivalents pce="3.5"/>
<networkMode networkMode="car"/>
</vehicleType>
<vehicleType id="truck26t">
<length meter="7.5"/>
<width meter="1.0"/>
<passengerCarEquivalents pce="3.5"/>
<networkMode networkMode="car"/>
</vehicleType>
<vehicleType id="ride">
<attributes>
Expand All @@ -48,6 +52,7 @@
<maximumVelocity meterPerSecond="6.82"/> from MiD average bike speed in berlin * 2, so on most links they go 12km/h and on bike highways close to 24km/h -->
<maximumVelocity meterPerSecond="5"/> <!-- based on the rvr -->
<passengerCarEquivalents pce="0.1"/>
<networkMode networkMode="bike"/>
</vehicleType>

<!-- Specific types for commercial traffic -->
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/matsim/prepare/CreateDemand.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class CreateDemand {
private static final Path rootFolder = Paths.get("../../shared-svn/projects/matsim-metropole-ruhr/metropole-ruhr-v1.0");
private static final Path heightData = rootFolder.resolve("./original-data/2021-05-29_RVR_Grid_10m.tif");

private static final Path outputFolder = Paths.get("../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input");
private static final Path outputFolder = Paths.get("../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2024/metropole-ruhr-v2024.1/input");

public static void main(String[] args) {

Expand Down Expand Up @@ -90,7 +90,7 @@ public static void main(String[] args) {
new XYToLinks().execute(
"--input=" + tmp,
"--output=" + tmp,
"--network=../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0.network_resolutionHigh.xml.gz",
"--network=../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2024/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.network_resolutionHigh.xml.gz",
"--car-only"
);

Expand Down Expand Up @@ -143,7 +143,7 @@ public static void main(String[] args) {
String sampledPlans = outputPlans.replace("25pct", (s.equals("0.1") ? "0" : s) + "pct");
new MergePopulations().execute(
sampledPlans,
outputFolder.resolve(String.format("metropole-ruhr-v2.0-%spct.plans-commercial.xml.gz", s)).toString(),
outputFolder.resolve(String.format("metropole-ruhr-v2024.1-%spct.plans-commercial.xml.gz", s)).toString(),
"--output", sampledPlans
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/matsim/run/MetropoleRuhrScenario.java
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
@MATSimApplication.Prepare({AdjustDemand.class})
public class MetropoleRuhrScenario extends MATSimApplication {

public static final String VERSION = "v2.0";
public static final String VERSION = "v2024.1";

private static final Logger log = LogManager.getLogger(MetropoleRuhrScenario.class);

Expand Down

0 comments on commit a480a53

Please sign in to comment.