update bast counts test

matsim-org · Mar 27, 2024 · a334faf · a334faf
1 parent 11197f6
commit a334faf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/contribs/application/src/main/java/org/matsim/application/options/CountsOptions.java b/contribs/application/src/main/java/org/matsim/application/options/CountsOptions.java
@@ -51,7 +51,7 @@ public Map<String, Id<Link>> getManualMatched() {
 		return manualMatchedCounts;
 	}
 
-	private void readMapping() {
+	private synchronized void readMapping() {
 
 		// Already read
 		if (manualMatchedCounts != null)
@@ -60,6 +60,10 @@ private void readMapping() {
 		manualMatchedCounts = new HashMap<>();
 		ignoredCounts = new HashSet<>();
 
+		// No input file
+		if (input == null)
+			return;
+
 		try (var reader = IOUtils.getBufferedReader(input)) {
 			CSVFormat format = CSVFormat.Builder.create()
 				.setAllowMissingColumnNames(true)

diff --git a/...ion/src/test/java/org/matsim/application/prepare/counts/CreateCountsFromBAStDataTest.java b/...ion/src/test/java/org/matsim/application/prepare/counts/CreateCountsFromBAStDataTest.java
@@ -22,8 +22,7 @@ public class CreateCountsFromBAStDataTest {
 
 	String countsOutput = "test-counts.xml.gz";
 
-	String ignoredCounts = "ignored.csv";
-	String manualMatchedCounts = "manual.csv";
+	String mapping = "mapping.csv";
 	String wrongManualMatchedCounts = "wrong_manual.csv";
 
 	String network = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("berlin"), "network.xml.gz").toString();
@@ -61,9 +60,6 @@ void testCreateCountsFromBAStData() {
 		assertThat(counts.getMeasureLocations())
 			.hasSize(24);
 
-		assertThat(counts.getCounts())
-			.hasSize(24);
-
 		for (Map.Entry<Id<Link>, MeasurementLocation<Link>> e : counts.getMeasureLocations().entrySet()) {
 			assertThat(e.getValue().hasMeasurableForMode(Measurable.VOLUMES, TransportMode.car))
 				.isTrue();
@@ -105,7 +101,7 @@ void testWithIgnoredStations() {
 			"--shp-crs=" + shpCrs,
 			"--year=2021",
 			"--output=" + out2,
-			"--ignored-counts=" + utils.getPackageInputDirectory() + ignoredCounts,
+			"--counts-mapping=" + utils.getPackageInputDirectory() + mapping,
 		};
 
 		new CreateCountsFromBAStData().execute(args2);
@@ -140,7 +136,7 @@ void testManualMatchedCounts() {
 			"--shp-crs=" + shpCrs,
 			"--year=2021",
 			"--output=" + out,
-			"--manual-matched-counts=" + utils.getPackageInputDirectory() + manualMatchedCounts,
+			"--counts-mapping=" + utils.getPackageInputDirectory() + mapping,
 		};
 
 		new CreateCountsFromBAStData().execute(args);
@@ -178,7 +174,7 @@ void testManualMatchingWithWrongInput() {
 			"--shp-crs=" + shpCrs,
 			"--year=2021",
 			"--output=" + out,
-			"--manual-matched-counts=" + utils.getPackageInputDirectory() + wrongManualMatchedCounts,
+			"--counts-mapping=" + utils.getPackageInputDirectory() + wrongManualMatchedCounts,
 		};
 
 		Assertions.assertThrows(RuntimeException.class, () -> new CreateCountsFromBAStData().execute(args));

diff --git a/contribs/application/test/input/org/matsim/application/prepare/counts/ignored.csv b/contribs/application/test/input/org/matsim/application/prepare/counts/ignored.csv
diff --git a/contribs/application/test/input/org/matsim/application/prepare/counts/manual.csv b/contribs/application/test/input/org/matsim/application/prepare/counts/manual.csv
diff --git a/contribs/application/test/input/org/matsim/application/prepare/counts/mapping.csv b/contribs/application/test/input/org/matsim/application/prepare/counts/mapping.csv
@@ -0,0 +1,4 @@
+station,linkId,Using
+2012_1,4205,x
+2012_2,4219,x
+2014,xxx,