From 670bbd20dad453efac014780c904f78437b0c212 Mon Sep 17 00:00:00 2001 From: simei94 Date: Tue, 27 Feb 2024 12:55:06 -0600 Subject: [PATCH 1/3] bump to PR3118 --- pom.xml | 18 +++++++++++------- .../org/matsim/prepare/PrepareNetwork.java | 2 +- .../population/CreateMATSimFacilities.java | 2 +- .../CreateMetropolitanAreaPopulation.java | 2 +- .../population/CreateMexicoCityPopulation.java | 2 +- .../prepare/population/InitLocationChoice.java | 2 +- .../population/RunActivitySampling.java | 2 +- .../population/RunMexicoCityCalibration.java | 2 +- .../org/matsim/run/RunMexicoCityScenario.java | 2 +- .../org/matsim/network/NetworkRoutingTest.java | 13 +++++++------ .../prepare/opt/ScoreCalculatorTest.java | 2 +- .../run/RunMexicoCityIntegrationTest.java | 2 +- 12 files changed, 28 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 734f516..3b5f99f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,9 +12,8 @@ - - 16.0-PR2918 + 16.0-PR3118 4.0.0 @@ -120,12 +119,12 @@ org.apache.poi poi - 5.2.4 + 5.2.5 org.apache.poi poi-ooxml - 5.2.4 + 5.2.5 org.apache.poi @@ -135,14 +134,19 @@ org.apache.xmlbeans xmlbeans - 5.1.1 + 5.2.0 - junit - junit + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.jupiter + junit-jupiter test diff --git a/src/main/java/org/matsim/prepare/PrepareNetwork.java b/src/main/java/org/matsim/prepare/PrepareNetwork.java index 195d1cf..00b06e3 100644 --- a/src/main/java/org/matsim/prepare/PrepareNetwork.java +++ b/src/main/java/org/matsim/prepare/PrepareNetwork.java @@ -43,7 +43,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 index d4ecbde..ce8a172 100644 --- a/src/main/java/org/matsim/prepare/population/CreateMATSimFacilities.java +++ b/src/main/java/org/matsim/prepare/population/CreateMATSimFacilities.java @@ -66,7 +66,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 index e844449..a0cf375 100644 --- 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 index 02b5b24..b9640b5 100644 --- 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 index d16b8a9..9201ef5 100644 --- 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 index 9220bcc..b9e230a 100644 --- 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 index 6f3d192..240706e 100644 --- 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 index 903c450..48f2835 100644 --- a/src/main/java/org/matsim/run/RunMexicoCityScenario.java +++ b/src/main/java/org/matsim/run/RunMexicoCityScenario.java @@ -143,7 +143,7 @@ protected Config prepareConfig(Config config) { sw.defaultParams().shp = "./area/area.shp"; if (sample.isSet()) { - sw.defaultParams().sampleSize = sample.getSample(); + sw.sampleSize = sample.getSample(); } ConfigUtils.addOrGetModule(config, SwissRailRaptorConfigGroup.class); diff --git a/src/test/java/org/matsim/network/NetworkRoutingTest.java b/src/test/java/org/matsim/network/NetworkRoutingTest.java index 5dac970..9263547 100644 --- 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 index 232d08a..306c3be 100644 --- 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 index 44a8256..45108f7 100644 --- 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; From 1aa6c68a87f0294cedc003144fa5625a779bf5e3 Mon Sep 17 00:00:00 2001 From: simei94 Date: Tue, 27 Feb 2024 12:55:06 -0600 Subject: [PATCH 2/3] bump to PR3118 --- .../org/matsim/prepare/population/CreateMATSimFacilities.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/matsim/prepare/population/CreateMATSimFacilities.java b/src/main/java/org/matsim/prepare/population/CreateMATSimFacilities.java index ce8a172..057f28e 100644 --- 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; From 427d7af026d567b5ddbd3b58044bc5c93356c4ee Mon Sep 17 00:00:00 2001 From: simei94 Date: Tue, 5 Mar 2024 12:02:05 -0600 Subject: [PATCH 3/3] bump to 16.0-PR3123 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3b5f99f..c7901e9 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ - 16.0-PR3118 + 16.0-PR3123 4.0.0 @@ -213,7 +213,7 @@ 1 false - @{argLine} -Xmx9500m -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true + @{argLine} -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true