diff --git a/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-3pct.config.xml b/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-3pct.config.xml index 3e9a3e4..10fee0a 100644 --- a/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-3pct.config.xml +++ b/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0-3pct.config.xml @@ -8,8 +8,8 @@ - - + + @@ -21,11 +21,11 @@ + 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"/> + 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"/> @@ -34,13 +34,13 @@ + value="../../../../../public-svn/matsim/scenarios/countries/de/metropole-ruhr/metropole-ruhr-v2024/metropole-ruhr-v2024.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-transitVehicles.xml.gz"/> - + diff --git a/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.mode-vehicles.xml b/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.mode-vehicles.xml index 21af330..a93d3a1 100644 --- a/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.mode-vehicles.xml +++ b/scenarios/metropole-ruhr-v2024.0/input/metropole-ruhr-v2024.0.mode-vehicles.xml @@ -15,21 +15,25 @@ + + + + @@ -48,6 +52,7 @@ from MiD average bike speed in berlin * 2, so on most links they go 12km/h and on bike highways close to 24km/h --> + diff --git a/src/main/java/org/matsim/prepare/CreateDemand.java b/src/main/java/org/matsim/prepare/CreateDemand.java index b6b14e0..8a6f9a3 100644 --- a/src/main/java/org/matsim/prepare/CreateDemand.java +++ b/src/main/java/org/matsim/prepare/CreateDemand.java @@ -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) { @@ -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" ); @@ -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 ); } diff --git a/src/main/java/org/matsim/run/MetropoleRuhrScenario.java b/src/main/java/org/matsim/run/MetropoleRuhrScenario.java index b1e7296..e971ddc 100644 --- a/src/main/java/org/matsim/run/MetropoleRuhrScenario.java +++ b/src/main/java/org/matsim/run/MetropoleRuhrScenario.java @@ -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);