diff --git a/Makefile b/Makefile index d1adee5..98eda83 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ N := lausitz -V := v1.1 +V := v2024.2 CRS := EPSG:25832 JAR := matsim-$(N)-*.jar diff --git a/input/v1.1/lausitz-v1.1-10pct.config.xml b/input/v2024.2/lausitz-v2024.2-10pct.config.xml similarity index 95% rename from input/v1.1/lausitz-v1.1-10pct.config.xml rename to input/v2024.2/lausitz-v2024.2-10pct.config.xml index e8d5b20..e23a7e1 100644 --- a/input/v1.1/lausitz-v1.1-10pct.config.xml +++ b/input/v2024.2/lausitz-v2024.2-10pct.config.xml @@ -10,7 +10,7 @@ - + @@ -26,28 +26,28 @@ + value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v2024.2/lausitz-v2024.2-network-with-pt.xml.gz"/> + value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v2024.2/lausitz-v2024.2-10pct.plans-initial.xml.gz"/> - + - - + + - + diff --git a/input/v1.1/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.dbf b/input/v2024.2/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.dbf similarity index 100% rename from input/v1.1/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.dbf rename to input/v2024.2/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.dbf diff --git a/input/v1.1/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.prj b/input/v2024.2/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.prj similarity index 100% rename from input/v1.1/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.prj rename to input/v2024.2/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.prj diff --git a/input/v1.1/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shp b/input/v2024.2/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shp similarity index 100% rename from input/v1.1/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shp rename to input/v2024.2/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shp diff --git a/input/v1.1/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shx b/input/v2024.2/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shx similarity index 100% rename from input/v1.1/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shx rename to input/v2024.2/vvo_tarifzone20/vvo_tarifzone20_hoyerswerda_utm32n.shx diff --git a/pom.xml b/pom.xml index 2ba4d76..e7ad193 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.github.matsim-scenarios matsim-lausitz - 1.1 + 2024.2 MATSim Lausitz Model A transport model of the Lausitz region and its surroundings diff --git a/src/main/java/org/matsim/run/scenarios/LausitzScenario.java b/src/main/java/org/matsim/run/scenarios/LausitzScenario.java index 30803be..fcfc53a 100644 --- a/src/main/java/org/matsim/run/scenarios/LausitzScenario.java +++ b/src/main/java/org/matsim/run/scenarios/LausitzScenario.java @@ -63,7 +63,7 @@ }) public class LausitzScenario extends MATSimApplication { - public static final String VERSION = "1.1"; + public static final String VERSION = "2024.2"; public static final String FREIGHT = "longDistanceFreight"; private static final String AVERAGE = "average"; public static final String HEAVY_MODE = "truck40t"; @@ -77,9 +77,6 @@ public class LausitzScenario extends MATSimApplication { private static final String HBEFA_FILE_COLD_AVERAGE = HBEFA_2020_PATH + "r9230ru2n209r30u2fn0c9rn20n2rujkhkjhoewt84202.enc" ; private static final String HBEFA_FILE_WARM_AVERAGE = HBEFA_2020_PATH + "7eff8f308633df1b8ac4d06d05180dd0c5fdf577.enc"; - @CommandLine.Option(names = "--alpha", description = "alpha for ride, this is just to get a feeling for the parameters dimension, should never be configurable in release.", defaultValue = "2.") - private double alpha; - @CommandLine.Mixin SampleOptions sample = new SampleOptions( 100, 25, 10, 1); @@ -96,7 +93,7 @@ public LausitzScenario(String configPath) { } public LausitzScenario() { - super(String.format("input/v1.1/lausitz-v1.1-10pct.config.xml", VERSION, VERSION)); + super(String.format("input/v%s/lausitz-v%s-10pct.config.xml", VERSION, VERSION)); } public LausitzScenario(SampleOptions sample, EmissionAnalysisHandling handling) { @@ -142,7 +139,7 @@ public Config prepareConfig(Config config) { // 2.0 + 1.0 = alpha + 1 // ride cost = alpha * car cost // ride marg utility of traveling = (alpha + 1) * marg utility travelling car + alpha * beta perf -// double alpha = 2; + double alpha = 2; rideParams.setMarginalUtilityOfTraveling((alpha + 1) * carParams.getMarginalUtilityOfTraveling() - alpha * config.scoring().getPerforming_utils_hr()); rideParams.setDailyMonetaryConstant(0.); rideParams.setMonetaryDistanceRate(carParams.getMonetaryDistanceRate() * 2); diff --git a/src/main/python/calibrate.py b/src/main/python/calibrate.py index 1add17e..038de80 100644 --- a/src/main/python/calibrate.py +++ b/src/main/python/calibrate.py @@ -65,7 +65,7 @@ def filter_modes(df): "calib", ASCCalibrator(modes, initial, target, lr=utils.linear_scheduler(start=0.3, interval=12)), "matsim-lausitz-1.x-SNAPSHOT-20c8ab3.jar", - "../input/v1.1/lausitz-v1.1-10pct.config.xml", + "../input/v2024.2/lausitz-v2024.2-10pct.config.xml", args="--25pct", jvm_args="-Xmx60G -Xmx60G -XX:+AlwaysPreTouch -XX:+UseParallelGC", transform_persons=filter_persons, transform_trips=filter_modes, diff --git a/src/test/java/org/matsim/run/RunIntegrationTest.java b/src/test/java/org/matsim/run/RunIntegrationTest.java index b8da09c..6158007 100644 --- a/src/test/java/org/matsim/run/RunIntegrationTest.java +++ b/src/test/java/org/matsim/run/RunIntegrationTest.java @@ -66,7 +66,7 @@ void runScenario() { assert MATSimApplication.execute(LausitzScenario.class, config, "--1pct", "--iterations", "1", - "--config:plans.inputPlansFile", "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v1.1/lausitz-v1.1-0.1pct.plans-initial.xml.gz", + "--config:plans.inputPlansFile", "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v2024.2/lausitz-v2024.2-0.1pct.plans-initial.xml.gz", "--output", utils.getOutputDirectory(), "--config:controller.overwriteFiles=deleteDirectoryIfExists", "--emissions", "DO_NOT_PERFORM_EMISSIONS_ANALYSIS") == 0 : "Must return non error code"; @@ -201,7 +201,7 @@ void runSpeedReductionScenario() { assert MATSimApplication.execute(LausitzSpeedReductionScenario.class, config, "--1pct", "--iterations", "0", - "--config:plans.inputPlansFile", "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v1.1/lausitz-v1.1-0.1pct.plans-initial.xml.gz", + "--config:plans.inputPlansFile", "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v2024.2/lausitz-v2024.2-0.1pct.plans-initial.xml.gz", "--output", utils.getOutputDirectory(), "--config:controller.overwriteFiles=deleteDirectoryIfExists", "--emissions", "DO_NOT_PERFORM_EMISSIONS_ANALYSIS") == 0 : "Must return non error code";