re-name v1.1 to v2024.2

matsim-scenarios · Oct 10, 2024 · 20821b2 · 20821b2
1 parent ad550b0
commit 20821b2
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git 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 → .../v2024.2/lausitz-v2024.2-10pct.config.xml b/input/v1.1/lausitz-v1.1-10pct.config.xml → .../v2024.2/lausitz-v2024.2-10pct.config.xml
@@ -10,7 +10,7 @@
 	<module name="controller">
 		<param name="lastIteration" value="500"/>
 		<param name="overwriteFiles" value="failIfDirectoryExists"/>
-		<param name="runId" value="lausitz-10ct"/>
+		<param name="runId" value="lausitz-10pct"/>
 		<param name="outputDirectory" value="./output/output-lausitz-25pct"/>
 		<param name="writeEventsInterval" value="100"/>
 		<param name="writePlansInterval" value="100"/>
@@ -26,18 +26,18 @@
 
 	<module name="network">
 		<param name="inputNetworkFile"
-			   value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v1.1/lausitz-v1.1-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-network-with-pt.xml.gz"/>
 		<param name="laneDefinitionsFile" value="null"/>
 	</module>
 
 	<module name="plans">
 		<param name="inputPlansFile"
-			   value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v1.1/lausitz-v1.1-10pct.plans-initial.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"/>
 		<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/lausitz/input/v1.1/lausitz-v1.1-vehicle-types.xml"/>
+		<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v2024.2/lausitz-v2024.2-vehicle-types.xml"/>
 	</module>
 
 	<module name="transit">
@@ -47,7 +47,7 @@
 	</module>
 
 	<module name="counts">
-		<param name="inputCountsFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v1.1/lausitz-v1.1-counts-bast.xml.gz"/>
+		<param name="inputCountsFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/lausitz/input/v2024.2/lausitz-v2024.2-counts-bast.xml.gz"/>
 	</module>
 
 	<module name="routing">

diff --git a/...20/vvo_tarifzone20_hoyerswerda_utm32n.dbf → ...20/vvo_tarifzone20_hoyerswerda_utm32n.dbf b/...20/vvo_tarifzone20_hoyerswerda_utm32n.dbf → ...20/vvo_tarifzone20_hoyerswerda_utm32n.dbf
diff --git a/...20/vvo_tarifzone20_hoyerswerda_utm32n.prj → ...20/vvo_tarifzone20_hoyerswerda_utm32n.prj b/...20/vvo_tarifzone20_hoyerswerda_utm32n.prj → ...20/vvo_tarifzone20_hoyerswerda_utm32n.prj
diff --git a/...20/vvo_tarifzone20_hoyerswerda_utm32n.shp → ...20/vvo_tarifzone20_hoyerswerda_utm32n.shp b/...20/vvo_tarifzone20_hoyerswerda_utm32n.shp → ...20/vvo_tarifzone20_hoyerswerda_utm32n.shp
diff --git a/...20/vvo_tarifzone20_hoyerswerda_utm32n.shx → ...20/vvo_tarifzone20_hoyerswerda_utm32n.shx b/...20/vvo_tarifzone20_hoyerswerda_utm32n.shx → ...20/vvo_tarifzone20_hoyerswerda_utm32n.shx
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.matsim-scenarios</groupId>
 	<artifactId>matsim-lausitz</artifactId>
-	<version>1.1</version>
+	<version>2024.2</version>
 
 	<name>MATSim Lausitz Model</name>
 	<description>A transport model of the Lausitz region and its surroundings</description>

diff --git a/src/main/java/org/matsim/run/scenarios/LausitzScenario.java b/src/main/java/org/matsim/run/scenarios/LausitzScenario.java
@@ -61,7 +61,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";
@@ -94,7 +94,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) {

diff --git 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
@@ -68,7 +68,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";
@@ -85,7 +85,7 @@ void runScenarioIncludingDrt() {
 		assert MATSimApplication.execute(RunLausitzDrtScenario.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-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-1pct.plans-initial.xml.gz",
 			"--output", utils.getOutputDirectory(),
 			"--config:controller.overwriteFiles=deleteDirectoryIfExists", "--emissions", "DO_NOT_PERFORM_EMISSIONS_ANALYSIS")
 			== 0 : "Must return non error code";
@@ -146,7 +146,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";