Merge pull request #1 from matsim-scenarios/bump-to-matsim-prxxxx

bump to newer MATSim version
matsim-scenarios · Mar 5, 2024 · 000574b · 000574b
2 parents 7a5883d + ccf6a68
commit 000574b
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,9 +12,8 @@
 		<!--<matsim.version>14.0-PR1452</matsim.version>-->
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
-		<!-- FIXME: Decide on version -->
 <!--		<version>15.0-SNAPSHOT</version>-->
-		<version>16.0-PR2918</version>
+		<version>16.0-PR3123</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -126,12 +125,12 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-			<version>5.2.4</version>
+			<version>5.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
-			<version>5.2.4</version>
+			<version>5.2.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>
@@ -141,14 +140,19 @@
 		<dependency>
 			<groupId>org.apache.xmlbeans</groupId>
 			<artifactId>xmlbeans</artifactId>
-			<version>5.1.1</version>
+			<version>5.2.0</version>
 		</dependency>
 
 
 		<!-- Test dependencies -->
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 
@@ -215,7 +219,7 @@
 					<forkCount>1</forkCount>
 					<reuseForks>false</reuseForks>
 					<!-- avoid out of memory errors: -->
-					<argLine>@{argLine} -Xmx9500m -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true</argLine>
+					<argLine>@{argLine} -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true</argLine>
 					<!--necessary in tu berlin gitlab. BUT not good in other places, so solve by command line switch only where needed.  kai, nov'18-->
 					<!--<useSystemClassLoader>false</useSystemClassLoader>-->
 				</configuration>

diff --git a/src/main/java/org/matsim/prepare/PrepareNetwork.java b/src/main/java/org/matsim/prepare/PrepareNetwork.java
@@ -45,7 +45,7 @@ public Integer call() throws Exception {
 
 		Network network = NetworkUtils.readNetwork(networkFile);
 
-		if (!MexicoCityUtils.isDefined(shp.getShapeFile())) {
+		if (shp.getShapeFile() == null) {
 			shp = new ShpOptions(Path.of("input/v1.0/area/area.shp"), null, null);
 		}
 

diff --git a/src/main/java/org/matsim/prepare/population/CreateMATSimFacilities.java b/src/main/java/org/matsim/prepare/population/CreateMATSimFacilities.java
@@ -15,7 +15,6 @@
 import org.matsim.core.network.algorithms.TransportModeNetworkFilter;
 import org.matsim.core.network.filter.NetworkFilterManager;
 import org.matsim.facilities.*;
-import org.matsim.prepare.MexicoCityUtils;
 import org.opengis.feature.simple.SimpleFeature;
 import picocli.CommandLine;
 
@@ -66,7 +65,7 @@ public static void main(String[] args) {
 	@Override
 	public Integer call() throws Exception {
 
-		if (!MexicoCityUtils.isDefined(shp.getShapeFile())) {
+		if (shp.getShapeFile() == null) {
 			log.error("Shp file with facility locations is required.");
 			return 2;
 		}

diff --git a/src/main/java/org/matsim/prepare/population/CreateMetropolitanAreaPopulation.java b/src/main/java/org/matsim/prepare/population/CreateMetropolitanAreaPopulation.java
@@ -85,7 +85,7 @@ public Integer call() throws Exception {
 
 		final CoordinateTransformation ct = new GeotoolsTransformation(targetCrs, targetCrs);
 
-		if (!MexicoCityUtils.isDefined(shp.getShapeFile())) {
+		if (shp.getShapeFile() == null) {
 			log.error("Shape file with municipios of ZMVM is required.");
 			return 2;
 		}

diff --git a/src/main/java/org/matsim/prepare/population/CreateMexicoCityPopulation.java b/src/main/java/org/matsim/prepare/population/CreateMexicoCityPopulation.java
@@ -78,7 +78,7 @@ public Integer call() throws Exception {
 
 		final CoordinateTransformation ct = new GeotoolsTransformation(targetCrs, targetCrs);
 
-		if (MexicoCityUtils.isDefined(shp.getShapeFile())) {
+		if (shp.getShapeFile() == null) {
 			log.error("Shape file with manzanas is required.");
 			return 2;
 		}

diff --git a/src/main/java/org/matsim/prepare/population/InitLocationChoice.java b/src/main/java/org/matsim/prepare/population/InitLocationChoice.java
@@ -116,7 +116,7 @@ private static Coord rndCoord(SplittableRandom rnd, double dist, Coord origin) {
 	@Override
 	public Integer call() throws Exception {
 
-		if (!MexicoCityUtils.isDefined(shp.getShapeFile())) {
+		if (shp.getShapeFile() == null) {
 			log.error("Shape file with commuter zones is required.");
 			return 2;
 		}

diff --git a/src/main/java/org/matsim/prepare/population/RunActivitySampling.java b/src/main/java/org/matsim/prepare/population/RunActivitySampling.java
@@ -91,7 +91,7 @@ public static void main(String[] args) {
 	@Override
 	public Integer call() throws Exception {
 
-		if (!MexicoCityUtils.isDefined(shp.getShapeFile())) {
+		if (shp.getShapeFile() == null) {
 			log.error("Shape file with districts for EOD2017 is required.");
 			return 2;
 		}

diff --git a/src/main/java/org/matsim/prepare/population/RunMexicoCityCalibration.java b/src/main/java/org/matsim/prepare/population/RunMexicoCityCalibration.java
@@ -256,7 +256,7 @@ private void configureSimwrapperCfgGroup(Config config) {
 
 		if (sample.isSet()) {
 			double countScale = allCar ? CAR_FACTOR : 1;
-			sw.defaultParams().sampleSize = sample.getSample() * countScale;
+			sw.sampleSize = sample.getSample() * countScale;
 		}
 	}
 

diff --git a/src/main/java/org/matsim/run/RunMexicoCityScenario.java b/src/main/java/org/matsim/run/RunMexicoCityScenario.java
@@ -152,7 +152,7 @@ protected Config prepareConfig(Config config) {
 		sw.defaultParams().shp = "./area/area.shp";
 
 		if (sample.isSet()) {
-			sw.defaultParams().sampleSize = sample.getSample();
+			sw.sampleSize = sample.getSample();
 		} else {
 			log.error("Sample size is not set. Please run the scenario including a set sample size!");
 			throw new NoSuchElementException();

diff --git a/src/test/java/org/matsim/network/NetworkRoutingTest.java b/src/test/java/org/matsim/network/NetworkRoutingTest.java
@@ -2,9 +2,8 @@
 
 import ch.sbb.matsim.config.SwissRailRaptorConfigGroup;
 import ch.sbb.matsim.routing.pt.raptor.*;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Geometry;
 import org.matsim.api.core.v01.Coord;
 import org.matsim.api.core.v01.Id;
@@ -39,7 +38,9 @@
 import java.nio.file.Path;
 import java.util.*;
 
-@Ignore
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+@Disabled
 public class NetworkRoutingTest {
 
 	private final LeastCostPathCalculatorFactory leastCostPathCalculatorFactory = new SpeedyALTFactory();
@@ -99,7 +100,7 @@ public void runPtNetworkRoutingTest() {
 
 		routeOnNetwork(scenario);
 
-		coordPairs2Legs.entrySet().stream().forEach(e -> Assert.assertFalse(e.getValue().isEmpty()));
+		coordPairs2Legs.entrySet().stream().forEach(e -> assertFalse(e.getValue().isEmpty()));
 		coordPairs2Legs.clear();
 	}
 
@@ -130,7 +131,7 @@ public void runCarNetworkRoutingTest() {
 
 		routeOnNetwork(scenario);
 
-		coordPairs2Legs.entrySet().stream().forEach(e -> Assert.assertFalse(e.getValue().isEmpty()));
+		coordPairs2Legs.entrySet().stream().forEach(e -> assertFalse(e.getValue().isEmpty()));
 		coordPairs2Legs.clear();
 	}
 

diff --git a/src/test/java/org/matsim/prepare/opt/ScoreCalculatorTest.java b/src/test/java/org/matsim/prepare/opt/ScoreCalculatorTest.java
@@ -1,6 +1,6 @@
 package org.matsim.prepare.opt;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/src/test/java/org/matsim/run/RunMexicoCityIntegrationTest.java b/src/test/java/org/matsim/run/RunMexicoCityIntegrationTest.java
@@ -1,6 +1,6 @@
 package org.matsim.run;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.matsim.application.MATSimApplication;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;