diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 0f30527d41b..7804cbe9423 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -27,7 +27,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
with:
languages: 'java'
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -41,9 +41,9 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ uses: github/codeql-action/autobuild@v3
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3
with:
category: "/language:java"
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 43ee7d820b2..f8104490737 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -41,8 +41,12 @@
16.0-SNAPSHOT
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter-engine
+
+
+ org.junit.jupiter
+ junit-jupiter
diff --git a/contribs/accessibility/src/main/java/org/matsim/contrib/accessibility/utils/GeoJsonPolygonFeatureWriter.java b/contribs/accessibility/src/main/java/org/matsim/contrib/accessibility/utils/GeoJsonPolygonFeatureWriter.java
index c022be98067..f0e3dc08db3 100644
--- a/contribs/accessibility/src/main/java/org/matsim/contrib/accessibility/utils/GeoJsonPolygonFeatureWriter.java
+++ b/contribs/accessibility/src/main/java/org/matsim/contrib/accessibility/utils/GeoJsonPolygonFeatureWriter.java
@@ -1,6 +1,6 @@
package org.matsim.contrib.accessibility.utils;
-import org.json.simple.JSONValue;
+import com.google.gson.Gson;
import org.matsim.api.core.v01.Coord;
import java.util.*;
@@ -34,7 +34,7 @@ public String asGeoJson() {
featureCollectionMap.put("features", featuresList);
featureCollectionMap.put("crs", parseCRS());
featureCollectionMap.put("bbox", boundingBox.getBoundingBox());
- return JSONValue.toJSONString(featureCollectionMap);
+ return new Gson().toJson(featureCollectionMap);
}
private List> parseFeatureList() {
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/LeastCostPathTreeTest.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/LeastCostPathTreeTest.java
index fcd995bd7b7..23d32279ec6 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/LeastCostPathTreeTest.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/LeastCostPathTreeTest.java
@@ -5,8 +5,8 @@
import java.util.List;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Node;
@@ -24,9 +24,9 @@
public class LeastCostPathTreeTest {
Scenario scenario;
-
+
@Test
- public void testRouteChoiceTestSpanningTree(){
+ void testRouteChoiceTestSpanningTree(){
this.scenario = new ScenarioBuilder(ConfigUtils.createConfig()).setNetwork(CreateTestNetwork.createTriangularNetwork()).build() ;
compareRouteChoices();
}
@@ -55,11 +55,11 @@ private void compareRouteChoices(){
printResults(arrivalTime, travelTime); // travel time = cost = (50s+50s) = 100s
// check route (visited nodes should be 1,2,4)
List> spTimeVisitedNodes = getVisitedNodes(lcptTime, destination, "Travel Time");
- Assert.assertTrue( containsNode(spTimeVisitedNodes, Id.create("2", Node.class)));
+ Assertions.assertTrue( containsNode(spTimeVisitedNodes, Id.create("2", Node.class)));
// check travel duration
- Assert.assertTrue( travelTime == 100 );
+ Assertions.assertTrue( travelTime == 100 );
// check travel time
- Assert.assertTrue( arrivalTime - departureTime == 100 );
+ Assertions.assertTrue( arrivalTime - departureTime == 100 );
lcptDistance.calculate(this.scenario.getNetwork(), origin, departureTime);
double arrivalTimeTD = lcptDistance.getTree().get( destination.getId() ).getTime();
@@ -67,11 +67,11 @@ private void compareRouteChoices(){
printResults(arrivalTimeTD, travelDistance); // travel time = 1000s, cost = (50m+50m) = 100m
// check route ( visited nodes should be 1,3,4)
List> spDistenceVisitedNodes = getVisitedNodes(lcptDistance, destination, "Travel Distance");
- Assert.assertTrue( containsNode(spDistenceVisitedNodes, Id.create("3", Node.class)));
+ Assertions.assertTrue( containsNode(spDistenceVisitedNodes, Id.create("3", Node.class)));
// check travel distance
- Assert.assertTrue( travelDistance == 100 );
+ Assertions.assertTrue( travelDistance == 100 );
// check travel time
- Assert.assertTrue( arrivalTimeTD - departureTime == 1000 );
+ Assertions.assertTrue( arrivalTimeTD - departureTime == 1000 );
}
private void printResults(double tt, double tc){
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/grid/SpatialGridTest.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/grid/SpatialGridTest.java
index b9f82d4cfa1..74bae0a5363 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/grid/SpatialGridTest.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/grid/SpatialGridTest.java
@@ -1,8 +1,8 @@
package org.matsim.contrib.accessibility.grid;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.network.Network;
import org.matsim.contrib.accessibility.SpatialGrid;
import org.matsim.contrib.matrixbasedptrouter.utils.BoundingBox;
@@ -11,13 +11,14 @@
public class SpatialGridTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
private double cellSize = 10.;
- @Test public void testSpatialGrid() {
+ @Test
+ void testSpatialGrid() {
// get network
Network network = CreateTestNetwork.createTestNetwork();
@@ -31,11 +32,11 @@ public class SpatialGridTest {
// get number of rows
int rows = testGrid.getNumRows();
double numOfExpectedRows = ((nbb.getYMax() - nbb.getYMin()) / cellSize) + 1;
- Assert.assertTrue(rows == numOfExpectedRows);
+ Assertions.assertTrue(rows == numOfExpectedRows);
// get number of columns
int cols = testGrid.getNumCols(0);
double numOfExpectedCols = ((nbb.getXMax() - nbb.getXMin()) / cellSize) + 1;
- Assert.assertTrue(cols == numOfExpectedCols);
+ Assertions.assertTrue(cols == numOfExpectedCols);
}
}
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/CompareLogsumFormulas2Test.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/CompareLogsumFormulas2Test.java
index b561798a16d..f7e6672c053 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/CompareLogsumFormulas2Test.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/CompareLogsumFormulas2Test.java
@@ -22,9 +22,9 @@
*/
package org.matsim.contrib.accessibility.logsumComputations;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
/**
@@ -33,12 +33,12 @@
*/
public class CompareLogsumFormulas2Test {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
-
- @Test public void testLogsumFormulas(){
+ @Test
+ void testLogsumFormulas(){
double walkTravelTime2Network = 2.; // 2min
double travelTimeOnNetwork = 6.; // 6min
@@ -66,7 +66,7 @@ public class CompareLogsumFormulas2Test {
double Sum2 =PreFactor * AggregationSum;
System.out.println(Sum2);
- Assert.assertTrue( Sum1 == Sum2 );
+ Assertions.assertTrue( Sum1 == Sum2 );
}
}
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/CompareLogsumFormulasTest.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/CompareLogsumFormulasTest.java
index 8c85aabbe9f..19501ebb49f 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/CompareLogsumFormulasTest.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/CompareLogsumFormulasTest.java
@@ -22,9 +22,9 @@
*/
package org.matsim.contrib.accessibility.logsumComputations;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
/**
@@ -33,8 +33,8 @@
*/
public class CompareLogsumFormulasTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
/**
* underlying network
@@ -47,7 +47,8 @@ public class CompareLogsumFormulasTest {
* cjk3
*/
- @Test public void testLogsumFormulas(){
+ @Test
+ void testLogsumFormulas(){
double betaWalkTT = -2.;
double betaWalkTD = -1.;
@@ -72,7 +73,7 @@ public class CompareLogsumFormulasTest {
double Ai = computeLogsum(betaWalkTT, betaWalkTD, cik1TT, cik2TT, cik3TT, cik1TD, cik2TD, cik3TD);
double Ai2 =computeTransformedLogsum(betaWalkTT, betaWalkTD, cijTT, cjk1TT, cjk2TT, cjk3TT, cijTD, cjk1TD, cjk2TD, cjk3TD);
- Assert.assertTrue( Ai == Ai2 );
+ Assertions.assertTrue( Ai == Ai2 );
}
/**
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/ComputeLogsumFormulas3Test.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/ComputeLogsumFormulas3Test.java
index 81eb7bc3254..1b35497b3c7 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/ComputeLogsumFormulas3Test.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/logsumComputations/ComputeLogsumFormulas3Test.java
@@ -22,9 +22,9 @@
*/
package org.matsim.contrib.accessibility.logsumComputations;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
/**
@@ -33,8 +33,8 @@
*/
public class ComputeLogsumFormulas3Test {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
/**
* underlying network
@@ -48,7 +48,8 @@ public class ComputeLogsumFormulas3Test {
*/
@SuppressWarnings("static-method")
- @Test public void testLogsumFormulas(){
+ @Test
+ void testLogsumFormulas(){
double betaWalkTT = -10. / 3600.0; // [util/sec]
double betaWalkTD = -10.; // [util/meter]
@@ -100,7 +101,7 @@ public class ComputeLogsumFormulas3Test {
// double expNewVhj= Math.exp( VhjNew );
// double expNewVhk= expNewVhj * sumExpVjk;
- Assert.assertTrue(VhjOld == VhjNew); // old accessibility computation == new accessibility computation
+ Assertions.assertTrue(VhjOld == VhjNew); // old accessibility computation == new accessibility computation
///////
// NEW
@@ -112,7 +113,7 @@ public class ComputeLogsumFormulas3Test {
double dummyExp1 = Math.exp( dummyVijCar + dummyVhiWalk );
double dummyExp2 = Math.exp( dummyVijCar ) * Math.exp( dummyVhiWalk );
- Assert.assertEquals(dummyExp1,dummyExp2,1.e-10); // exp(VijCar + VijWalk) == exp(VijCar) * exp(VijWalk)
+ Assertions.assertEquals(dummyExp1,dummyExp2,1.e-10); // exp(VijCar + VijWalk) == exp(VijCar) * exp(VijWalk)
}
}
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/AccessibilityIntegrationTest.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/AccessibilityIntegrationTest.java
index b843e1ae3b5..25b3a4598eb 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/AccessibilityIntegrationTest.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/AccessibilityIntegrationTest.java
@@ -27,10 +27,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.locationtech.jts.geom.Envelope;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
@@ -74,11 +74,11 @@ public class AccessibilityIntegrationTest {
private static final Logger LOG = LogManager.getLogger(AccessibilityIntegrationTest.class);
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils();
- @Ignore
+ @Disabled
@Test
- public void testRunAccessibilityExample() {
+ void testRunAccessibilityExample() {
Config config = ConfigUtils.loadConfig("./examples/RunAccessibilityExample/config.xml");
AccessibilityConfigGroup accConfig = ConfigUtils.addOrGetModule(config, AccessibilityConfigGroup.class);
@@ -101,15 +101,15 @@ public void startRow(String[] row) {
if (x == 50) {
if (y == 50) {
- Assert.assertEquals("Wrong work accessibility value at x=" + x + ", y=" + y + ":", 2.1486094237531126, value, utils.EPSILON);
+ Assertions.assertEquals(2.1486094237531126, value, utils.EPSILON, "Wrong work accessibility value at x=" + x + ", y=" + y + ":");
} else if (y == 150){
- Assert.assertEquals("Wrong work accessibility value at x=" + x + ", y=" + y + ":", 2.1766435716006005, value, utils.EPSILON);
+ Assertions.assertEquals(2.1766435716006005, value, utils.EPSILON, "Wrong work accessibility value at x=" + x + ", y=" + y + ":");
}
} else if (x == 150) {
if (y == 50) {
- Assert.assertEquals("Wrong work accessibility value at x=" + x + ", y=" + y + ":", 2.1486094237531126, value, utils.EPSILON);
+ Assertions.assertEquals(2.1486094237531126, value, utils.EPSILON, "Wrong work accessibility value at x=" + x + ", y=" + y + ":");
} else if (y == 150){
- Assert.assertEquals("Wrong work accessibility value at x=" + x + ", y=" + y + ":", 2.2055702759681273, value, utils.EPSILON);
+ Assertions.assertEquals(2.2055702759681273, value, utils.EPSILON, "Wrong work accessibility value at x=" + x + ", y=" + y + ":");
}
}
}
@@ -119,7 +119,7 @@ public void startRow(String[] row) {
@Test
- public void testWithBoundingBoxConfigFile() {
+ void testWithBoundingBoxConfigFile() {
Config config = ConfigUtils.loadConfig(utils.getInputDirectory() + "config.xml");
AccessibilityConfigGroup acg = ConfigUtils.addOrGetModule(config, AccessibilityConfigGroup.class) ;
@@ -159,7 +159,7 @@ public void install() {
@Test
- public void testWithBoundingBox() {
+ void testWithBoundingBox() {
final Config config = createTestConfig();
double min = 0.; // Values for bounding box usually come from a config file
@@ -197,7 +197,7 @@ public void install() {
@Test
- public void testWithBoundingBoxUsingOpportunityWeights() {
+ void testWithBoundingBoxUsingOpportunityWeights() {
final Config config = createTestConfig();
double min = 0.; // Values for bounding box usually come from a config file
@@ -237,7 +237,7 @@ public void install() {
@Test
- public void testWithExtentDeterminedByNetwork() {
+ void testWithExtentDeterminedByNetwork() {
final Config config = createTestConfig() ;
config.routing().setRoutingRandomness(0.);
@@ -264,14 +264,14 @@ public void install() {
@Test
- public void testWithExtentDeterminedShapeFile() {
+ void testWithExtentDeterminedShapeFile() {
Config config = createTestConfig() ;
File f = new File(this.utils.getInputDirectory() + "shapefile.shp"); // shape file completely covers the road network
if(!f.exists()){
LOG.error("Shape file not found! testWithExtentDeterminedShapeFile could not be tested...");
- Assert.assertTrue(f.exists());
+ Assertions.assertTrue(f.exists());
}
final AccessibilityConfigGroup acg = ConfigUtils.addOrGetModule(config, AccessibilityConfigGroup.class);
@@ -304,14 +304,14 @@ public void install() {
@Test
- public void testWithPredefinedMeasuringPoints() {
+ void testWithPredefinedMeasuringPoints() {
Config config = createTestConfig() ;
File f = new File(this.utils.getInputDirectory() + "measuringPoints.xml");
if(!f.exists()){
LOG.error("Facilities file with measuring points not found! testWithMeasuringPointsInFacilitiesFile could not be performed...");
- Assert.assertTrue(f.exists());
+ Assertions.assertTrue(f.exists());
}
Scenario measuringPointsSc = ScenarioUtils.createScenario(ConfigUtils.createConfig());
@@ -350,16 +350,16 @@ public void install() {
}
- @Ignore
+ @Disabled
@Test
- public void testWithFile(){
+ void testWithFile(){
/*TODO Complete - JWJ, Dec'16 */
Config config = createTestConfig();
File f = new File(this.utils.getInputDirectory() + "pointFile.csv");
if(!f.exists()){
LOG.error("Point file not found! testWithFile could not be tested...");
- Assert.assertTrue(f.exists());
+ Assertions.assertTrue(f.exists());
}
final AccessibilityConfigGroup acg = ConfigUtils.addOrGetModule(config, AccessibilityConfigGroup.class);
@@ -598,12 +598,12 @@ public void finish() {
for (String mode : accessibilitiesMap.get(tuple).keySet()) {
double value = accessibilitiesMap.get(tuple).get(mode);
switch (mode) { // commented values are before (a) Marcel's change of the QuadTree in Oct'18, (b) change in TravelTimeCalculator in Apr'21
- case "freespeed": Assert.assertEquals(2.207441799716032, value, MatsimTestUtils.EPSILON); break; // (a) 2.1486094237531126
- case TransportMode.car: Assert.assertEquals(2.2058369602991204, value, MatsimTestUtils.EPSILON); break; // (a) 2.1482840466191093 (b) 2.205836861444427
- case TransportMode.bike: Assert.assertEquals(2.2645288908389554, value, MatsimTestUtils.EPSILON); break; // (a) 2.2257398663221
- case TransportMode.walk: Assert.assertEquals(1.8697283849051263, value, MatsimTestUtils.EPSILON); break; // (a) 1.70054725728361
- case TransportMode.pt: Assert.assertEquals(2.1581641260040683, value, MatsimTestUtils.EPSILON); break;
- case "matrixBasedPt": Assert.assertEquals(1.6542905235735796, value, MatsimTestUtils.EPSILON); break; // (a) 0.461863556339195
+ case "freespeed": Assertions.assertEquals(2.207441799716032, value, MatsimTestUtils.EPSILON); break; // (a) 2.1486094237531126
+ case TransportMode.car: Assertions.assertEquals(2.2058369602991204, value, MatsimTestUtils.EPSILON); break; // (a) 2.1482840466191093 (b) 2.205836861444427
+ case TransportMode.bike: Assertions.assertEquals(2.2645288908389554, value, MatsimTestUtils.EPSILON); break; // (a) 2.2257398663221
+ case TransportMode.walk: Assertions.assertEquals(1.8697283849051263, value, MatsimTestUtils.EPSILON); break; // (a) 1.70054725728361
+ case TransportMode.pt: Assertions.assertEquals(2.1581641260040683, value, MatsimTestUtils.EPSILON); break;
+ case "matrixBasedPt": Assertions.assertEquals(1.6542905235735796, value, MatsimTestUtils.EPSILON); break; // (a) 0.461863556339195
}
}
}
@@ -611,12 +611,12 @@ else if (tuple.getFirst().getCoord().getY() == 150.) {
for (String mode : accessibilitiesMap.get(tuple).keySet()) {
double value = accessibilitiesMap.get(tuple).get(mode);
switch (mode) {
- case "freespeed": Assert.assertEquals(2.207441799716032, value, MatsimTestUtils.EPSILON); break; // (a) 2.1766435716006005
- case TransportMode.car: Assert.assertEquals(2.207441960299121, value, MatsimTestUtils.EPSILON); break; // (a) 2.176238564675181 (b) 2.207441799716032
- case TransportMode.bike: Assert.assertEquals(2.2645288908389554, value, MatsimTestUtils.EPSILON); break; // (a) 2.2445468698643367
- case TransportMode.walk: Assert.assertEquals(1.8697283849051263, value, MatsimTestUtils.EPSILON); break; // (a) 1.7719146868026079
- case TransportMode.pt: Assert.assertEquals(2.1581641260040683, value, MatsimTestUtils.EPSILON); break; // (a) 2.057596373646452
- case "matrixBasedPt": Assert.assertEquals(1.6542905235735796, value, MatsimTestUtils.EPSILON); break; // (a) 0.461863556339195
+ case "freespeed": Assertions.assertEquals(2.207441799716032, value, MatsimTestUtils.EPSILON); break; // (a) 2.1766435716006005
+ case TransportMode.car: Assertions.assertEquals(2.207441960299121, value, MatsimTestUtils.EPSILON); break; // (a) 2.176238564675181 (b) 2.207441799716032
+ case TransportMode.bike: Assertions.assertEquals(2.2645288908389554, value, MatsimTestUtils.EPSILON); break; // (a) 2.2445468698643367
+ case TransportMode.walk: Assertions.assertEquals(1.8697283849051263, value, MatsimTestUtils.EPSILON); break; // (a) 1.7719146868026079
+ case TransportMode.pt: Assertions.assertEquals(2.1581641260040683, value, MatsimTestUtils.EPSILON); break; // (a) 2.057596373646452
+ case "matrixBasedPt": Assertions.assertEquals(1.6542905235735796, value, MatsimTestUtils.EPSILON); break; // (a) 0.461863556339195
}
}
}
@@ -626,12 +626,12 @@ else if (tuple.getFirst().getCoord().getY() == 150.) {
for (String mode : accessibilitiesMap.get(tuple).keySet()) {
double value = accessibilitiesMap.get(tuple).get(mode);
switch (mode) {
- case "freespeed": Assert.assertEquals(2.235503385314382, value, MatsimTestUtils.EPSILON); break; // (a) 2.1486094237531126
- case TransportMode.car: Assert.assertEquals(2.23550352057971, value, MatsimTestUtils.EPSILON); break; // (a) 2.1482840466191093 (b) 2.235503385314382
- case TransportMode.bike: Assert.assertEquals(2.2833435568892395, value, MatsimTestUtils.EPSILON); break; // (a) 2.2257398663221
- case TransportMode.walk: Assert.assertEquals(1.9418539664691532, value, MatsimTestUtils.EPSILON); break; // (a) 1.70054725728361
- case TransportMode.pt: Assert.assertEquals(2.0032465393091434, value, MatsimTestUtils.EPSILON); break;
- case "matrixBasedPt": Assert.assertEquals(1.6542905235735796, value, MatsimTestUtils.EPSILON); break; // (a) 0.461863556339195
+ case "freespeed": Assertions.assertEquals(2.235503385314382, value, MatsimTestUtils.EPSILON); break; // (a) 2.1486094237531126
+ case TransportMode.car: Assertions.assertEquals(2.23550352057971, value, MatsimTestUtils.EPSILON); break; // (a) 2.1482840466191093 (b) 2.235503385314382
+ case TransportMode.bike: Assertions.assertEquals(2.2833435568892395, value, MatsimTestUtils.EPSILON); break; // (a) 2.2257398663221
+ case TransportMode.walk: Assertions.assertEquals(1.9418539664691532, value, MatsimTestUtils.EPSILON); break; // (a) 1.70054725728361
+ case TransportMode.pt: Assertions.assertEquals(2.0032465393091434, value, MatsimTestUtils.EPSILON); break;
+ case "matrixBasedPt": Assertions.assertEquals(1.6542905235735796, value, MatsimTestUtils.EPSILON); break; // (a) 0.461863556339195
}
}
}
@@ -639,12 +639,12 @@ else if (tuple.getFirst().getCoord().getY() == 150.) {
for (String mode : accessibilitiesMap.get(tuple).keySet()) {
double value = accessibilitiesMap.get(tuple).get(mode);
switch (mode) {
- case "freespeed": Assert.assertEquals(2.235503385314382, value, MatsimTestUtils.EPSILON); break; // (a) 2.2055702759681273
- case TransportMode.car: Assert.assertEquals(2.23550352057971, value, MatsimTestUtils.EPSILON); break; // (a) 2.2052225231109226 (b) 2.235503385314382
- case TransportMode.bike: Assert.assertEquals(2.2833435568892395, value, MatsimTestUtils.EPSILON); break; // (a) 2.2637376515333636
- case TransportMode.walk: Assert.assertEquals(1.9418539664691532, value, MatsimTestUtils.EPSILON); break; // (a) 1.851165291193725
- case TransportMode.pt: Assert.assertEquals(2.0032465393091434, value, MatsimTestUtils.EPSILON); break; // (a) 1.9202710265495115
- case "matrixBasedPt": Assert.assertEquals(1.5073890466447624, value, MatsimTestUtils.EPSILON); break; // (a) 0.624928280738513
+ case "freespeed": Assertions.assertEquals(2.235503385314382, value, MatsimTestUtils.EPSILON); break; // (a) 2.2055702759681273
+ case TransportMode.car: Assertions.assertEquals(2.23550352057971, value, MatsimTestUtils.EPSILON); break; // (a) 2.2052225231109226 (b) 2.235503385314382
+ case TransportMode.bike: Assertions.assertEquals(2.2833435568892395, value, MatsimTestUtils.EPSILON); break; // (a) 2.2637376515333636
+ case TransportMode.walk: Assertions.assertEquals(1.9418539664691532, value, MatsimTestUtils.EPSILON); break; // (a) 1.851165291193725
+ case TransportMode.pt: Assertions.assertEquals(2.0032465393091434, value, MatsimTestUtils.EPSILON); break; // (a) 1.9202710265495115
+ case "matrixBasedPt": Assertions.assertEquals(1.5073890466447624, value, MatsimTestUtils.EPSILON); break; // (a) 0.624928280738513
}
}
}
@@ -656,12 +656,12 @@ else if (tuple.getFirst().getCoord().getY() == 150.) {
for (String mode : accessibilitiesMap.get(tuple).keySet()) {
double value = accessibilitiesMap.get(tuple).get(mode);
switch (mode) {
- case "freespeed": Assert.assertEquals(3.5937361608359226, value, MatsimTestUtils.EPSILON); break; // (a) 3.534903784873003
- case TransportMode.car: Assert.assertEquals(3.592131321419011, value, MatsimTestUtils.EPSILON); break; // (a) 3.534578407739 (b) 3.592131222564318
- case TransportMode.bike: Assert.assertEquals(3.650823251958846, value, MatsimTestUtils.EPSILON); break; // (a) 3.6120342274419914
- case TransportMode.walk: Assert.assertEquals(3.256022746025017, value, MatsimTestUtils.EPSILON); break; // (a) 3.086841618403501
- case TransportMode.pt: Assert.assertEquals(3.5444584871239586, value, MatsimTestUtils.EPSILON); break;
- case "matrixBasedPt": Assert.assertEquals(3.0405848846934704, value, MatsimTestUtils.EPSILON); break; // (a) 1.8481579174590859
+ case "freespeed": Assertions.assertEquals(3.5937361608359226, value, MatsimTestUtils.EPSILON); break; // (a) 3.534903784873003
+ case TransportMode.car: Assertions.assertEquals(3.592131321419011, value, MatsimTestUtils.EPSILON); break; // (a) 3.534578407739 (b) 3.592131222564318
+ case TransportMode.bike: Assertions.assertEquals(3.650823251958846, value, MatsimTestUtils.EPSILON); break; // (a) 3.6120342274419914
+ case TransportMode.walk: Assertions.assertEquals(3.256022746025017, value, MatsimTestUtils.EPSILON); break; // (a) 3.086841618403501
+ case TransportMode.pt: Assertions.assertEquals(3.5444584871239586, value, MatsimTestUtils.EPSILON); break;
+ case "matrixBasedPt": Assertions.assertEquals(3.0405848846934704, value, MatsimTestUtils.EPSILON); break; // (a) 1.8481579174590859
}
}
}
@@ -669,12 +669,12 @@ else if (tuple.getFirst().getCoord().getY() == 150.) {
for (String mode : accessibilitiesMap.get(tuple).keySet()) {
double value = accessibilitiesMap.get(tuple).get(mode);
switch (mode) {
- case "freespeed": Assert.assertEquals(3.5937361608359226, value, MatsimTestUtils.EPSILON); break; // (a) 3.562937932720491
- case TransportMode.car: Assert.assertEquals(3.5937363214190112, value, MatsimTestUtils.EPSILON); break; // (a) 3.5625329257950717 (b) 3.5937361608359226
- case TransportMode.bike: Assert.assertEquals(3.650823251958846, value, MatsimTestUtils.EPSILON); break; // (a) 3.6308412309842275
- case TransportMode.walk: Assert.assertEquals(3.256022746025017, value, MatsimTestUtils.EPSILON); break; // (a) 3.1582090479224982
- case TransportMode.pt: Assert.assertEquals(3.5444584871239586, value, MatsimTestUtils.EPSILON); break; // (a) 3.443890734766343
- case "matrixBasedPt": Assert.assertEquals(3.0405848846934704, value, MatsimTestUtils.EPSILON); break; // (a) 1.8481579174590859
+ case "freespeed": Assertions.assertEquals(3.5937361608359226, value, MatsimTestUtils.EPSILON); break; // (a) 3.562937932720491
+ case TransportMode.car: Assertions.assertEquals(3.5937363214190112, value, MatsimTestUtils.EPSILON); break; // (a) 3.5625329257950717 (b) 3.5937361608359226
+ case TransportMode.bike: Assertions.assertEquals(3.650823251958846, value, MatsimTestUtils.EPSILON); break; // (a) 3.6308412309842275
+ case TransportMode.walk: Assertions.assertEquals(3.256022746025017, value, MatsimTestUtils.EPSILON); break; // (a) 3.1582090479224982
+ case TransportMode.pt: Assertions.assertEquals(3.5444584871239586, value, MatsimTestUtils.EPSILON); break; // (a) 3.443890734766343
+ case "matrixBasedPt": Assertions.assertEquals(3.0405848846934704, value, MatsimTestUtils.EPSILON); break; // (a) 1.8481579174590859
}
}
}
@@ -684,12 +684,12 @@ else if (tuple.getFirst().getCoord().getY() == 150.) {
for (String mode : accessibilitiesMap.get(tuple).keySet()) {
double value = accessibilitiesMap.get(tuple).get(mode);
switch (mode) {
- case "freespeed": Assert.assertEquals(3.621797746434273, value, MatsimTestUtils.EPSILON); break; // (a) 3.534903784873003
- case TransportMode.car: Assert.assertEquals(3.621797881699601, value, MatsimTestUtils.EPSILON); break; // (a) 3.534578407739 (b) 3.621797746434273
- case TransportMode.bike: Assert.assertEquals(3.66963791800913, value, MatsimTestUtils.EPSILON); break; // (a) 3.6120342274419914
- case TransportMode.walk: Assert.assertEquals(3.328148327589044, value, MatsimTestUtils.EPSILON); break; // (a) 3.086841618403501
- case TransportMode.pt: Assert.assertEquals(3.389540900429034, value, MatsimTestUtils.EPSILON); break;
- case "matrixBasedPt": Assert.assertEquals(3.0405848846934704, value, MatsimTestUtils.EPSILON); break; // (a) 1.8481579174590859
+ case "freespeed": Assertions.assertEquals(3.621797746434273, value, MatsimTestUtils.EPSILON); break; // (a) 3.534903784873003
+ case TransportMode.car: Assertions.assertEquals(3.621797881699601, value, MatsimTestUtils.EPSILON); break; // (a) 3.534578407739 (b) 3.621797746434273
+ case TransportMode.bike: Assertions.assertEquals(3.66963791800913, value, MatsimTestUtils.EPSILON); break; // (a) 3.6120342274419914
+ case TransportMode.walk: Assertions.assertEquals(3.328148327589044, value, MatsimTestUtils.EPSILON); break; // (a) 3.086841618403501
+ case TransportMode.pt: Assertions.assertEquals(3.389540900429034, value, MatsimTestUtils.EPSILON); break;
+ case "matrixBasedPt": Assertions.assertEquals(3.0405848846934704, value, MatsimTestUtils.EPSILON); break; // (a) 1.8481579174590859
}
}
}
@@ -697,12 +697,12 @@ else if (tuple.getFirst().getCoord().getY() == 150.) {
for (String mode : accessibilitiesMap.get(tuple).keySet()) {
double value = accessibilitiesMap.get(tuple).get(mode);
switch (mode) {
- case "freespeed": Assert.assertEquals(3.621797746434273, value, MatsimTestUtils.EPSILON); break; // (a) 3.5918646370880176
- case TransportMode.car: Assert.assertEquals(3.621797881699601, value, MatsimTestUtils.EPSILON); break; // (a) 3.591516884230813 (b) 3.621797746434273
- case TransportMode.bike: Assert.assertEquals(3.66963791800913, value, MatsimTestUtils.EPSILON); break; // (a) 3.6500320126532544
- case TransportMode.walk: Assert.assertEquals(3.328148327589044, value, MatsimTestUtils.EPSILON); break; // (a) 3.2374596523136154
- case TransportMode.pt: Assert.assertEquals(3.389540900429034, value, MatsimTestUtils.EPSILON); break; // (a) 3.3065653876694023
- case "matrixBasedPt": Assert.assertEquals(2.893683407764653, value, MatsimTestUtils.EPSILON); break; // (a) 2.0112226418584043
+ case "freespeed": Assertions.assertEquals(3.621797746434273, value, MatsimTestUtils.EPSILON); break; // (a) 3.5918646370880176
+ case TransportMode.car: Assertions.assertEquals(3.621797881699601, value, MatsimTestUtils.EPSILON); break; // (a) 3.591516884230813 (b) 3.621797746434273
+ case TransportMode.bike: Assertions.assertEquals(3.66963791800913, value, MatsimTestUtils.EPSILON); break; // (a) 3.6500320126532544
+ case TransportMode.walk: Assertions.assertEquals(3.328148327589044, value, MatsimTestUtils.EPSILON); break; // (a) 3.2374596523136154
+ case TransportMode.pt: Assertions.assertEquals(3.389540900429034, value, MatsimTestUtils.EPSILON); break; // (a) 3.3065653876694023
+ case "matrixBasedPt": Assertions.assertEquals(2.893683407764653, value, MatsimTestUtils.EPSILON); break; // (a) 2.0112226418584043
}
}
}
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/NetworkUtilTest.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/NetworkUtilTest.java
index 405bc54c3e9..cf03d50fa9d 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/NetworkUtilTest.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/NetworkUtilTest.java
@@ -21,9 +21,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
@@ -39,14 +39,14 @@
* @author dziemke
*/
public class NetworkUtilTest {
-
+
private static final Logger log = LogManager.getLogger(NetworkUtilTest.class);
-
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
-
+
+ @RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils();
+
@Test
- public void testNetworkUtil() {
+ void testNetworkUtil() {
/* create a sample network:
*
* (e) (f)
@@ -62,10 +62,10 @@ public void testNetworkUtil() {
*
* The network contains an exactly horizontal, an exactly vertical, an exactly diagonal
* and another link with no special slope to also test possible special cases.
- *
+ *
* why is that a "special case"? in a normal network all sort of slopes are *normally* present. dz, feb'16
*/
-
+
Network network = NetworkUtils.createNetwork();
Node node1 = NetworkUtils.createAndAddNode(network, Id.create("1", Node.class), new Coord((double) 0, (double) 0));
Node node2 = NetworkUtils.createAndAddNode(network, Id.create("2", Node.class), new Coord((double) 0, (double) 1000));
@@ -76,7 +76,7 @@ public void testNetworkUtil() {
Link link2 = NetworkUtils.createAndAddLink(network, Id.create("2", Link.class), node2, node3, 1500, 1, 3600, 1);
Link link3 = NetworkUtils.createAndAddLink(network, Id.create("3", Link.class), node3, node4, 1000, 1, 3600, 1);
Link link4 = NetworkUtils.createAndAddLink(network, Id.create("4", Link.class), node4, node5, 2800, 1, 3600, 1);
-
+
Coord a = new Coord(100., 0.);
Coord b = new Coord(100., 100.);
Coord c = new Coord(100., 1000.);
@@ -86,122 +86,122 @@ public void testNetworkUtil() {
Coord g = new Coord(2300., 2000.);
Coord h = new Coord(1700., 1000.);
Coord i = new Coord(0., 1200.);
-
-
+
+
Distances distanceA11 = NetworkUtil.getDistances2NodeViaGivenLink(a, link1, node1);
- Assert.assertEquals("distanceA11.getDistancePoint2Road()", 100., distanceA11.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceA11.getDistanceRoad2Node()", 0., distanceA11.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(100., distanceA11.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceA11.getDistancePoint2Road()");
+ Assertions.assertEquals(0., distanceA11.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceA11.getDistanceRoad2Node()");
+
Coord projectionA11 = CoordUtils.orthogonalProjectionOnLineSegment(link1.getFromNode().getCoord(), link1.getToNode().getCoord(), a);
- Assert.assertEquals("projectionA11.getX()", 0., projectionA11.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionA11.getY()", 0., projectionA11.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(0., projectionA11.getX(), MatsimTestUtils.EPSILON, "projectionA11.getX()");
+ Assertions.assertEquals(0., projectionA11.getY(), MatsimTestUtils.EPSILON, "projectionA11.getY()");
+
+
Distances distanceB11 = NetworkUtil.getDistances2NodeViaGivenLink(b, link1, node1);
- Assert.assertEquals("distanceB11.getDistancePoint2Road()", 100., distanceB11.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceB11.getDistanceRoad2Node()", 100., distanceB11.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(100., distanceB11.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceB11.getDistancePoint2Road()");
+ Assertions.assertEquals(100., distanceB11.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceB11.getDistanceRoad2Node()");
+
Coord projectionB11 = CoordUtils.orthogonalProjectionOnLineSegment(link1.getFromNode().getCoord(), link1.getToNode().getCoord(), b);
- Assert.assertEquals("projectionB11.getX()", 0., projectionB11.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionB11.getY()", 100., projectionB11.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(0., projectionB11.getX(), MatsimTestUtils.EPSILON, "projectionB11.getX()");
+ Assertions.assertEquals(100., projectionB11.getY(), MatsimTestUtils.EPSILON, "projectionB11.getY()");
+
+
Distances distanceB12 = NetworkUtil.getDistances2NodeViaGivenLink(b, link1, node2);
- Assert.assertEquals("distanceB12.getDistancePoint2Road()", 100., distanceB12.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceB12.getDistanceRoad2Node()", 900., distanceB12.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(100., distanceB12.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceB12.getDistancePoint2Road()");
+ Assertions.assertEquals(900., distanceB12.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceB12.getDistanceRoad2Node()");
+
Coord projectionB12 = CoordUtils.orthogonalProjectionOnLineSegment(link1.getFromNode().getCoord(), link1.getToNode().getCoord(), b);
- Assert.assertEquals("projectionB12.getX()", 0., projectionB12.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionB12.getY()", 100., projectionB12.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(0., projectionB12.getX(), MatsimTestUtils.EPSILON, "projectionB12.getX()");
+ Assertions.assertEquals(100., projectionB12.getY(), MatsimTestUtils.EPSILON, "projectionB12.getY()");
+
+
Distances distanceC11 = NetworkUtil.getDistances2NodeViaGivenLink(c, link1, node1);
- Assert.assertEquals("distanceC11.getDistancePoint2Road()", 100., distanceC11.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceC11.getDistanceRoad2Node()", 1000., distanceC11.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(100., distanceC11.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceC11.getDistancePoint2Road()");
+ Assertions.assertEquals(1000., distanceC11.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceC11.getDistanceRoad2Node()");
+
Coord projectionC11 = CoordUtils.orthogonalProjectionOnLineSegment(link1.getFromNode().getCoord(), link1.getToNode().getCoord(), c);
- Assert.assertEquals("projectionC11.getX()", 0., projectionC11.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionC11.getY()", 1000., projectionC11.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(0., projectionC11.getX(), MatsimTestUtils.EPSILON, "projectionC11.getX()");
+ Assertions.assertEquals(1000., projectionC11.getY(), MatsimTestUtils.EPSILON, "projectionC11.getY()");
+
+
Distances distanceC12 = NetworkUtil.getDistances2NodeViaGivenLink(c, link1, node2);
- Assert.assertEquals("distanceC12.getDistancePoint2Road()", 100., distanceC12.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceC12.getDistanceRoad2Node()", 0., distanceC12.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(100., distanceC12.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceC12.getDistancePoint2Road()");
+ Assertions.assertEquals(0., distanceC12.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceC12.getDistanceRoad2Node()");
+
Coord projectionC12 = CoordUtils.orthogonalProjectionOnLineSegment(link1.getFromNode().getCoord(), link1.getToNode().getCoord(), c);
- Assert.assertEquals("projectionC12.getX()", 0., projectionC12.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionC12.getY()", 1000., projectionC12.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(0., projectionC12.getX(), MatsimTestUtils.EPSILON, "projectionC12.getX()");
+ Assertions.assertEquals(1000., projectionC12.getY(), MatsimTestUtils.EPSILON, "projectionC12.getY()");
+
+
Distances distanceC22 = NetworkUtil.getDistances2NodeViaGivenLink(c, link2, node2);
- Assert.assertEquals("distanceC22.getDistancePoint2Road()", Math.sqrt(2.) / 2. * 100., distanceC22.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceC22.getDistanceRoad2Node()", Math.sqrt(2.) / 2. * 100., distanceC22.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(Math.sqrt(2.) / 2. * 100., distanceC22.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceC22.getDistancePoint2Road()");
+ Assertions.assertEquals(Math.sqrt(2.) / 2. * 100., distanceC22.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceC22.getDistanceRoad2Node()");
+
Coord projectionC22 = CoordUtils.orthogonalProjectionOnLineSegment(link2.getFromNode().getCoord(), link2.getToNode().getCoord(), c);
- Assert.assertEquals("projectionC22.getX()", 50., projectionC22.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionC22.getY()", 1050., projectionC22.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(50., projectionC22.getX(), MatsimTestUtils.EPSILON, "projectionC22.getX()");
+ Assertions.assertEquals(1050., projectionC22.getY(), MatsimTestUtils.EPSILON, "projectionC22.getY()");
+
+
Distances distanceC23 = NetworkUtil.getDistances2NodeViaGivenLink(c, link2, node3);
- Assert.assertEquals("distanceC23.getDistancePoint2Road()", Math.sqrt(2.) / 2. * 100., distanceC23.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceC23.getDistanceRoad2Node()", Math.sqrt(2) * 1000. - Math.sqrt(2.) / 2. * 100., distanceC23.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(Math.sqrt(2.) / 2. * 100., distanceC23.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceC23.getDistancePoint2Road()");
+ Assertions.assertEquals(Math.sqrt(2) * 1000. - Math.sqrt(2.) / 2. * 100., distanceC23.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceC23.getDistanceRoad2Node()");
+
Coord projectionC23 = CoordUtils.orthogonalProjectionOnLineSegment(link2.getFromNode().getCoord(), link2.getToNode().getCoord(), c);
- Assert.assertEquals("projectionC23.getX()", 50., projectionC23.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionC23.getY()", 1050., projectionC23.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(50., projectionC23.getX(), MatsimTestUtils.EPSILON, "projectionC23.getX()");
+ Assertions.assertEquals(1050., projectionC23.getY(), MatsimTestUtils.EPSILON, "projectionC23.getY()");
+
+
Distances distanceD22 = NetworkUtil.getDistances2NodeViaGivenLink(d, link2, node2);
- Assert.assertEquals("distanceD22.getDistancePoint2Road()", Math.sqrt(2.) / 2. * 100.0, distanceD22.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceD22.getDistanceRoad2Node()", Math.sqrt(2.) / 2. * 100.0 + Math.sqrt(2) * 200., distanceD22.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(Math.sqrt(2.) / 2. * 100.0, distanceD22.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceD22.getDistancePoint2Road()");
+ Assertions.assertEquals(Math.sqrt(2.) / 2. * 100.0 + Math.sqrt(2) * 200., distanceD22.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceD22.getDistanceRoad2Node()");
+
Coord projectionD22 = CoordUtils.orthogonalProjectionOnLineSegment(link2.getFromNode().getCoord(), link2.getToNode().getCoord(), d);
- Assert.assertEquals("projectionD22.getX()", 250., projectionD22.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionD22.getY()", 1250., projectionD22.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(250., projectionD22.getX(), MatsimTestUtils.EPSILON, "projectionD22.getX()");
+ Assertions.assertEquals(1250., projectionD22.getY(), MatsimTestUtils.EPSILON, "projectionD22.getY()");
+
+
Distances distanceD23 = NetworkUtil.getDistances2NodeViaGivenLink(d, link2, node3);
- Assert.assertEquals("distanceD23.getDistancePoint2Road()", Math.sqrt(2.)/2.*100.0, distanceD23.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceD23.getDistanceRoad2Node()", Math.sqrt(2.)/2.*100.0 + Math.sqrt(2) * 700., distanceD23.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(Math.sqrt(2.)/2.*100.0, distanceD23.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceD23.getDistancePoint2Road()");
+ Assertions.assertEquals(Math.sqrt(2.)/2.*100.0 + Math.sqrt(2) * 700., distanceD23.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceD23.getDistanceRoad2Node()");
+
Coord projectionD23 = CoordUtils.orthogonalProjectionOnLineSegment(link2.getFromNode().getCoord(), link2.getToNode().getCoord(), d);
- Assert.assertEquals("projectionD23.getX()", 250., projectionD23.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionD23.getY()", 1250., projectionD23.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(250., projectionD23.getX(), MatsimTestUtils.EPSILON, "projectionD23.getX()");
+ Assertions.assertEquals(1250., projectionD23.getY(), MatsimTestUtils.EPSILON, "projectionD23.getY()");
+
+
Distances distanceE33 = NetworkUtil.getDistances2NodeViaGivenLink(e, link3, node3);
- Assert.assertEquals("distanceE33.getDistancePoint2Road()", 100.0, distanceE33.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceE33.getDistanceRoad2Node()", 300.0, distanceE33.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(100.0, distanceE33.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceE33.getDistancePoint2Road()");
+ Assertions.assertEquals(300.0, distanceE33.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceE33.getDistanceRoad2Node()");
Coord projectionE33 = CoordUtils.orthogonalProjectionOnLineSegment(link3.getFromNode().getCoord(), link3.getToNode().getCoord(), e);
- Assert.assertEquals("projectionE33.getX()", 1300., projectionE33.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionE33.getY()", 2000., projectionE33.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(1300., projectionE33.getX(), MatsimTestUtils.EPSILON, "projectionE33.getX()");
+ Assertions.assertEquals(2000., projectionE33.getY(), MatsimTestUtils.EPSILON, "projectionE33.getY()");
+
+
Distances distanceE34 = NetworkUtil.getDistances2NodeViaGivenLink(e, link3, node4);
- Assert.assertEquals("distanceE34.getDistancePoint2Road()", 100.0, distanceE34.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceE34.getDistanceRoad2Node()", 700.0, distanceE34.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(100.0, distanceE34.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceE34.getDistancePoint2Road()");
+ Assertions.assertEquals(700.0, distanceE34.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceE34.getDistanceRoad2Node()");
Coord projectionE34 = CoordUtils.orthogonalProjectionOnLineSegment(link3.getFromNode().getCoord(), link3.getToNode().getCoord(), e);
- Assert.assertEquals("projectionE34.getX()", 1300., projectionE34.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionE34.getY()", 2000., projectionE34.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(1300., projectionE34.getX(), MatsimTestUtils.EPSILON, "projectionE34.getX()");
+ Assertions.assertEquals(2000., projectionE34.getY(), MatsimTestUtils.EPSILON, "projectionE34.getY()");
+
+
Distances distanceF33 = NetworkUtil.getDistances2NodeViaGivenLink(f, link3, node3);
- Assert.assertEquals("distanceF33.getDistancePoint2Road()", Math.sqrt(Math.pow(100, 2) + Math.pow(300, 2)), distanceF33.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceF33.getDistanceRoad2Node()", 1000., distanceF33.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(Math.sqrt(Math.pow(100, 2) + Math.pow(300, 2)), distanceF33.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceF33.getDistancePoint2Road()");
+ Assertions.assertEquals(1000., distanceF33.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceF33.getDistanceRoad2Node()");
+
Coord projectionF33 = CoordUtils.orthogonalProjectionOnLineSegment(link3.getFromNode().getCoord(), link3.getToNode().getCoord(), e);
- Assert.assertEquals("projectionF33.getX()", 1300., projectionF33.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionF33.getY()", 2000., projectionF33.getY(), MatsimTestUtils.EPSILON);
-
-
+ Assertions.assertEquals(1300., projectionF33.getX(), MatsimTestUtils.EPSILON, "projectionF33.getX()");
+ Assertions.assertEquals(2000., projectionF33.getY(), MatsimTestUtils.EPSILON, "projectionF33.getY()");
+
+
Distances distanceF34 = NetworkUtil.getDistances2NodeViaGivenLink(f, link3, node4);
- Assert.assertEquals("distanceF34.getDistancePoint2Road()", Math.sqrt(Math.pow(100, 2) + Math.pow(300, 2)), distanceF34.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("distanceF34.getDistanceRoad2Node()", 0., distanceF34.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON);
-
+ Assertions.assertEquals(Math.sqrt(Math.pow(100, 2) + Math.pow(300, 2)), distanceF34.getDistancePoint2Intersection(), MatsimTestUtils.EPSILON, "distanceF34.getDistancePoint2Road()");
+ Assertions.assertEquals(0., distanceF34.getDistanceIntersection2Node(), MatsimTestUtils.EPSILON, "distanceF34.getDistanceRoad2Node()");
+
Coord projectionF34 = CoordUtils.orthogonalProjectionOnLineSegment(link3.getFromNode().getCoord(), link3.getToNode().getCoord(), f);
- Assert.assertEquals("projectionF34.getX()", 2000., projectionF34.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("projectionF34.getY()", 2000., projectionF34.getY(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2000., projectionF34.getX(), MatsimTestUtils.EPSILON, "projectionF34.getX()");
+ Assertions.assertEquals(2000., projectionF34.getY(), MatsimTestUtils.EPSILON, "projectionF34.getY()");
}
-}
\ No newline at end of file
+}
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/TinyAccessibilityTest.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/TinyAccessibilityTest.java
index 29283b26ede..8c1e52924b4 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/TinyAccessibilityTest.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/TinyAccessibilityTest.java
@@ -23,9 +23,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
@@ -57,10 +57,10 @@ public class TinyAccessibilityTest {
private static final Logger LOG = LogManager.getLogger(TinyAccessibilityTest.class);
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void runFromEvents() {
+ void runFromEvents() {
final Config config = createTestConfig();
double min = 0.; // Values for bounding box usually come from a config file
@@ -86,7 +86,7 @@ public void runFromEvents() {
}
@Test
- public void testWithBoundingBox() {
+ void testWithBoundingBox() {
final Config config = createTestConfig();
double min = 0.; // Values for bounding box usually come from a config file
@@ -262,20 +262,20 @@ public void finish() {
LOG.warn("CHECK X = " + tuple.getFirst().getCoord().getX() + " -- Y = " + tuple.getFirst().getCoord().getY() + " -- car value = " + accessibilitiesMap.get(tuple).get(TransportMode.car));
if (tuple.getFirst().getCoord().getX() == 50.) {
if (tuple.getFirst().getCoord().getY() == 50.) {
- Assert.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
- Assert.assertEquals(-0.017240250823867296, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.017240250823867296, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
} else if (tuple.getFirst().getCoord().getY() == 150.) {
- Assert.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
- Assert.assertEquals(-0.017240250823867296, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.017240250823867296, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
}
}
if (tuple.getFirst().getCoord().getX() == 150.) {
if (tuple.getFirst().getCoord().getY() == 50.) {
- Assert.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0.27582980607476704, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.27582980607476704, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
} else if (tuple.getFirst().getCoord().getY() == 150.) {
- Assert.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0.27582980607476704, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.27582980607476704, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
}
}
}
diff --git a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/TinyMultimodalAccessibilityTest.java b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/TinyMultimodalAccessibilityTest.java
index bde5a98c612..43574962078 100644
--- a/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/TinyMultimodalAccessibilityTest.java
+++ b/contribs/accessibility/src/test/java/org/matsim/contrib/accessibility/run/TinyMultimodalAccessibilityTest.java
@@ -21,10 +21,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
@@ -65,11 +65,12 @@ public class TinyMultimodalAccessibilityTest {
private static final Logger LOG = LogManager.getLogger(TinyMultimodalAccessibilityTest.class);
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils();
+ // non-deterministic presumably because of multi-threading. kai, sep'19
@Test
- @Ignore // non-deterministic presumably because of multi-threading. kai, sep'19
- public void testWithBoundingBox() {
+ @Disabled
+ void testWithBoundingBox() {
final Config config = createTestConfig();
double min = 0.; // Values for bounding box usually come from a config file
@@ -309,24 +310,24 @@ public void finish() {
LOG.warn("CHECK X = " + tuple.getFirst().getCoord().getX() + " -- Y = " + tuple.getFirst().getCoord().getY() + " -- car value = " + accessibilitiesMap.get(tuple).get(TransportMode.car));
if (tuple.getFirst().getCoord().getX() == 50.) {
if (tuple.getFirst().getCoord().getY() == 50.) {
- Assert.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
- Assert.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0.0020510618020555325, accessibilitiesMap.get(tuple).get(TransportMode.pt), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.0020510618020555325, accessibilitiesMap.get(tuple).get(TransportMode.pt), MatsimTestUtils.EPSILON);
} else if (tuple.getFirst().getCoord().getY() == 150.) {
- Assert.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
- Assert.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
- Assert.assertEquals(-0.04152005026781742, accessibilitiesMap.get(tuple).get(TransportMode.pt), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.017248522428805767, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-0.04152005026781742, accessibilitiesMap.get(tuple).get(TransportMode.pt), MatsimTestUtils.EPSILON);
}
}
if (tuple.getFirst().getCoord().getX() == 150.) {
if (tuple.getFirst().getCoord().getY() == 50.) {
- Assert.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0.25069951470887114, accessibilitiesMap.get(tuple).get(TransportMode.pt), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.25069951470887114, accessibilitiesMap.get(tuple).get(TransportMode.pt), MatsimTestUtils.EPSILON);
} else if (tuple.getFirst().getCoord().getY() == 150.) {
- Assert.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0.25069951470887114, accessibilitiesMap.get(tuple).get(TransportMode.pt), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get("freespeed"), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.2758252376673665, accessibilitiesMap.get(tuple).get(TransportMode.car), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.25069951470887114, accessibilitiesMap.get(tuple).get(TransportMode.pt), MatsimTestUtils.EPSILON);
}
}
}
diff --git a/contribs/accidents/src/test/java/org/matsim/contrib/accidents/BvwpAccidentsCostComputationTest.java b/contribs/accidents/src/test/java/org/matsim/contrib/accidents/BvwpAccidentsCostComputationTest.java
index 9acd427bef7..3cb595ee1e6 100644
--- a/contribs/accidents/src/test/java/org/matsim/contrib/accidents/BvwpAccidentsCostComputationTest.java
+++ b/contribs/accidents/src/test/java/org/matsim/contrib/accidents/BvwpAccidentsCostComputationTest.java
@@ -2,8 +2,8 @@
import java.util.ArrayList;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
@@ -12,7 +12,7 @@
import org.matsim.api.core.v01.network.Node;
import org.matsim.core.network.NetworkUtils;
import org.matsim.testcases.MatsimTestUtils;
-;
+
/**
* @author ikaddoura, mmayobre
@@ -20,9 +20,9 @@
*
*/
public class BvwpAccidentsCostComputationTest {
-
+
@Test
- public void test1() {
+ void test1() {
Network network = NetworkUtils.createNetwork();
NetworkFactory factory = network.getFactory();
@@ -40,11 +40,11 @@ public void test1() {
list.add(2, 2); //2 Lanes
double costs = AccidentCostComputationBVWP.computeAccidentCosts(4820, link1, list);
- Assert.assertEquals("wrong cost", 1772.13863066011, costs, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1772.13863066011, costs, MatsimTestUtils.EPSILON, "wrong cost");
}
-
+
@Test
- public void test2() {
+ void test2() {
Network network = NetworkUtils.createNetwork();
NetworkFactory factory = network.getFactory();
@@ -62,11 +62,11 @@ public void test2() {
list.add(2, 2); //2 Lanes
double costs = AccidentCostComputationBVWP.computeAccidentCosts(1000, link1, list);
- Assert.assertEquals("wrong cost", 23.165, costs, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(23.165, costs, MatsimTestUtils.EPSILON, "wrong cost");
}
-
+
@Test
- public void test3() {
+ void test3() {
Network network = NetworkUtils.createNetwork();
NetworkFactory factory = network.getFactory();
@@ -84,6 +84,6 @@ public void test3() {
list.add(2, 3); //2 Lanes
double costs = AccidentCostComputationBVWP.computeAccidentCosts(1000, link1, list);
- Assert.assertEquals("wrong cost", 101.53, costs, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(101.53, costs, MatsimTestUtils.EPSILON, "wrong cost");
}
}
diff --git a/contribs/accidents/src/test/java/org/matsim/contrib/accidents/RunTest.java b/contribs/accidents/src/test/java/org/matsim/contrib/accidents/RunTest.java
index b98c144164f..f07d1d8d5f9 100644
--- a/contribs/accidents/src/test/java/org/matsim/contrib/accidents/RunTest.java
+++ b/contribs/accidents/src/test/java/org/matsim/contrib/accidents/RunTest.java
@@ -3,9 +3,9 @@
import java.io.BufferedReader;
import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.accidents.AccidentsConfigGroup.AccidentsComputationMethod;
@@ -24,10 +24,10 @@
*/
public class RunTest {
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void test1() {
+ void test1() {
String configFile = utils.getPackageInputDirectory() + "/trial_scenario/trial_scenario_config.xml";
String outputDirectory = utils.getOutputDirectory();
@@ -86,12 +86,12 @@ public void test1() {
if (lineCounter == 0 && column == 25) {
double accidentCosts = Double.valueOf(columns[column]);
- Assert.assertEquals("wrong accident costs", 10.38, accidentCosts , MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(10.38, accidentCosts , MatsimTestUtils.EPSILON, "wrong accident costs");
}
if (lineCounter == 1 && column == 25) {
double accidentCosts = Double.valueOf(columns[column]);
- Assert.assertEquals("wrong accident costs", 16.68, accidentCosts , MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(16.68, accidentCosts , MatsimTestUtils.EPSILON, "wrong accident costs");
}
}
diff --git a/contribs/accidents/src/test/java/org/matsim/contrib/accidents/RunTestEquil.java b/contribs/accidents/src/test/java/org/matsim/contrib/accidents/RunTestEquil.java
index d537b8c40e4..486baf7f3ec 100644
--- a/contribs/accidents/src/test/java/org/matsim/contrib/accidents/RunTestEquil.java
+++ b/contribs/accidents/src/test/java/org/matsim/contrib/accidents/RunTestEquil.java
@@ -1,10 +1,11 @@
package org.matsim.contrib.accidents;
import java.io.BufferedReader;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Link;
@@ -15,14 +16,14 @@
import org.matsim.core.controler.OutputDirectoryHierarchy.OverwriteFileSetting;
import org.matsim.core.scenario.ScenarioUtils;
import org.matsim.core.utils.io.IOUtils;
-import org.matsim.testcases.MatsimTestUtils;
-
+import org.matsim.testcases.MatsimTestUtils;
+
public class RunTestEquil {
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
-
- @Test
- public void test1() {
+ @RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils();
+
+ @Test
+ void test1() {
String configFile = utils.getPackageInputDirectory() + "/equil_scenario/config.xml";
String outputDirectory = utils.getOutputDirectory();
String runId = "run1";
@@ -88,7 +89,7 @@ public void test1() {
int agents = 100;
int lengthKM = 35;
double accidentCostsManualCalculation = (agents * lengthKM * 61.785) / 1000. * 10;
- Assert.assertEquals("wrong accident costs", accidentCostsManualCalculation, accidentCosts , 0.01);
+ Assertions.assertEquals(accidentCostsManualCalculation, accidentCosts , 0.01, "wrong accident costs");
}
// link 1
if (lineCounter == 11 && column == 121) {
@@ -96,7 +97,7 @@ public void test1() {
int agents = 100;
int lengthKM = 10;
double accidentCostsManualCalculation = (agents * lengthKM * 61.785) / 1000. * 10;
- Assert.assertEquals("wrong accident costs", accidentCostsManualCalculation, accidentCosts , 0.01);
+ Assertions.assertEquals(accidentCostsManualCalculation, accidentCosts , 0.01, "wrong accident costs");
}
// link 6
@@ -105,7 +106,7 @@ public void test1() {
int agents = 100;
int lengthKM = 10;
double accidentCostsManualCalculation = (agents * lengthKM * 34.735) / 1000. * 10;
- Assert.assertEquals("wrong accident costs", accidentCostsManualCalculation, accidentCosts , 0.01);
+ Assertions.assertEquals(accidentCostsManualCalculation, accidentCosts , 0.01, "wrong accident costs");
}
// link 15
@@ -114,7 +115,7 @@ public void test1() {
int agents = 100;
int lengthKM = 5;
double accidentCostsManualCalculation = (agents * lengthKM * 31.63) / 1000. * 10;
- Assert.assertEquals("wrong accident costs", accidentCostsManualCalculation, accidentCosts , 0.01);
+ Assertions.assertEquals(accidentCostsManualCalculation, accidentCosts , 0.01, "wrong accident costs");
}
}
diff --git a/contribs/analysis/pom.xml b/contribs/analysis/pom.xml
index 83989a7fcbf..3894c728d93 100644
--- a/contribs/analysis/pom.xml
+++ b/contribs/analysis/pom.xml
@@ -20,19 +20,19 @@
proj4j
0.1.0
-
- com.googlecode.json-simple
- json-simple
- 1.1.1
-
-
+
+ com.google.code.gson
+ gson
+ 2.10.1
+
+
org.apache.commons
commons-math3
org.apache.httpcomponents.client5
httpclient5
- 5.2.3
+ 5.3
diff --git a/contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidator.java b/contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidator.java
index b8aa76c34e1..7d35886428d 100644
--- a/contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidator.java
+++ b/contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidator.java
@@ -1,11 +1,11 @@
package org.matsim.contrib.analysis.vsp.traveltimedistance;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
import org.matsim.api.core.v01.Coord;
import org.matsim.core.utils.collections.Tuple;
import org.matsim.core.utils.geometry.CoordinateTransformation;
@@ -20,6 +20,7 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.Locale;
+import java.util.Optional;
public class GoogleMapRouteValidator implements TravelTimeDistanceValidator {
private static final Logger log = LogManager.getLogger(GoogleMapRouteValidator.class);
@@ -51,9 +52,6 @@ public Tuple getTravelTime(NetworkTrip trip) {
@Override
public Tuple getTravelTime(Coord fromCoord, Coord toCoord, double departureTime, String tripId) {
- long travelTime = 0;
- long distance = 0;
-
double adjustedDepartureTime = calculateGoogleDepartureTime(departureTime);
Coord from = ct.transform(fromCoord);
Coord to = ct.transform(toCoord);
@@ -71,32 +69,46 @@ public Tuple getTravelTime(Coord fromCoord, Coord toCoord, doubl
"&origins=" + df.format(from.getY()) + "%2C" + df.format(from.getX()) +
"&key=" + apiAccessKey;
+ log.info(urlString);
+
+ Optional> result;
try {
- log.info(urlString);
URL url = new URL(urlString);
- try (BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()))) {
- JSONParser jp = new JSONParser();
- JSONObject jsonObject = (JSONObject) jp.parse(in);
- JSONArray rows = (JSONArray) jsonObject.get("rows");
- if (!rows.isEmpty()) {
- JSONArray elements = (JSONArray) ((JSONObject) rows.get(0)).get("elements");
- JSONObject results = (JSONObject) elements.get(0);
- if (results.containsKey("distance")) {
- JSONObject distanceResults = (JSONObject) results.get("distance");
- distance = (long) distanceResults.get("value");
- }
- if (results.containsKey("duration_in_traffic")) {
- JSONObject timeResults = (JSONObject) results.get("duration_in_traffic");
- travelTime = (long) timeResults.get("value");
- }
- }
- }
- } catch (IOException | ParseException e) {
+ BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
+ result = readFromJson(in);
+ } catch (IOException e) {
log.error("The contents on the URL cannot be read properly. Please check your API or check the contents on URL manually", e);
+ result = Optional.empty();
}
- return new Tuple<>((double) travelTime, (double) distance);
+ return result.orElse(new Tuple<>(0.0, 0.0));
}
+ Optional> readFromJson(BufferedReader reader) throws IOException {
+ JsonElement jsonElement = JsonParser.parseReader(reader);
+ if(!jsonElement.isJsonObject()){
+ return Optional.empty();
+ }
+ JsonObject jsonObject = jsonElement.getAsJsonObject();
+ JsonArray rows = jsonObject.getAsJsonArray("rows");
+
+ if (rows.isEmpty()) {
+ return Optional.empty();
+ }
+
+ JsonObject results = rows.get(0).getAsJsonObject().get("elements").getAsJsonArray().get(0).getAsJsonObject();
+
+ if (!results.has("distance") && !results.has("duration_in_traffic")) {
+ return Optional.empty();
+ }
+
+ JsonObject distanceResults = results.get("distance").getAsJsonObject();
+ double distance = distanceResults.get("value").getAsDouble();
+ JsonObject timeResults = results.get("duration_in_traffic").getAsJsonObject();
+ double travelTime = timeResults.get("value").getAsDouble();
+
+ return Optional.of(new Tuple<>(travelTime, distance));
+ }
+
private double calculateGoogleDepartureTime(double departureTime) {
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDate googleDate0 = LocalDate.parse("1970-01-01", dateTimeFormatter);
diff --git a/contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidator.java b/contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidator.java
index 9af9cff72c9..b437d7dffb8 100644
--- a/contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidator.java
+++ b/contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidator.java
@@ -28,13 +28,14 @@
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.Locale;
+import java.util.Optional;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
import org.matsim.api.core.v01.Coord;
import org.matsim.core.utils.collections.Tuple;
import org.matsim.core.utils.geometry.CoordinateTransformation;
@@ -91,9 +92,6 @@ public Tuple getTravelTime(NetworkTrip trip) {
@Override
public Tuple getTravelTime(Coord fromCoord, Coord toCoord, double departureTime, String tripId) {
- long travelTime = 0;
- long distance = 0;
-
Coord from = transformation.transform(fromCoord);
Coord to = transformation.transform(toCoord);
@@ -110,36 +108,48 @@ public Tuple getTravelTime(Coord fromCoord, Coord toCoord, doubl
log.info(urlString);
+ Optional> result;
try {
URL url = new URL(urlString);
BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
- JSONParser jp = new JSONParser();
- JSONObject jsonObject = (JSONObject) jp.parse(in);
- JSONArray routes = (JSONArray) jsonObject.get("routes");
-
- if (!routes.isEmpty()) {
- JSONObject route = (JSONObject) routes.get(0);
- JSONArray sections = (JSONArray) route.get("sections");
- JSONObject section = (JSONObject) sections.get(0);
- JSONObject summary = (JSONObject) section.get("summary");
- travelTime = (long) summary.get("duration");
- distance = (long) summary.get("length");
- if (writeDetailedFiles) {
- String filename = outputPath + "/" + tripId + ".json.gz";
- BufferedWriter bw = IOUtils.getBufferedWriter(filename);
- bw.write(jsonObject.toString());
- bw.flush();
- bw.close();
- }
- }
-
- in.close();
+ result = readFromJson(in, tripId);
} catch (MalformedURLException e) {
log.error("URL is not working. Please check your API key", e);
- } catch (IOException | ParseException e) {
+ result = Optional.empty();
+ } catch (IOException e) {
log.error("Cannot read the content on the URL properly. Please manually check the URL", e);
+ result = Optional.empty();
}
- return new Tuple((double) travelTime, (double) distance);
+ return result.orElse(new Tuple<>(0.0, 0.0));
}
+ Optional> readFromJson(BufferedReader reader, String tripId) throws IOException {
+ JsonElement jsonElement = JsonParser.parseReader(reader);
+ if(!jsonElement.isJsonObject()){
+ return Optional.empty();
+ }
+ JsonObject jsonObject = jsonElement.getAsJsonObject();
+ JsonArray routes = jsonObject.getAsJsonArray("routes");
+
+ if(routes.isEmpty()){
+ return Optional.empty();
+ }
+
+ JsonObject route = routes.get(0).getAsJsonObject();
+ JsonArray sections = route.get("sections").getAsJsonArray();
+ JsonObject section = sections.get(0).getAsJsonObject();
+ JsonObject summary = section.get("summary").getAsJsonObject();
+ double travelTime = summary.get("duration").getAsDouble();
+ double distance = summary.get("length").getAsDouble();
+ if (writeDetailedFiles) {
+ String filename = outputPath + "/" + tripId + ".json.gz";
+ BufferedWriter bw = IOUtils.getBufferedWriter(filename);
+ bw.write(jsonObject.toString());
+ bw.flush();
+ bw.close();
+ }
+ reader.close();
+ return Optional.of(new Tuple<>(travelTime, distance));
+ }
+
}
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/filters/population/PersonIntersectAreaFilterTest.java b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/filters/population/PersonIntersectAreaFilterTest.java
index 2c856118e92..aed33926f02 100644
--- a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/filters/population/PersonIntersectAreaFilterTest.java
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/filters/population/PersonIntersectAreaFilterTest.java
@@ -20,13 +20,13 @@
package org.matsim.contrib.analysis.filters.population;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.HashMap;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.TransportMode;
@@ -51,11 +51,12 @@
*/
public class PersonIntersectAreaFilterTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
- @Test public void testFilter() throws Exception {
+ @Test
+ void testFilter() throws Exception {
/* create a simple network where agents can drive from the lower left
* to the upper right */
Network network = NetworkUtils.createNetwork();
@@ -113,25 +114,25 @@ public class PersonIntersectAreaFilterTest {
aoi.clear();
aoi.put(link2.getId(), link2);
filter = new PersonIntersectAreaFilter(null, aoi, network);
- assertTrue("test route through aoi", filter.judge(person));
+ assertTrue(filter.judge(person), "test route through aoi");
// test departure link
aoi.clear();
aoi.put(link0.getId(), link0);
filter = new PersonIntersectAreaFilter(null, aoi, network);
- assertTrue("test departure link as aoi", filter.judge(person));
+ assertTrue(filter.judge(person), "test departure link as aoi");
// test arrival link
aoi.clear();
aoi.put(link5.getId(), link5);
filter = new PersonIntersectAreaFilter(null, aoi, network);
- assertTrue("test arrival link as aoi", filter.judge(person));
+ assertTrue(filter.judge(person), "test arrival link as aoi");
// test route outside aoi
aoi.clear();
aoi.put(link4.getId(), link4);
filter = new PersonIntersectAreaFilter(null, aoi, network);
- assertFalse("test route outside aoi", filter.judge(person));
+ assertFalse(filter.judge(person), "test route outside aoi");
// prepare bee-line tests
leg.setMode(TransportMode.walk);
@@ -141,21 +142,21 @@ public class PersonIntersectAreaFilterTest {
aoi.clear();
aoi.put(link2.getId(), link2);
filter = new PersonIntersectAreaFilter(null, aoi, network);
- assertFalse("test bee-line without alternative aoi", filter.judge(person));
+ assertFalse(filter.judge(person), "test bee-line without alternative aoi");
// test bee-line with too small alternative aoi
aoi.clear();
aoi.put(link2.getId(), link2);
filter = new PersonIntersectAreaFilter(null, aoi, network);
filter.setAlternativeAOI(new Coord((double) 100, (double) 0), 20.0);
- assertFalse("test bee-line with too small alternative aoi", filter.judge(person));
+ assertFalse(filter.judge(person), "test bee-line with too small alternative aoi");
// test bee-line with big enough alternative aoi
aoi.clear();
aoi.put(link2.getId(), link2);
filter = new PersonIntersectAreaFilter(null, aoi, network);
filter.setAlternativeAOI(new Coord((double) 100, (double) 0), 80.0);
- assertTrue("test bee-line with big enough alternative aoi", filter.judge(person));
+ assertTrue(filter.judge(person), "test bee-line with big enough alternative aoi");
}
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/filters/population/RouteLinkFilterTest.java b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/filters/population/RouteLinkFilterTest.java
index 01f4b00a334..c434dca8a24 100644
--- a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/filters/population/RouteLinkFilterTest.java
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/filters/population/RouteLinkFilterTest.java
@@ -20,11 +20,11 @@
package org.matsim.contrib.analysis.filters.population;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
@@ -50,11 +50,12 @@
public class RouteLinkFilterTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
- @Test public void testRouteLinkFilter() {
+ @Test
+ void testRouteLinkFilter() {
// used to set the default dtd-location
utils.loadConfig((String)null);
Population population = getTestPopulation();
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/kai/KNAnalysisEventsHandlerTest.java b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/kai/KNAnalysisEventsHandlerTest.java
index 8d6e64b29f9..67352fcabbf 100644
--- a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/kai/KNAnalysisEventsHandlerTest.java
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/kai/KNAnalysisEventsHandlerTest.java
@@ -22,12 +22,12 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
@@ -55,10 +55,10 @@
public class KNAnalysisEventsHandlerTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ public MatsimTestUtils utils = new MatsimTestUtils();
- // yy this test is probably not doing anything with respect to some of the newer statistics, such as money. kai, mar'14
+ // yy this test is probably not doing anything with respect to some of the newer statistics, such as money. kai, mar'14
public static final String BASE_FILE_NAME = "stats_";
public final Id DEFAULT_PERSON_ID = Id.create(123, Person.class);
@@ -68,7 +68,7 @@ public class KNAnalysisEventsHandlerTest {
private Population population = null ;
private Network network = null ;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
scenario = ScenarioUtils.createScenario(ConfigUtils.createConfig());
@@ -101,15 +101,15 @@ public void setUp() throws Exception {
this.network.addLink(link);
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
this.population = null;
this.network = null;
}
- @Test
- @Ignore
- public void testNoEvents() {
+ @Test
+ @Disabled
+ void testNoEvents() {
KNAnalysisEventsHandler testee = new KNAnalysisEventsHandler(this.scenario);
@@ -121,10 +121,10 @@ public void testNoEvents() {
this.runTest(testee);
}
- @Test
- @Ignore
- public void testAveraging() {
- // yy this test is probably not doing anything with respect to some of the newer statistics, such as money. kai, mar'14
+ @Test
+ @Disabled
+ void testAveraging() {
+ // yy this test is probably not doing anything with respect to some of the newer statistics, such as money. kai, mar'14
KNAnalysisEventsHandler testee = new KNAnalysisEventsHandler(this.scenario);
@@ -172,7 +172,7 @@ protected void runTest(KNAnalysisEventsHandler calcLegTimes) {
LogManager.getLogger(this.getClass()).info( "comparing " + str );
final long expectedChecksum = CRCChecksum.getCRCFromFile(utils.getInputDirectory() + str);
final long actualChecksum = CRCChecksum.getCRCFromFile(utils.getOutputDirectory() + str);
- Assert.assertEquals("Output files differ.", expectedChecksum, actualChecksum);
+ Assertions.assertEquals(expectedChecksum, actualChecksum, "Output files differ.");
}
}
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/spatial/GridTest.java b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/spatial/GridTest.java
index a3253515666..804de493d3a 100644
--- a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/spatial/GridTest.java
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/spatial/GridTest.java
@@ -1,17 +1,17 @@
package org.matsim.contrib.analysis.spatial;
-import static org.junit.Assert.assertEquals;
-
import java.util.Collection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.GeometryFactory;
public class GridTest {
- @Test
- public void initializeSquareGrid() {
+ @Test
+ void initializeSquareGrid() {
final String testValue = "Test-value";
Grid grid = new SquareGrid<>(2, () -> testValue, SpatialTestUtils.createRect(10, 10));
@@ -23,8 +23,8 @@ public void initializeSquareGrid() {
values.forEach(value -> assertEquals(testValue, value.getValue()));
}
- @Test
- public void initializeHexagonalGrid() {
+ @Test
+ void initializeHexagonalGrid() {
final String testValue = "test-value";
Grid grid = new HexagonalGrid<>(2, () -> testValue, SpatialTestUtils.createRect(10, 10));
@@ -38,8 +38,8 @@ public void initializeHexagonalGrid() {
values.forEach(value -> assertEquals(testValue, value.getValue()));
}
- @Test
- public void getArea_squareGrid() {
+ @Test
+ void getArea_squareGrid() {
final double horizontalDistance = 2;
final double expected = 2 * 2; // area of square is d^2
@@ -49,8 +49,8 @@ public void getArea_squareGrid() {
assertEquals(expected, grid.getCellArea(), 0.0001);
}
- @Test
- public void getArea_HexagonalGrid() {
+ @Test
+ void getArea_HexagonalGrid() {
// actually area of hexagon is r^2 * sqrt(3)/2
final double horizontalDistance = 2;
@@ -65,8 +65,8 @@ public void getArea_HexagonalGrid() {
assertEquals(expected5, grid5.getCellArea(), 0.0001);
}
- @Test
- public void getValue_withExactCoord() {
+ @Test
+ void getValue_withExactCoord() {
final String testValue = "initialValue";
final Coordinate expectedCoordinate = new Coordinate(2, 1+Math.sqrt(3));
@@ -77,8 +77,8 @@ public void getValue_withExactCoord() {
assertEquals(expectedCoordinate, result.getCoordinate());
}
- @Test
- public void getValue_closeCoordinate() {
+ @Test
+ void getValue_closeCoordinate() {
final String testValue = "initialValue";
Grid grid = new HexagonalGrid<>(2, () -> testValue, SpatialTestUtils.createRect(10, 10));
@@ -89,8 +89,8 @@ public void getValue_closeCoordinate() {
assertEquals(new Coordinate(2, 1+Math.sqrt(3)), result.getCoordinate());
}
- @Test
- public void getValue_coordOutsideOfGrid() {
+ @Test
+ void getValue_coordOutsideOfGrid() {
final String testValue = "initialValue";
Grid grid = new HexagonalGrid<>(2, () -> testValue, SpatialTestUtils.createRect(10, 10));
@@ -100,8 +100,8 @@ public void getValue_coordOutsideOfGrid() {
assertEquals(new Coordinate(8, 1 + 5*Math.sqrt(3)), result.getCoordinate());
}
- @Test
- public void getValues() {
+ @Test
+ void getValues() {
final String testValue = "initialValue";
Grid grid = new HexagonalGrid<>(2, () -> testValue, SpatialTestUtils.createRect(10, 10));
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/spatial/SpatialInterpolationTest.java b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/spatial/SpatialInterpolationTest.java
index 49e3f8e4a8a..1fe102d3534 100644
--- a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/spatial/SpatialInterpolationTest.java
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/spatial/SpatialInterpolationTest.java
@@ -1,15 +1,14 @@
package org.matsim.contrib.analysis.spatial;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.locationtech.jts.geom.Coordinate;
public class SpatialInterpolationTest {
- @Test
- public void calculateWeightFromLine() {
+ @Test
+ void calculateWeightFromLine() {
final Coordinate from = new Coordinate(1, 1);
final Coordinate to = new Coordinate(4, 5);
@@ -22,33 +21,37 @@ public void calculateWeightFromLine() {
assertEquals(0.0011109434390476694, weight, 0.001);
}
- @Test(expected = IllegalArgumentException.class)
- public void calculateWeightFromLine_invalidSmoothingRadius() {
+ @Test
+ void calculateWeightFromLine_invalidSmoothingRadius() {
+ assertThrows(IllegalArgumentException.class, () -> {
- final Coordinate from = new Coordinate(0, 1);
- final Coordinate to = new Coordinate(10, 1);
- final Coordinate cellCentroid = new Coordinate(5, 1);
- final double smoothingRadius = 0;
+ final Coordinate from = new Coordinate(0, 1);
+ final Coordinate to = new Coordinate(10, 1);
+ final Coordinate cellCentroid = new Coordinate(5, 1);
+ final double smoothingRadius = 0;
- double weight = SpatialInterpolation.calculateWeightFromLine(from, to, cellCentroid, smoothingRadius);
+ double weight = SpatialInterpolation.calculateWeightFromLine(from, to, cellCentroid, smoothingRadius);
- fail("smoothing radius <= 0 should cause exception");
- }
+ fail("smoothing radius <= 0 should cause exception");
+ });
+ }
- @Test(expected = IllegalArgumentException.class)
- public void calculateWeightFromPoint_invalidSmoothingRadius() {
+ @Test
+ void calculateWeightFromPoint_invalidSmoothingRadius() {
+ assertThrows(IllegalArgumentException.class, () -> {
- final Coordinate source = new Coordinate(10, 10);
- final Coordinate centroid = new Coordinate(10, 10);
- final double smoothingRadius = 0;
+ final Coordinate source = new Coordinate(10, 10);
+ final Coordinate centroid = new Coordinate(10, 10);
+ final double smoothingRadius = 0;
- double weight = SpatialInterpolation.calculateWeightFromPoint(source, centroid, smoothingRadius);
+ double weight = SpatialInterpolation.calculateWeightFromPoint(source, centroid, smoothingRadius);
- fail("smoothing radius <= 0 should cause exception");
- }
+ fail("smoothing radius <= 0 should cause exception");
+ });
+ }
- @Test
- public void calculateWeightFromPoint() {
+ @Test
+ void calculateWeightFromPoint() {
final Coordinate point = new Coordinate(5, 5);
final Coordinate cell = new Coordinate (9, 5);
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/time/TimeBinMapTest.java b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/time/TimeBinMapTest.java
index a15b076f567..13e5e7f291c 100644
--- a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/time/TimeBinMapTest.java
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/time/TimeBinMapTest.java
@@ -1,15 +1,15 @@
package org.matsim.contrib.analysis.time;
-import org.junit.Test;
-
import java.util.Map;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
public class TimeBinMapTest {
- @Test
- public void getTimeBin() {
+ @Test
+ void getTimeBin() {
TimeBinMap> map = new TimeBinMap<>(10);
@@ -18,8 +18,8 @@ public void getTimeBin() {
assertEquals(10, bin.getStartTime(), 0.001);
}
- @Test
- public void getTimeBinWithStartTime() {
+ @Test
+ void getTimeBinWithStartTime() {
TimeBinMap> map = new TimeBinMap<>(10, 20);
@@ -28,18 +28,20 @@ public void getTimeBinWithStartTime() {
assertEquals(20, bin.getStartTime(), 0.001);
}
- @Test(expected = IllegalArgumentException.class)
- public void getTimeInvalidTime_exception() {
+ @Test
+ void getTimeInvalidTime_exception() {
+ assertThrows(IllegalArgumentException.class, () -> {
- TimeBinMap> map = new TimeBinMap<>(10, 20);
+ TimeBinMap> map = new TimeBinMap<>(10, 20);
- TimeBinMap.TimeBin> bin = map.getTimeBin(19);
+ TimeBinMap.TimeBin> bin = map.getTimeBin(19);
- assertEquals(20, bin.getStartTime(), 0.001);
- }
+ assertEquals(20, bin.getStartTime(), 0.001);
+ });
+ }
- @Test
- public void getMultipleTimeBins() {
+ @Test
+ void getMultipleTimeBins() {
TimeBinMap> map = new TimeBinMap<>(10);
@@ -55,8 +57,8 @@ public void getMultipleTimeBins() {
assertEquals(30, fourth.getStartTime(), 0.001);
}
- @Test
- public void getEndOfLastTimeBucket() {
+ @Test
+ void getEndOfLastTimeBucket() {
TimeBinMap> map = new TimeBinMap<>(10);
@@ -68,8 +70,8 @@ public void getEndOfLastTimeBucket() {
assertEquals(120, map.getEndTimeOfLastBin(), 0.0001);
}
- @Test
- public void getAllTimeBins() {
+ @Test
+ void getAllTimeBins() {
TimeBinMap> map = new TimeBinMap<>(10);
@@ -81,8 +83,8 @@ public void getAllTimeBins() {
assertEquals(4, map.getTimeBins().size());
}
- @Test
- public void timeBin_setEntry() {
+ @Test
+ void timeBin_setEntry() {
final String testValue = "some-value";
@@ -97,7 +99,7 @@ public void timeBin_setEntry() {
}
@Test
- public void timeBin_getValue() {
+ void timeBin_getValue() {
final String testValue = "some-value";
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidatorTest.java b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidatorTest.java
new file mode 100644
index 00000000000..96b87268dc9
--- /dev/null
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidatorTest.java
@@ -0,0 +1,32 @@
+package org.matsim.contrib.analysis.vsp.traveltimedistance;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.matsim.core.utils.collections.Tuple;
+import org.matsim.testcases.MatsimTestUtils;
+
+import java.io.*;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class GoogleMapRouteValidatorTest {
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
+
+ @Test
+ void testReadJson() throws IOException {
+ GoogleMapRouteValidator googleMapRouteValidator = getDummyValidator();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(utils.getClassInputDirectory() + "route.json")));
+ Optional> result = googleMapRouteValidator.readFromJson(reader);
+ assertTrue(result.isPresent());
+ assertEquals(413, result.get().getFirst(), MatsimTestUtils.EPSILON);
+ assertEquals(2464, result.get().getSecond(), MatsimTestUtils.EPSILON);
+ }
+
+ //All values with null filled are not necessary for this test
+ private GoogleMapRouteValidator getDummyValidator() {
+ return new GoogleMapRouteValidator(utils.getOutputDirectory(), null, null, null, null);
+ }
+}
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidatorTest.java b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidatorTest.java
new file mode 100644
index 00000000000..bd95386c9a0
--- /dev/null
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidatorTest.java
@@ -0,0 +1,39 @@
+package org.matsim.contrib.analysis.vsp.traveltimedistance;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.matsim.core.utils.collections.Tuple;
+import org.matsim.testcases.MatsimTestUtils;
+
+import java.io.*;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class HereMapsRouteValidatorTest {
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
+
+ @Test
+ void testReadJson() throws IOException {
+ HereMapsRouteValidator hereMapsRouteValidator = getDummyValidator(false);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(utils.getClassInputDirectory() + "route.json")));
+ Optional> result = hereMapsRouteValidator.readFromJson(reader, null);
+ assertTrue(result.isPresent());
+ assertEquals(394, result.get().getFirst(), MatsimTestUtils.EPSILON);
+ assertEquals(2745, result.get().getSecond(), MatsimTestUtils.EPSILON);
+ }
+
+ @Test
+ void testWriteFile() throws IOException {
+ HereMapsRouteValidator hereMapsRouteValidator = getDummyValidator(true);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(utils.getClassInputDirectory() + "route.json")));
+ hereMapsRouteValidator.readFromJson(reader, "tripId");
+ assertTrue(new File(utils.getOutputDirectory() + "tripId.json.gz").isFile());
+ }
+
+ //All values with null filled are not necessary for this test
+ private HereMapsRouteValidator getDummyValidator(boolean writeDetailedFiles) {
+ return new HereMapsRouteValidator(utils.getOutputDirectory(), null, null, null, null, writeDetailedFiles);
+ }
+}
diff --git a/contribs/analysis/src/test/java/org/matsim/contrib/travelsummary/events2traveldiaries/RunEventsToTravelDiariesIT.java b/contribs/analysis/src/test/java/org/matsim/contrib/travelsummary/events2traveldiaries/RunEventsToTravelDiariesIT.java
index 2fd76b243bd..c3a4f24d7fd 100644
--- a/contribs/analysis/src/test/java/org/matsim/contrib/travelsummary/events2traveldiaries/RunEventsToTravelDiariesIT.java
+++ b/contribs/analysis/src/test/java/org/matsim/contrib/travelsummary/events2traveldiaries/RunEventsToTravelDiariesIT.java
@@ -18,20 +18,20 @@
* *********************************************************************** */
package org.matsim.contrib.travelsummary.events2traveldiaries;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
/**
* @author nagel
*/
public class RunEventsToTravelDiariesIT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ public MatsimTestUtils utils = new MatsimTestUtils();
- @SuppressWarnings("static-method")
- @Test
- public final void test() {
+ @SuppressWarnings("static-method")
+ @Test
+ final void test() {
String[] str = {"../../examples/scenarios/equil/config.xml", "../../examples/scenarios/equil/output_events.xml.gz", "_test", utils.getOutputDirectory()};
// This goes through the file system (nothing to do with resource paths etc.)
diff --git a/contribs/analysis/test/input/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidatorTest/route.json b/contribs/analysis/test/input/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidatorTest/route.json
new file mode 100644
index 00000000000..14e61b35177
--- /dev/null
+++ b/contribs/analysis/test/input/org/matsim/contrib/analysis/vsp/traveltimedistance/GoogleMapRouteValidatorTest/route.json
@@ -0,0 +1,30 @@
+{
+ "destination_addresses": [
+ "Kaiserin-Augusta-Allee 104, 10553 Berlin, Germany"
+ ],
+ "origin_addresses": [
+ "B2 135, 10623 Berlin, Germany"
+ ],
+ "rows": [
+ {
+ "elements": [
+ {
+ "distance": {
+ "text": "2.5 km",
+ "value": 2464
+ },
+ "duration": {
+ "text": "7 mins",
+ "value": 400
+ },
+ "duration_in_traffic": {
+ "text": "7 mins",
+ "value": 413
+ },
+ "status": "OK"
+ }
+ ]
+ }
+ ],
+ "status": "OK"
+}
\ No newline at end of file
diff --git a/contribs/analysis/test/input/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidatorTest/route.json b/contribs/analysis/test/input/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidatorTest/route.json
new file mode 100644
index 00000000000..2dfdae5e032
--- /dev/null
+++ b/contribs/analysis/test/input/org/matsim/contrib/analysis/vsp/traveltimedistance/HereMapsRouteValidatorTest/route.json
@@ -0,0 +1,49 @@
+{
+ "routes": [
+ {
+ "id": "ed5396be-8f97-4c25-a373-a019da78b696",
+ "sections": [
+ {
+ "id": "5f0ff311-d1d0-4a6a-a631-1c59fd5eaee4",
+ "type": "vehicle",
+ "departure": {
+ "time": "2023-12-11T10:00:00+01:00",
+ "place": {
+ "type": "place",
+ "location": {
+ "lat": 52.5127381,
+ "lng": 13.3268076
+ },
+ "originalLocation": {
+ "lat": 52.512638,
+ "lng": 13.326826
+ }
+ }
+ },
+ "arrival": {
+ "time": "2023-12-11T10:06:34+01:00",
+ "place": {
+ "type": "place",
+ "location": {
+ "lat": 52.5258281,
+ "lng": 13.3209817
+ },
+ "originalLocation": {
+ "lat": 52.5256489,
+ "lng": 13.320944
+ }
+ }
+ },
+ "summary": {
+ "duration": 394,
+ "length": 2745,
+ "baseDuration": 325
+ },
+ "transport": {
+ "mode": "car"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/contribs/application/src/main/java/org/matsim/application/options/ShpOptions.java b/contribs/application/src/main/java/org/matsim/application/options/ShpOptions.java
index d4c7b45342f..4537c88bfb9 100644
--- a/contribs/application/src/main/java/org/matsim/application/options/ShpOptions.java
+++ b/contribs/application/src/main/java/org/matsim/application/options/ShpOptions.java
@@ -7,9 +7,7 @@
import org.geotools.data.shapefile.ShapefileDataStore;
import org.geotools.data.shapefile.ShapefileDataStoreFactory;
import org.geotools.referencing.CRS;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.Envelope;
-import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.*;
import org.locationtech.jts.index.strtree.AbstractNode;
import org.locationtech.jts.index.strtree.Boundable;
import org.locationtech.jts.index.strtree.ItemBoundable;
@@ -20,20 +18,27 @@
import org.matsim.core.utils.geometry.geotools.MGC;
import org.matsim.core.utils.geometry.transformations.TransformationFactory;
import org.matsim.core.utils.gis.ShapeFileReader;
+import org.matsim.core.utils.io.IOUtils;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
import org.opengis.referencing.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import javax.annotation.Nullable;
import picocli.CommandLine;
+
+import javax.annotation.Nullable;
import java.io.IOException;
import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.nio.charset.Charset;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
/**
* Reusable class for shape file options.
@@ -45,7 +50,7 @@ public final class ShpOptions {
private static final Logger log = LogManager.getLogger(ShpOptions.class);
@CommandLine.Option(names = "--shp", description = "Optional path to shape file used for filtering", required = false)
- private Path shp;
+ private String shp;
@CommandLine.Option(names = "--shp-crs", description = "Overwrite coordinate system of the shape file")
private String shpCrs;
@@ -60,22 +65,72 @@ public ShpOptions() {
* Constructor to use shape options manually.
*/
public ShpOptions(Path shp, @Nullable String shpCrs, @Nullable Charset shpCharset) {
+ this.shp = shp == null ? null : shp.toString();
+ this.shpCrs = shpCrs;
+ this.shpCharset = shpCharset;
+ }
+
+ /**
+ * Constructor to use shape options manually.
+ */
+ public ShpOptions(String shp, @Nullable String shpCrs, @Nullable Charset shpCharset) {
this.shp = shp;
this.shpCrs = shpCrs;
this.shpCharset = shpCharset;
}
+ /**
+ * Opens datastore to a shape-file.
+ */
+ public static ShapefileDataStore openDataStore(String shp) throws IOException {
+
+ FileDataStoreFactorySpi factory = new ShapefileDataStoreFactory();
+
+ URL url = IOUtils.resolveFileOrResource(shp);
+
+ ShapefileDataStore ds;
+ if (shp.endsWith(".shp"))
+ ds = (ShapefileDataStore) factory.createDataStore(url);
+ else if (shp.endsWith(".zip")) {
+
+ // Zip files will only work with local files
+ URI uri;
+ try (ZipInputStream zip = new ZipInputStream(IOUtils.getInputStream(url))) {
+
+ ZipEntry entry;
+ while ((entry = zip.getNextEntry()) != null) {
+ if (entry.getName().endsWith(".shp"))
+ break;
+ }
+
+ if (entry == null)
+ throw new IllegalArgumentException("No .shp file found in the zip.");
+
+ log.info("Using {} from {}", entry.getName(), shp);
+ uri = new URI("jar:" + url + "!/" + entry.getName());
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException("Could not create URI for zip file: " + url, e);
+ }
+
+ ds = (ShapefileDataStore) factory.createDataStore(uri.toURL());
+ } else {
+ throw new IllegalArgumentException("Shape file must either be .zip or .shp, but was: " + shp);
+ }
+
+ return ds;
+ }
+
/**
* Return whether a shape was set.
*/
public boolean isDefined() {
- return shp != null && !shp.toString().isBlank() && !shp.toString().equals("none");
+ return shp != null && !shp.isBlank() && !shp.equals("none");
}
/**
* Get the provided input crs.
*/
- public Path getShapeFile() {
+ public String getShapeFile() {
return shp;
}
@@ -94,8 +149,6 @@ public String getShapeCrs() {
public List readFeatures() {
if (shp == null)
throw new IllegalStateException("Shape file path not specified");
- if (!Files.exists(shp))
- throw new IllegalStateException(String.format("Shape file %s does not exists", shp));
try {
ShapefileDataStore ds = openDataStore(shp);
@@ -108,57 +161,33 @@ public List readFeatures() {
}
}
- /**
- * Opens datastore to a shape-file.
- */
- public static ShapefileDataStore openDataStore(Path shp) throws IOException {
-
- FileDataStoreFactorySpi factory = new ShapefileDataStoreFactory();
-
- ShapefileDataStore ds;
- if (shp.toString().endsWith(".shp"))
- ds = (ShapefileDataStore) factory.createDataStore(shp.toUri().toURL());
- else if (shp.toString().endsWith(".zip")) {
-
- FileSystem fs = FileSystems.newFileSystem(shp, ClassLoader.getSystemClassLoader());
- Optional match = Files.walk(fs.getPath("/"))
- .filter(p -> p.toString().endsWith(".shp"))
- .findFirst();
-
- if (match.isEmpty())
- throw new IllegalArgumentException("No .shp file found in the zip.");
-
- log.info("Using {} from {}", match.get(), shp);
- ds = (ShapefileDataStore) factory.createDataStore(match.get().toUri().toURL());
- } else {
- throw new IllegalArgumentException("Shape file must either be .zip or .shp, but was: " + shp);
- }
-
- return ds;
- }
-
/**
* Return the union of all geometries in the shape file.
*/
public Geometry getGeometry() {
Collection features = readFeatures();
- if (features.size() < 1) {
+ if (features.isEmpty()) {
throw new IllegalStateException("There is no feature in the shape file. Aborting...");
}
- Geometry geometry = (Geometry) features.iterator().next().getDefaultGeometry();
- if (features.size() > 1) {
- for (SimpleFeature simpleFeature : features) {
- if (simpleFeature.getDefaultGeometry() == null) {
- log.warn("Features {} has no geometry", simpleFeature);
- continue;
- }
- Geometry subArea = (Geometry) simpleFeature.getDefaultGeometry();
- geometry = geometry.union(subArea);
- }
+ if (features.size() == 1) {
+ return (Geometry) features.iterator().next().getDefaultGeometry();
+ }
+
+ GeometryFactory factory = ((Geometry) features.iterator().next().getDefaultGeometry()).getFactory();
+
+ GeometryCollection geometryCollection = (GeometryCollection) factory.buildGeometry(
+ features.stream()
+ .filter(f -> f.getDefaultGeometry() != null)
+ .map(f -> (Geometry) f.getDefaultGeometry()).toList()
+ );
+
+ if (geometryCollection.isEmpty()) {
+ throw new IllegalStateException("There are noe geometries in the shape file.");
}
- return geometry;
+
+ return geometryCollection.union();
}
/**
@@ -172,8 +201,6 @@ public Index createIndex(String queryCRS, String attr, Set filter) {
if (!isDefined())
throw new IllegalStateException("Shape file path not specified");
- if (!Files.exists(shp))
- throw new IllegalStateException(String.format("Shape file %s does not exists", shp));
if (queryCRS == null)
throw new IllegalArgumentException("Query crs must not be null!");
@@ -242,8 +269,7 @@ public final class Index {
* @param ct coordinate transform from query to target crs
* @param attr attribute for the result of {@link #query(Coord)}
*/
- Index(CoordinateTransformation ct, String attr, @Nullable Set filter)
- throws IOException {
+ Index(CoordinateTransformation ct, String attr, @Nullable Set filter) throws IOException {
ShapefileDataStore ds = openDataStore(shp);
if (shpCharset != null)
diff --git a/contribs/application/src/main/java/org/matsim/application/prepare/ShapeFileTextLookup.java b/contribs/application/src/main/java/org/matsim/application/prepare/ShapeFileTextLookup.java
index 6242e889061..1be1a71eed1 100644
--- a/contribs/application/src/main/java/org/matsim/application/prepare/ShapeFileTextLookup.java
+++ b/contribs/application/src/main/java/org/matsim/application/prepare/ShapeFileTextLookup.java
@@ -59,15 +59,10 @@ public Integer call() throws Exception {
return 1;
}
- if (shp.getShapeFile() == null) {
+ if (!shp.isDefined()) {
throw new IllegalArgumentException("Shape file must be given!");
}
- if (!Files.exists(shp.getShapeFile())) {
- log.error("Shape file {} does not exists", shp.getShapeFile());
- return 1;
- }
-
List features = shp.readFeatures();
Map map = new HashMap<>();
diff --git a/contribs/application/src/main/java/org/matsim/application/prepare/network/CreateNetworkFromSumo.java b/contribs/application/src/main/java/org/matsim/application/prepare/network/CreateNetworkFromSumo.java
index 23672056f9d..b4a3521e48d 100644
--- a/contribs/application/src/main/java/org/matsim/application/prepare/network/CreateNetworkFromSumo.java
+++ b/contribs/application/src/main/java/org/matsim/application/prepare/network/CreateNetworkFromSumo.java
@@ -74,7 +74,7 @@ public static void main(String[] args) {
@Override
public Integer call() throws Exception {
- SumoNetworkConverter converter = SumoNetworkConverter.newInstance(input, output, shp.getShapeFile(), crs.getInputCRS(), crs.getTargetCRS(), freeSpeedFactor);
+ SumoNetworkConverter converter = SumoNetworkConverter.newInstance(input, output, Path.of(shp.getShapeFile()), crs.getInputCRS(), crs.getTargetCRS(), freeSpeedFactor);
Network network = NetworkUtils.createNetwork();
Lanes lanes = LanesUtils.createLanesContainer();
diff --git a/contribs/application/src/main/java/org/matsim/freightDemandGeneration/FreightDemandGeneration.java b/contribs/application/src/main/java/org/matsim/freightDemandGeneration/FreightDemandGeneration.java
index 2f52ac86d17..caec3bbf367 100644
--- a/contribs/application/src/main/java/org/matsim/freightDemandGeneration/FreightDemandGeneration.java
+++ b/contribs/application/src/main/java/org/matsim/freightDemandGeneration/FreightDemandGeneration.java
@@ -196,7 +196,7 @@ public Integer call() throws IOException, InvalidAttributeValueException, Execut
Collection polygonsInShape = null;
shp = new ShpOptions(shapeFilePath, shapeCRS, null);
- if (shp.getShapeFile() != null && Files.exists(shp.getShapeFile())) {
+ if (shp.isDefined()) {
log.warn("Use of shpFile. Locations for the carriers and the demand only in shp: " + shp.getShapeFile());
polygonsInShape = shp.readFeatures();
crsTransformationFromNetworkToShape = shp.createTransformation(networkCRS);
diff --git a/contribs/application/src/test/java/org/matsim/application/ApplicationUtilsTest.java b/contribs/application/src/test/java/org/matsim/application/ApplicationUtilsTest.java
index edb2bcdbba6..31d1d3d1970 100644
--- a/contribs/application/src/test/java/org/matsim/application/ApplicationUtilsTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/ApplicationUtilsTest.java
@@ -1,16 +1,16 @@
package org.matsim.application;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.application.analysis.TestAnalysis;
import org.matsim.application.analysis.TestDependentAnalysis;
import org.matsim.application.options.ShpOptions;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public class ApplicationUtilsTest {
@Test
- public void shp() {
+ void shp() {
assertTrue(ApplicationUtils.acceptsOptions(TestAnalysis.class, ShpOptions.class));
diff --git a/contribs/application/src/test/java/org/matsim/application/CommandRunnerTest.java b/contribs/application/src/test/java/org/matsim/application/CommandRunnerTest.java
index 67f566eb5ae..bd7f228964f 100644
--- a/contribs/application/src/test/java/org/matsim/application/CommandRunnerTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/CommandRunnerTest.java
@@ -1,8 +1,8 @@
package org.matsim.application;
import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.application.analysis.TestDependentAnalysis;
import org.matsim.application.analysis.TestOtherAnalysis;
import org.matsim.application.analysis.TestOtherDependentAnalysis;
@@ -12,11 +12,11 @@
public class CommandRunnerTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void runner() {
+ void runner() {
Path path = Path.of(utils.getOutputDirectory());
diff --git a/contribs/application/src/test/java/org/matsim/application/MATSimApplicationTest.java b/contribs/application/src/test/java/org/matsim/application/MATSimApplicationTest.java
index 9be98d76122..9d9d2052338 100644
--- a/contribs/application/src/test/java/org/matsim/application/MATSimApplicationTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/MATSimApplicationTest.java
@@ -1,9 +1,9 @@
package org.matsim.application;
-import org.junit.Assume;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.application.options.SampleOptions;
import org.matsim.application.prepare.freight.tripExtraction.ExtractRelevantFreightTrips;
import org.matsim.application.prepare.population.GenerateShortDistanceTrips;
@@ -24,23 +24,23 @@
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MATSimApplicationTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void help() {
+ void help() {
int ret = MATSimApplication.execute(TestScenario.class, "--help");
- assertEquals("Return code should be 0", 0, ret);
+ assertEquals(0, ret, "Return code should be 0");
}
@Test
- public void config() {
+ void config() {
Controler controler = MATSimApplication.prepare(TestScenario.class, ConfigUtils.createConfig(),
"-c:controler.runId=Test123", "--config:global.numberOfThreads=4", "--config:plans.inputCRS", "EPSG:1234");
@@ -54,7 +54,7 @@ public void config() {
}
@Test
- public void yaml() {
+ void yaml() {
Path yml = Path.of(utils.getClassInputDirectory(), "specs.yml");
@@ -76,7 +76,7 @@ public void yaml() {
}
@Test
- public void sample() {
+ void sample() {
Controler controler = MATSimApplication.prepare(TestScenario.class, ConfigUtils.createConfig(),
"--10pct");
@@ -92,7 +92,7 @@ public void sample() {
}
@Test
- public void population() throws MalformedURLException {
+ void population() throws MalformedURLException {
Path input = Path.of(utils.getClassInputDirectory());
Path output = Path.of(utils.getOutputDirectory());
@@ -127,13 +127,13 @@ public void population() throws MalformedURLException {
}
@Test
- @Ignore("Class is deprecated")
- public void freight() {
+ @Disabled("Class is deprecated")
+ void freight() {
Path input = Path.of("..", "..", "..", "..",
"shared-svn", "komodnext", "data", "freight", "original_data").toAbsolutePath().normalize();
- Assume.assumeTrue(Files.exists(input));
+ Assumptions.assumeTrue(Files.exists(input));
Path output = Path.of(utils.getOutputDirectory());
@@ -161,7 +161,7 @@ public void freight() {
}
@Test
- public void run() {
+ void run() {
Config config = ConfigUtils.createConfig();
Path out = Path.of(utils.getOutputDirectory()).resolve("out");
diff --git a/contribs/application/src/test/java/org/matsim/application/analysis/LogFileAnalysisTest.java b/contribs/application/src/test/java/org/matsim/application/analysis/LogFileAnalysisTest.java
index 4b1c121aa72..5309e1585b5 100644
--- a/contribs/application/src/test/java/org/matsim/application/analysis/LogFileAnalysisTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/analysis/LogFileAnalysisTest.java
@@ -1,8 +1,8 @@
package org.matsim.application.analysis;
import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.application.ApplicationUtils;
import org.matsim.application.MATSimApplication;
import org.matsim.application.MATSimApplicationTest;
@@ -16,11 +16,11 @@
public class LogFileAnalysisTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void output() throws IOException {
+ void output() throws IOException {
Config config = ConfigUtils.createConfig();
diff --git a/contribs/application/src/test/java/org/matsim/application/options/CsvOptionsTest.java b/contribs/application/src/test/java/org/matsim/application/options/CsvOptionsTest.java
index fff884efa77..65299cb0e81 100644
--- a/contribs/application/src/test/java/org/matsim/application/options/CsvOptionsTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/options/CsvOptionsTest.java
@@ -2,9 +2,9 @@
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.io.TempDir;
import java.io.IOException;
import java.nio.file.Path;
@@ -14,15 +14,15 @@
public class CsvOptionsTest {
- @Rule
- public TemporaryFolder f = new TemporaryFolder();
+ @TempDir
+ public Path f;
@Test
- public void output() throws IOException {
+ void output() throws IOException {
CsvOptions csv = new CsvOptions(CSVFormat.Predefined.TDF);
- Path tmp = f.getRoot().toPath().resolve("test.csv");
+ Path tmp = f.resolve("test.csv");
CSVPrinter printer = csv.createPrinter(tmp);
@@ -34,4 +34,4 @@ public void output() throws IOException {
.hasContent("header\tcolumn\n1\t2");
}
-}
\ No newline at end of file
+}
diff --git a/contribs/application/src/test/java/org/matsim/application/options/SampleOptionsTest.java b/contribs/application/src/test/java/org/matsim/application/options/SampleOptionsTest.java
index 545e30560a2..cc7f4469b2b 100644
--- a/contribs/application/src/test/java/org/matsim/application/options/SampleOptionsTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/options/SampleOptionsTest.java
@@ -2,7 +2,7 @@
import com.google.common.util.concurrent.AtomicDouble;
import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.application.MATSimAppCommand;
import picocli.CommandLine;
@@ -11,7 +11,7 @@
public class SampleOptionsTest {
@Test
- public void flexible() {
+ void flexible() {
AtomicInteger size = new AtomicInteger();
AtomicDouble dSize = new AtomicDouble();
@@ -39,7 +39,7 @@ public Integer call() throws Exception {
}
@Test
- public void fixed() {
+ void fixed() {
AtomicInteger size = new AtomicInteger();
diff --git a/contribs/application/src/test/java/org/matsim/application/options/ShpOptionsTest.java b/contribs/application/src/test/java/org/matsim/application/options/ShpOptionsTest.java
index 8874cfaf671..2c9282c4add 100644
--- a/contribs/application/src/test/java/org/matsim/application/options/ShpOptionsTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/options/ShpOptionsTest.java
@@ -1,9 +1,9 @@
package org.matsim.application.options;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Rule;
-import org.junit.Test;
+import org.assertj.core.data.Offset;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.matsim.testcases.MatsimTestUtils;
@@ -19,11 +19,11 @@
public class ShpOptionsTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void readZip() {
+ void readZip() {
// use same shape file as for land-use
Path input = Path.of(utils.getClassInputDirectory()
@@ -31,7 +31,7 @@ public void readZip() {
.replace("options", "prepare"))
.resolve("andorra-latest-free.shp.zip");
- Assume.assumeTrue(Files.exists(input));
+ Assumptions.assumeTrue(Files.exists(input));
ShpOptions shp = new ShpOptions(input, null, null);
@@ -43,7 +43,7 @@ public void readZip() {
}
@Test
- public void all() {
+ void all() {
// use same shape file as for land-use
Path input = Path.of(utils.getClassInputDirectory()
@@ -51,7 +51,7 @@ public void all() {
.replace("options", "prepare"))
.resolve("andorra-latest-free.shp.zip");
- Assume.assumeTrue(Files.exists(input));
+ Assumptions.assumeTrue(Files.exists(input));
ShpOptions shp = new ShpOptions(input, null, null);
@@ -60,32 +60,26 @@ public void all() {
List ft = index.getAll();
assertThat(ft)
- .hasSize(578)
+ .hasSize(4906)
.hasSize(Set.copyOf(ft).size());
}
@Test
- public void testGetGeometry() {
+ void testGetGeometry() {
Path input = Path.of(utils.getClassInputDirectory()
.replace("ShpOptionsTest", "CreateLandUseShpTest")
.replace("options", "prepare"))
.resolve("andorra-latest-free.shp.zip");
- Assume.assumeTrue(Files.exists(input));
+ Assumptions.assumeTrue(Files.exists(input));
ShpOptions shp = new ShpOptions(input, null, null);
Geometry geometry = shp.getGeometry() ;
- Geometry expectedGeometry = new GeometryFactory().createEmpty(2);
- List features = shp.readFeatures();
+ assertThat(geometry.getArea())
+ .isCloseTo(1.9847543618489646E-4, Offset.offset(1e-8));
- for(SimpleFeature feature : features) {
- Geometry geometryToJoin = (Geometry) feature.getDefaultGeometry();
- expectedGeometry = expectedGeometry.union(geometryToJoin);
- }
-
- Assert.assertTrue(geometry.equals(expectedGeometry));
}
-}
\ No newline at end of file
+}
diff --git a/contribs/application/src/test/java/org/matsim/application/prepare/CreateLandUseShpTest.java b/contribs/application/src/test/java/org/matsim/application/prepare/CreateLandUseShpTest.java
index 7068b755e78..ca40a8f3057 100644
--- a/contribs/application/src/test/java/org/matsim/application/prepare/CreateLandUseShpTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/prepare/CreateLandUseShpTest.java
@@ -1,8 +1,8 @@
package org.matsim.application.prepare;
-import org.junit.Assume;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
import java.nio.file.Files;
@@ -12,15 +12,15 @@
public class CreateLandUseShpTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void convert() {
+ void convert() {
Path input = Path.of(utils.getClassInputDirectory(), "andorra-latest-free.shp.zip");
- Assume.assumeTrue(Files.exists(input));
+ Assumptions.assumeTrue(Files.exists(input));
Path output = Path.of(utils.getOutputDirectory(), "output.shp");
@@ -34,4 +34,4 @@ public void convert() {
.isRegularFile();
}
-}
\ No newline at end of file
+}
diff --git a/contribs/application/src/test/java/org/matsim/application/prepare/ShapeFileTextLookupTest.java b/contribs/application/src/test/java/org/matsim/application/prepare/ShapeFileTextLookupTest.java
index 02f1892fc47..74153b6ab75 100644
--- a/contribs/application/src/test/java/org/matsim/application/prepare/ShapeFileTextLookupTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/prepare/ShapeFileTextLookupTest.java
@@ -1,8 +1,8 @@
package org.matsim.application.prepare;
-import org.junit.Assume;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
import picocli.CommandLine;
@@ -14,15 +14,15 @@
public class ShapeFileTextLookupTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ public MatsimTestUtils utils = new MatsimTestUtils();
- @Test
- public void main() {
+ @Test
+ void main() {
Path input = Path.of(utils.getClassInputDirectory(), "verkehrszellen.csv");
Path output = Path.of(utils.getOutputDirectory(), "output.csv");
- Assume.assumeTrue(Files.exists(input));
+ Assumptions.assumeTrue(Files.exists(input));
CommandLine cli = new CommandLine(new ShapeFileTextLookup());
int ret = cli.execute(
@@ -40,4 +40,4 @@ public void main() {
.exists();
}
-}
\ No newline at end of file
+}
diff --git a/contribs/application/src/test/java/org/matsim/application/prepare/counts/CreateCountsFromBAStDataTest.java b/contribs/application/src/test/java/org/matsim/application/prepare/counts/CreateCountsFromBAStDataTest.java
index 2bb18be2668..c74d59b7801 100644
--- a/contribs/application/src/test/java/org/matsim/application/prepare/counts/CreateCountsFromBAStDataTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/prepare/counts/CreateCountsFromBAStDataTest.java
@@ -1,8 +1,8 @@
package org.matsim.application.prepare.counts;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.TransportMode;
import org.matsim.api.core.v01.network.Link;
@@ -17,8 +17,8 @@
public class CreateCountsFromBAStDataTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
String countsOutput = "test-counts.xml.gz";
@@ -36,7 +36,7 @@ public class CreateCountsFromBAStDataTest {
String shpCrs = "EPSG:3857";
@Test
- public void testCreateCountsFromBAStData() {
+ void testCreateCountsFromBAStData() {
String version = "normal-";
String out = utils.getOutputDirectory() + version + countsOutput;
@@ -74,7 +74,7 @@ public void testCreateCountsFromBAStData() {
}
@Test
- public void testWithIgnoredStations() {
+ void testWithIgnoredStations() {
String version = "with-ignored-";
String out1 = utils.getOutputDirectory() + version + countsOutput;
@@ -123,7 +123,7 @@ public void testWithIgnoredStations() {
}
@Test
- public void testManualMatchedCounts() {
+ void testManualMatchedCounts() {
String out = utils.getOutputDirectory() + "manual-matched-" + countsOutput;
@@ -159,12 +159,12 @@ public void testManualMatchedCounts() {
MeasurementLocation actual = map.get(supposed);
String actualStation = actual.getStationName();
- Assert.assertEquals(station, actualStation);
+ Assertions.assertEquals(station, actualStation);
}
}
@Test
- public void testManualMatchingWithWrongInput() {
+ void testManualMatchingWithWrongInput() {
String out = utils.getOutputDirectory() + "manual-matched-" + countsOutput;
@@ -181,6 +181,6 @@ public void testManualMatchingWithWrongInput() {
"--manual-matched-counts=" + utils.getPackageInputDirectory() + wrongManualMatchedCounts,
};
- Assert.assertThrows(RuntimeException.class, () -> new CreateCountsFromBAStData().execute(args));
+ Assertions.assertThrows(RuntimeException.class, () -> new CreateCountsFromBAStData().execute(args));
}
}
diff --git a/contribs/application/src/test/java/org/matsim/application/prepare/counts/NetworkIndexTest.java b/contribs/application/src/test/java/org/matsim/application/prepare/counts/NetworkIndexTest.java
index a342fbac29c..74d0a5e356a 100644
--- a/contribs/application/src/test/java/org/matsim/application/prepare/counts/NetworkIndexTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/prepare/counts/NetworkIndexTest.java
@@ -2,7 +2,7 @@
import org.assertj.core.data.Offset;
import org.geotools.geometry.jts.JTSFactoryFinder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.GeometryFactory;
@@ -11,7 +11,7 @@
public class NetworkIndexTest {
@Test
- public void angle() {
+ void angle() {
GeometryFactory f = JTSFactoryFinder.getGeometryFactory();
diff --git a/contribs/application/src/test/java/org/matsim/application/prepare/population/CloseTrajectoriesTest.java b/contribs/application/src/test/java/org/matsim/application/prepare/population/CloseTrajectoriesTest.java
index d8fb62a6e30..5c45ddefdb3 100644
--- a/contribs/application/src/test/java/org/matsim/application/prepare/population/CloseTrajectoriesTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/prepare/population/CloseTrajectoriesTest.java
@@ -1,8 +1,8 @@
package org.matsim.application.prepare.population;
import org.assertj.core.api.Condition;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.population.Activity;
import org.matsim.api.core.v01.population.Person;
import org.matsim.api.core.v01.population.Population;
@@ -17,11 +17,11 @@
public class CloseTrajectoriesTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void main() {
+ void main() {
Path input = Path.of(utils.getPackageInputDirectory(), "persons.xml");
@@ -45,4 +45,4 @@ public void main() {
}
-}
\ No newline at end of file
+}
diff --git a/contribs/application/src/test/java/org/matsim/application/prepare/population/FixSubtourModesTest.java b/contribs/application/src/test/java/org/matsim/application/prepare/population/FixSubtourModesTest.java
index cbd4d0bd400..6f65537c5bf 100644
--- a/contribs/application/src/test/java/org/matsim/application/prepare/population/FixSubtourModesTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/prepare/population/FixSubtourModesTest.java
@@ -1,6 +1,6 @@
package org.matsim.application.prepare.population;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.population.Person;
import org.matsim.api.core.v01.population.Plan;
@@ -19,7 +19,7 @@ public class FixSubtourModesTest {
private PopulationFactory fact = PopulationUtils.getFactory();
@Test
- public void unclosed() {
+ void unclosed() {
Person person = fact.createPerson(Id.create("1000", Person.class));
final Plan plan = fact.createPlan();
@@ -43,7 +43,7 @@ public void unclosed() {
}
@Test
- public void complex() {
+ void complex() {
Person person = fact.createPerson(Id.create("1000", Person.class));
final Plan plan = fact.createPlan();
@@ -72,7 +72,7 @@ public void complex() {
@Test
- public void correct() {
+ void correct() {
Person person = fact.createPerson(Id.create("1000", Person.class));
final Plan plan = fact.createPlan();
diff --git a/contribs/application/src/test/java/org/matsim/application/prepare/population/SplitActivityTypesDurationTest.java b/contribs/application/src/test/java/org/matsim/application/prepare/population/SplitActivityTypesDurationTest.java
index c88c1f977eb..3c87f29a3c8 100644
--- a/contribs/application/src/test/java/org/matsim/application/prepare/population/SplitActivityTypesDurationTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/prepare/population/SplitActivityTypesDurationTest.java
@@ -1,8 +1,8 @@
package org.matsim.application.prepare.population;
import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.population.Activity;
import org.matsim.api.core.v01.population.Person;
import org.matsim.api.core.v01.population.Population;
@@ -17,11 +17,11 @@
public class SplitActivityTypesDurationTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void split() {
+ void split() {
Path input = Path.of(utils.getPackageInputDirectory(), "persons.xml");
diff --git a/contribs/application/src/test/java/org/matsim/application/prepare/pt/CreateTransitScheduleFromGtfsTest.java b/contribs/application/src/test/java/org/matsim/application/prepare/pt/CreateTransitScheduleFromGtfsTest.java
index 9d0b2553537..5b3732f6347 100644
--- a/contribs/application/src/test/java/org/matsim/application/prepare/pt/CreateTransitScheduleFromGtfsTest.java
+++ b/contribs/application/src/test/java/org/matsim/application/prepare/pt/CreateTransitScheduleFromGtfsTest.java
@@ -1,8 +1,8 @@
package org.matsim.application.prepare.pt;
import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
import org.matsim.testcases.MatsimTestUtils;
@@ -12,11 +12,11 @@
public class CreateTransitScheduleFromGtfsTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void run() {
+ void run() {
String input = utils.getClassInputDirectory();
String output = utils.getOutputDirectory();
diff --git a/contribs/application/src/test/java/org/matsim/freightDemandGeneration/CarrierReaderFromCSVTest.java b/contribs/application/src/test/java/org/matsim/freightDemandGeneration/CarrierReaderFromCSVTest.java
index 9d2ec63b41c..1bcb22e6b80 100644
--- a/contribs/application/src/test/java/org/matsim/freightDemandGeneration/CarrierReaderFromCSVTest.java
+++ b/contribs/application/src/test/java/org/matsim/freightDemandGeneration/CarrierReaderFromCSVTest.java
@@ -9,9 +9,9 @@
import java.util.Map;
import java.util.Set;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Link;
@@ -39,11 +39,11 @@
*/
public class CarrierReaderFromCSVTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void carrierCreation() throws IOException {
+ void carrierCreation() throws IOException {
Config config = ConfigUtils.createConfig();
config.network().setInputFile(
"https://raw.githubusercontent.com/matsim-org/matsim/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml");
@@ -61,157 +61,157 @@ public void carrierCreation() throws IOException {
CarrierReaderFromCSV.checkNewCarrier(allNewCarrierInformation, freightCarriersConfigGroup, scenario, polygonsInShape, shapeCategory);
CarrierReaderFromCSV.createNewCarrierAndAddVehicleTypes(scenario, allNewCarrierInformation, freightCarriersConfigGroup,
polygonsInShape, 1, null);
- Assert.assertEquals(3, CarriersUtils.getCarriers(scenario).getCarriers().size());
- Assert.assertTrue(
+ Assertions.assertEquals(3, CarriersUtils.getCarriers(scenario).getCarriers().size());
+ Assertions.assertTrue(
CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("testCarrier1", Carrier.class)));
- Assert.assertTrue(
+ Assertions.assertTrue(
CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("testCarrier2", Carrier.class)));
- Assert.assertTrue(
+ Assertions.assertTrue(
CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("testCarrier3", Carrier.class)));
// check carrier 1
Carrier testCarrier1 = CarriersUtils.getCarriers(scenario).getCarriers()
.get(Id.create("testCarrier1", Carrier.class));
- Assert.assertEquals(FleetSize.INFINITE, testCarrier1.getCarrierCapabilities().getFleetSize());
- Assert.assertEquals(10, CarriersUtils.getJspritIterations(testCarrier1));
- Assert.assertEquals(4, testCarrier1.getCarrierCapabilities().getCarrierVehicles().size());
+ Assertions.assertEquals(FleetSize.INFINITE, testCarrier1.getCarrierCapabilities().getFleetSize());
+ Assertions.assertEquals(10, CarriersUtils.getJspritIterations(testCarrier1));
+ Assertions.assertEquals(4, testCarrier1.getCarrierCapabilities().getCarrierVehicles().size());
Object2IntMap depotSums = new Object2IntOpenHashMap<>();
Map> typesPerDepot = new HashMap<>();
for (CarrierVehicle carrierVehicle : testCarrier1.getCarrierCapabilities().getCarrierVehicles().values()) {
typesPerDepot.computeIfAbsent(carrierVehicle.getLinkId().toString(), ( k) -> new ArrayList<>() )
.add(carrierVehicle.getVehicleTypeId().toString());
depotSums.merge(carrierVehicle.getLinkId().toString(), 1, Integer::sum );
- Assert.assertEquals(3600, carrierVehicle.getEarliestStartTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(50000, carrierVehicle.getLatestEndTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3600, carrierVehicle.getEarliestStartTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(50000, carrierVehicle.getLatestEndTime(), MatsimTestUtils.EPSILON);
}
- Assert.assertEquals(2, depotSums.size());
- Assert.assertTrue(depotSums.containsKey("i(2,0)"));
- Assert.assertEquals(2, depotSums.getInt("i(2,0)"));
- Assert.assertTrue(depotSums.containsKey("j(2,4)R"));
- Assert.assertEquals(2, depotSums.getInt("j(2,4)R"));
- Assert.assertEquals(2, typesPerDepot.size());
- Assert.assertTrue(typesPerDepot.containsKey("i(2,0)"));
- Assert.assertEquals(2, typesPerDepot.get("i(2,0)").size());
- Assert.assertTrue(typesPerDepot.get("i(2,0)").contains("testVehicle1"));
- Assert.assertTrue(typesPerDepot.get("i(2,0)").contains("testVehicle2"));
- Assert.assertTrue(typesPerDepot.containsKey("j(2,4)R"));
- Assert.assertEquals(2, typesPerDepot.get("j(2,4)R").size());
- Assert.assertTrue(typesPerDepot.get("j(2,4)R").contains("testVehicle1"));
- Assert.assertTrue(typesPerDepot.get("j(2,4)R").contains("testVehicle2"));
+ Assertions.assertEquals(2, depotSums.size());
+ Assertions.assertTrue(depotSums.containsKey("i(2,0)"));
+ Assertions.assertEquals(2, depotSums.getInt("i(2,0)"));
+ Assertions.assertTrue(depotSums.containsKey("j(2,4)R"));
+ Assertions.assertEquals(2, depotSums.getInt("j(2,4)R"));
+ Assertions.assertEquals(2, typesPerDepot.size());
+ Assertions.assertTrue(typesPerDepot.containsKey("i(2,0)"));
+ Assertions.assertEquals(2, typesPerDepot.get("i(2,0)").size());
+ Assertions.assertTrue(typesPerDepot.get("i(2,0)").contains("testVehicle1"));
+ Assertions.assertTrue(typesPerDepot.get("i(2,0)").contains("testVehicle2"));
+ Assertions.assertTrue(typesPerDepot.containsKey("j(2,4)R"));
+ Assertions.assertEquals(2, typesPerDepot.get("j(2,4)R").size());
+ Assertions.assertTrue(typesPerDepot.get("j(2,4)R").contains("testVehicle1"));
+ Assertions.assertTrue(typesPerDepot.get("j(2,4)R").contains("testVehicle2"));
// check carrier 2
Carrier testCarrier2 = CarriersUtils.getCarriers(scenario).getCarriers()
.get(Id.create("testCarrier2", Carrier.class));
- Assert.assertEquals(FleetSize.FINITE, testCarrier2.getCarrierCapabilities().getFleetSize());
- Assert.assertEquals(15, CarriersUtils.getJspritIterations(testCarrier2));
- Assert.assertEquals(9, testCarrier2.getCarrierCapabilities().getCarrierVehicles().size());
+ Assertions.assertEquals(FleetSize.FINITE, testCarrier2.getCarrierCapabilities().getFleetSize());
+ Assertions.assertEquals(15, CarriersUtils.getJspritIterations(testCarrier2));
+ Assertions.assertEquals(9, testCarrier2.getCarrierCapabilities().getCarrierVehicles().size());
depotSums = new Object2IntOpenHashMap<>();
typesPerDepot = new HashMap<>();
for (CarrierVehicle carrierVehicle : testCarrier2.getCarrierCapabilities().getCarrierVehicles().values()) {
typesPerDepot.computeIfAbsent(carrierVehicle.getLinkId().toString(), ( k) -> new ArrayList<>() )
.add(carrierVehicle.getVehicleTypeId().toString());
depotSums.merge(carrierVehicle.getLinkId().toString(), 1, Integer::sum );
- Assert.assertEquals(3600, carrierVehicle.getEarliestStartTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(50000, carrierVehicle.getLatestEndTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3600, carrierVehicle.getEarliestStartTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(50000, carrierVehicle.getLatestEndTime(), MatsimTestUtils.EPSILON);
}
- Assert.assertEquals(3, depotSums.size());
- Assert.assertTrue(depotSums.containsKey("j(4,3)R"));
- Assert.assertEquals(3, depotSums.getInt("j(4,3)R"));
- Assert.assertEquals(3, typesPerDepot.size());
- Assert.assertTrue(typesPerDepot.containsKey("j(4,3)R"));
- Assert.assertEquals(3, typesPerDepot.get("j(4,3)R").size());
- Assert.assertTrue(typesPerDepot.get("j(4,3)R").contains("testVehicle2"));
+ Assertions.assertEquals(3, depotSums.size());
+ Assertions.assertTrue(depotSums.containsKey("j(4,3)R"));
+ Assertions.assertEquals(3, depotSums.getInt("j(4,3)R"));
+ Assertions.assertEquals(3, typesPerDepot.size());
+ Assertions.assertTrue(typesPerDepot.containsKey("j(4,3)R"));
+ Assertions.assertEquals(3, typesPerDepot.get("j(4,3)R").size());
+ Assertions.assertTrue(typesPerDepot.get("j(4,3)R").contains("testVehicle2"));
// check carrier 3
Network network = NetworkUtils.readNetwork(
"https://raw.githubusercontent.com/matsim-org/matsim-libs/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml");
Carrier testCarrier3 = CarriersUtils.getCarriers(scenario).getCarriers()
.get(Id.create("testCarrier3", Carrier.class));
- Assert.assertEquals(FleetSize.INFINITE, testCarrier3.getCarrierCapabilities().getFleetSize());
- Assert.assertEquals(1, CarriersUtils.getJspritIterations(testCarrier3));
- Assert.assertEquals(2, testCarrier3.getCarrierCapabilities().getCarrierVehicles().size());
+ Assertions.assertEquals(FleetSize.INFINITE, testCarrier3.getCarrierCapabilities().getFleetSize());
+ Assertions.assertEquals(1, CarriersUtils.getJspritIterations(testCarrier3));
+ Assertions.assertEquals(2, testCarrier3.getCarrierCapabilities().getCarrierVehicles().size());
depotSums = new Object2IntOpenHashMap<>();
typesPerDepot = new HashMap<>();
for (CarrierVehicle carrierVehicle : testCarrier3.getCarrierCapabilities().getCarrierVehicles().values()) {
typesPerDepot.computeIfAbsent(carrierVehicle.getLinkId().toString(), ( k) -> new ArrayList<>() )
.add(carrierVehicle.getVehicleTypeId().toString());
depotSums.merge(carrierVehicle.getLinkId().toString(), 1, Integer::sum );
- Assert.assertEquals(50000, carrierVehicle.getEarliestStartTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(80000, carrierVehicle.getLatestEndTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(50000, carrierVehicle.getEarliestStartTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(80000, carrierVehicle.getLatestEndTime(), MatsimTestUtils.EPSILON);
}
- Assert.assertEquals(2, depotSums.size());
- Assert.assertTrue(depotSums.containsKey("j(2,6)R"));
- Assert.assertEquals(1, depotSums.getInt("j(2,6)R"));
+ Assertions.assertEquals(2, depotSums.size());
+ Assertions.assertTrue(depotSums.containsKey("j(2,6)R"));
+ Assertions.assertEquals(1, depotSums.getInt("j(2,6)R"));
for (String depot : depotSums.keySet()) {
if (!depot.equals("j(2,6)R")) {
Link link = network.getLinks().get(Id.createLinkId(depot));
- Assert.assertTrue(
+ Assertions.assertTrue(
FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, null, null));
- Assert.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area1"}, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area2"}, null));
+ Assertions.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area1"}, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area2"}, null));
}
}
- Assert.assertEquals(2, typesPerDepot.size());
- Assert.assertTrue(typesPerDepot.containsKey("j(2,6)R"));
- Assert.assertEquals(1, typesPerDepot.get("j(2,6)R").size());
- Assert.assertTrue(typesPerDepot.get("j(2,6)R").contains("testVehicle1"));
+ Assertions.assertEquals(2, typesPerDepot.size());
+ Assertions.assertTrue(typesPerDepot.containsKey("j(2,6)R"));
+ Assertions.assertEquals(1, typesPerDepot.get("j(2,6)R").size());
+ Assertions.assertTrue(typesPerDepot.get("j(2,6)R").contains("testVehicle1"));
}
@Test
- public void csvCarrierReader() throws IOException {
+ void csvCarrierReader() throws IOException {
Path carrierCSVLocation = Path.of(utils.getPackageInputDirectory() + "testCarrierCSV.csv");
Set allNewCarrierInformation = CarrierReaderFromCSV
.readCarrierInformation(carrierCSVLocation);
- Assert.assertEquals(3, allNewCarrierInformation.size());
+ Assertions.assertEquals(3, allNewCarrierInformation.size());
for (CarrierInformationElement carrierInformationElement : allNewCarrierInformation) {
if (carrierInformationElement.getName().equals("testCarrier1")) {
- Assert.assertNull(carrierInformationElement.getAreaOfAdditionalDepots());
- Assert.assertEquals(0, carrierInformationElement.getFixedNumberOfVehiclePerTypeAndLocation());
- Assert.assertEquals(FleetSize.INFINITE, carrierInformationElement.getFleetSize());
- Assert.assertEquals(10, carrierInformationElement.getJspritIterations());
- Assert.assertEquals(2, carrierInformationElement.getNumberOfDepotsPerType());
- Assert.assertEquals(3600, carrierInformationElement.getVehicleStartTime());
- Assert.assertEquals(50000, carrierInformationElement.getVehicleEndTime());
- Assert.assertEquals(2, carrierInformationElement.getVehicleDepots().size());
- Assert.assertTrue(carrierInformationElement.getVehicleDepots().contains("i(2,0)")
+ Assertions.assertNull(carrierInformationElement.getAreaOfAdditionalDepots());
+ Assertions.assertEquals(0, carrierInformationElement.getFixedNumberOfVehiclePerTypeAndLocation());
+ Assertions.assertEquals(FleetSize.INFINITE, carrierInformationElement.getFleetSize());
+ Assertions.assertEquals(10, carrierInformationElement.getJspritIterations());
+ Assertions.assertEquals(2, carrierInformationElement.getNumberOfDepotsPerType());
+ Assertions.assertEquals(3600, carrierInformationElement.getVehicleStartTime());
+ Assertions.assertEquals(50000, carrierInformationElement.getVehicleEndTime());
+ Assertions.assertEquals(2, carrierInformationElement.getVehicleDepots().size());
+ Assertions.assertTrue(carrierInformationElement.getVehicleDepots().contains("i(2,0)")
&& carrierInformationElement.getVehicleDepots().contains("j(2,4)R"));
- Assert.assertEquals(2, carrierInformationElement.getVehicleTypes().length);
- Assert.assertTrue(carrierInformationElement.getVehicleTypes()[0].equals("testVehicle1")
+ Assertions.assertEquals(2, carrierInformationElement.getVehicleTypes().length);
+ Assertions.assertTrue(carrierInformationElement.getVehicleTypes()[0].equals("testVehicle1")
|| carrierInformationElement.getVehicleTypes()[0].equals("testVehicle2"));
- Assert.assertNotEquals(carrierInformationElement.getVehicleTypes()[0], carrierInformationElement.getVehicleTypes()[1]);
+ Assertions.assertNotEquals(carrierInformationElement.getVehicleTypes()[0], carrierInformationElement.getVehicleTypes()[1]);
} else if (carrierInformationElement.getName().equals("testCarrier3")) {
- Assert.assertEquals(1, carrierInformationElement.getAreaOfAdditionalDepots().length);
- Assert.assertEquals("area1", carrierInformationElement.getAreaOfAdditionalDepots()[0]);
- Assert.assertEquals(0, carrierInformationElement.getFixedNumberOfVehiclePerTypeAndLocation());
- Assert.assertEquals(FleetSize.INFINITE, carrierInformationElement.getFleetSize());
- Assert.assertEquals(0, carrierInformationElement.getJspritIterations());
- Assert.assertEquals(2, carrierInformationElement.getNumberOfDepotsPerType());
- Assert.assertEquals(50000, carrierInformationElement.getVehicleStartTime());
- Assert.assertEquals(80000, carrierInformationElement.getVehicleEndTime());
- Assert.assertEquals(1, carrierInformationElement.getVehicleDepots().size());
- Assert.assertEquals("j(2,6)R", carrierInformationElement.getVehicleDepots().get(0));
- Assert.assertEquals(1, carrierInformationElement.getVehicleTypes().length);
- Assert.assertEquals("testVehicle1", carrierInformationElement.getVehicleTypes()[0]);
+ Assertions.assertEquals(1, carrierInformationElement.getAreaOfAdditionalDepots().length);
+ Assertions.assertEquals("area1", carrierInformationElement.getAreaOfAdditionalDepots()[0]);
+ Assertions.assertEquals(0, carrierInformationElement.getFixedNumberOfVehiclePerTypeAndLocation());
+ Assertions.assertEquals(FleetSize.INFINITE, carrierInformationElement.getFleetSize());
+ Assertions.assertEquals(0, carrierInformationElement.getJspritIterations());
+ Assertions.assertEquals(2, carrierInformationElement.getNumberOfDepotsPerType());
+ Assertions.assertEquals(50000, carrierInformationElement.getVehicleStartTime());
+ Assertions.assertEquals(80000, carrierInformationElement.getVehicleEndTime());
+ Assertions.assertEquals(1, carrierInformationElement.getVehicleDepots().size());
+ Assertions.assertEquals("j(2,6)R", carrierInformationElement.getVehicleDepots().get(0));
+ Assertions.assertEquals(1, carrierInformationElement.getVehicleTypes().length);
+ Assertions.assertEquals("testVehicle1", carrierInformationElement.getVehicleTypes()[0]);
} else if (carrierInformationElement.getName().equals("testCarrier2")) {
- Assert.assertNull(carrierInformationElement.getAreaOfAdditionalDepots());
- Assert.assertEquals(3, carrierInformationElement.getFixedNumberOfVehiclePerTypeAndLocation());
- Assert.assertEquals(FleetSize.FINITE, carrierInformationElement.getFleetSize());
- Assert.assertEquals(15, carrierInformationElement.getJspritIterations());
- Assert.assertEquals(3, carrierInformationElement.getNumberOfDepotsPerType());
- Assert.assertEquals(3600, carrierInformationElement.getVehicleStartTime());
- Assert.assertEquals(50000, carrierInformationElement.getVehicleEndTime());
- Assert.assertEquals(1, carrierInformationElement.getVehicleDepots().size());
- Assert.assertEquals("j(4,3)R", carrierInformationElement.getVehicleDepots().get(0));
- Assert.assertEquals(1, carrierInformationElement.getVehicleTypes().length);
- Assert.assertEquals("testVehicle2", carrierInformationElement.getVehicleTypes()[0]);
+ Assertions.assertNull(carrierInformationElement.getAreaOfAdditionalDepots());
+ Assertions.assertEquals(3, carrierInformationElement.getFixedNumberOfVehiclePerTypeAndLocation());
+ Assertions.assertEquals(FleetSize.FINITE, carrierInformationElement.getFleetSize());
+ Assertions.assertEquals(15, carrierInformationElement.getJspritIterations());
+ Assertions.assertEquals(3, carrierInformationElement.getNumberOfDepotsPerType());
+ Assertions.assertEquals(3600, carrierInformationElement.getVehicleStartTime());
+ Assertions.assertEquals(50000, carrierInformationElement.getVehicleEndTime());
+ Assertions.assertEquals(1, carrierInformationElement.getVehicleDepots().size());
+ Assertions.assertEquals("j(4,3)R", carrierInformationElement.getVehicleDepots().get(0));
+ Assertions.assertEquals(1, carrierInformationElement.getVehicleTypes().length);
+ Assertions.assertEquals("testVehicle2", carrierInformationElement.getVehicleTypes()[0]);
} else {
- Assert.fail("No expected carrierInformationElement found");
+ Assertions.fail("No expected carrierInformationElement found");
}
}
diff --git a/contribs/application/src/test/java/org/matsim/freightDemandGeneration/DemandReaderFromCSVTest.java b/contribs/application/src/test/java/org/matsim/freightDemandGeneration/DemandReaderFromCSVTest.java
index d9ff39a695c..da396bb7a9e 100644
--- a/contribs/application/src/test/java/org/matsim/freightDemandGeneration/DemandReaderFromCSVTest.java
+++ b/contribs/application/src/test/java/org/matsim/freightDemandGeneration/DemandReaderFromCSVTest.java
@@ -8,9 +8,9 @@
import java.util.Map;
import java.util.Set;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Link;
@@ -37,11 +37,11 @@
*
*/
public class DemandReaderFromCSVTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testLinkForPerson() throws IOException {
+ void testLinkForPerson() throws IOException {
Config config = ConfigUtils.createConfig();
config.network().setInputFile(
"https://raw.githubusercontent.com/matsim-org/matsim-libs/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml");
@@ -53,21 +53,21 @@ public void testLinkForPerson() throws IOException {
for (Person person : population.getPersons().values()) {
DemandReaderFromCSV.findLinksForPersons(scenario, nearestLinkPerPerson, person);
}
- Assert.assertEquals("j(1,8)",nearestLinkPerPerson.get(Id.createPersonId("person1")).values().iterator().next());
- Assert.assertEquals("j(3,3)",nearestLinkPerPerson.get(Id.createPersonId("person2")).values().iterator().next());
- Assert.assertEquals("j(4,5)R",nearestLinkPerPerson.get(Id.createPersonId("person3")).values().iterator().next());
- Assert.assertEquals("j(5,3)",nearestLinkPerPerson.get(Id.createPersonId("person4")).values().iterator().next());
- Assert.assertEquals("j(5,6)",nearestLinkPerPerson.get(Id.createPersonId("person5")).values().iterator().next());
- Assert.assertEquals("j(8,8)R",nearestLinkPerPerson.get(Id.createPersonId("person6")).values().iterator().next());
- Assert.assertEquals("i(5,9)R",nearestLinkPerPerson.get(Id.createPersonId("person7")).values().iterator().next());
- Assert.assertEquals("i(9,5)R",nearestLinkPerPerson.get(Id.createPersonId("person8")).values().iterator().next());
+ Assertions.assertEquals("j(1,8)",nearestLinkPerPerson.get(Id.createPersonId("person1")).values().iterator().next());
+ Assertions.assertEquals("j(3,3)",nearestLinkPerPerson.get(Id.createPersonId("person2")).values().iterator().next());
+ Assertions.assertEquals("j(4,5)R",nearestLinkPerPerson.get(Id.createPersonId("person3")).values().iterator().next());
+ Assertions.assertEquals("j(5,3)",nearestLinkPerPerson.get(Id.createPersonId("person4")).values().iterator().next());
+ Assertions.assertEquals("j(5,6)",nearestLinkPerPerson.get(Id.createPersonId("person5")).values().iterator().next());
+ Assertions.assertEquals("j(8,8)R",nearestLinkPerPerson.get(Id.createPersonId("person6")).values().iterator().next());
+ Assertions.assertEquals("i(5,9)R",nearestLinkPerPerson.get(Id.createPersonId("person7")).values().iterator().next());
+ Assertions.assertEquals("i(9,5)R",nearestLinkPerPerson.get(Id.createPersonId("person8")).values().iterator().next());
}
@Test
- public void demandCreation() throws IOException {
+ void demandCreation() throws IOException {
// read inputs
Config config = ConfigUtils.createConfig();
config.network().setInputFile(
@@ -95,12 +95,12 @@ public void demandCreation() throws IOException {
DemandReaderFromCSV.checkNewDemand(scenario, demandInformation, polygonsInShape, shapeCategory);
DemandReaderFromCSV.createDemandForCarriers(scenario, polygonsInShape, demandInformation, population, false,
null);
- Assert.assertEquals(3, CarriersUtils.getCarriers(scenario).getCarriers().size());
- Assert.assertTrue(
+ Assertions.assertEquals(3, CarriersUtils.getCarriers(scenario).getCarriers().size());
+ Assertions.assertTrue(
CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("testCarrier1", Carrier.class)));
- Assert.assertTrue(
+ Assertions.assertTrue(
CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("testCarrier2", Carrier.class)));
- Assert.assertTrue(
+ Assertions.assertTrue(
CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("testCarrier3", Carrier.class)));
// check carrier 1
@@ -108,8 +108,8 @@ public void demandCreation() throws IOException {
"https://raw.githubusercontent.com/matsim-org/matsim-libs/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml");
Carrier testCarrier1 = CarriersUtils.getCarriers(scenario).getCarriers()
.get(Id.create("testCarrier1", Carrier.class));
- Assert.assertEquals(14, testCarrier1.getServices().size());
- Assert.assertEquals(0, testCarrier1.getShipments().size());
+ Assertions.assertEquals(14, testCarrier1.getServices().size());
+ Assertions.assertEquals(0, testCarrier1.getShipments().size());
Object2IntMap countServicesWithCertainDemand = new Object2IntOpenHashMap<>();
Map> locationsPerServiceElement = new HashMap<>();
int countDemand = 0;
@@ -117,45 +117,45 @@ public void demandCreation() throws IOException {
countServicesWithCertainDemand.merge((Integer) service.getCapacityDemand(), 1, Integer::sum);
countDemand = countDemand + service.getCapacityDemand();
if (service.getCapacityDemand() == 0) {
- Assert.assertEquals(180, service.getServiceDuration(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(TimeWindow.newInstance(3000, 13000), service.getServiceStartTimeWindow());
+ Assertions.assertEquals(180, service.getServiceDuration(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(TimeWindow.newInstance(3000, 13000), service.getServiceStartTimeWindow());
locationsPerServiceElement.computeIfAbsent("serviceElement1", (k) -> new HashSet<>())
.add(service.getLocationLinkId().toString());
} else if (service.getCapacityDemand() == 1) {
- Assert.assertEquals(100, service.getServiceDuration(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(TimeWindow.newInstance(5000, 20000), service.getServiceStartTimeWindow());
+ Assertions.assertEquals(100, service.getServiceDuration(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(TimeWindow.newInstance(5000, 20000), service.getServiceStartTimeWindow());
locationsPerServiceElement.computeIfAbsent("serviceElement2", (k) -> new HashSet<>())
.add(service.getLocationLinkId().toString());
} else if (service.getCapacityDemand() == 2) {
- Assert.assertEquals(200, service.getServiceDuration(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(TimeWindow.newInstance(5000, 20000), service.getServiceStartTimeWindow());
+ Assertions.assertEquals(200, service.getServiceDuration(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(TimeWindow.newInstance(5000, 20000), service.getServiceStartTimeWindow());
locationsPerServiceElement.computeIfAbsent("serviceElement2", (k) -> new HashSet<>())
.add(service.getLocationLinkId().toString());
} else
- Assert.fail("Service has a wrong demand.");
+ Assertions.fail("Service has a wrong demand.");
}
- Assert.assertEquals(12, countDemand);
- Assert.assertEquals(4, countServicesWithCertainDemand.getInt(0));
- Assert.assertEquals(8, countServicesWithCertainDemand.getInt(1));
- Assert.assertEquals(2, countServicesWithCertainDemand.getInt(2));
- Assert.assertEquals(4, locationsPerServiceElement.get("serviceElement1").size());
+ Assertions.assertEquals(12, countDemand);
+ Assertions.assertEquals(4, countServicesWithCertainDemand.getInt(0));
+ Assertions.assertEquals(8, countServicesWithCertainDemand.getInt(1));
+ Assertions.assertEquals(2, countServicesWithCertainDemand.getInt(2));
+ Assertions.assertEquals(4, locationsPerServiceElement.get("serviceElement1").size());
for (String locationsOfServiceElement : locationsPerServiceElement.get("serviceElement1")) {
Link link = network.getLinks().get(Id.createLinkId(locationsOfServiceElement));
- Assert.assertTrue(
+ Assertions.assertTrue(
FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, null, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape,
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape,
new String[] { "area1" }, null));
- Assert.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape,
+ Assertions.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape,
new String[] { "area2" }, null));
}
- Assert.assertEquals(4, locationsPerServiceElement.get("serviceElement2").size());
- Assert.assertTrue(locationsPerServiceElement.get("serviceElement2").contains("i(2,0)"));
+ Assertions.assertEquals(4, locationsPerServiceElement.get("serviceElement2").size());
+ Assertions.assertTrue(locationsPerServiceElement.get("serviceElement2").contains("i(2,0)"));
// check carrier 2
Carrier testCarrier2 = CarriersUtils.getCarriers(scenario).getCarriers()
.get(Id.create("testCarrier2", Carrier.class));
- Assert.assertEquals(0, testCarrier2.getServices().size());
- Assert.assertEquals(11, testCarrier2.getShipments().size());
+ Assertions.assertEquals(0, testCarrier2.getServices().size());
+ Assertions.assertEquals(11, testCarrier2.getShipments().size());
Object2IntMap countShipmentsWithCertainDemand = new Object2IntOpenHashMap<>();
Map> locationsPerShipmentElement = new HashMap<>();
countDemand = 0;
@@ -163,181 +163,181 @@ public void demandCreation() throws IOException {
countShipmentsWithCertainDemand.merge((Integer) shipment.getSize(), 1, Integer::sum);
countDemand = countDemand + shipment.getSize();
if (shipment.getSize() == 0) {
- Assert.assertEquals(300, shipment.getPickupServiceTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(350, shipment.getDeliveryServiceTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(TimeWindow.newInstance(10000, 45000), shipment.getPickupTimeWindow());
- Assert.assertEquals(TimeWindow.newInstance(11000, 44000), shipment.getDeliveryTimeWindow());
+ Assertions.assertEquals(300, shipment.getPickupServiceTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(350, shipment.getDeliveryServiceTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(TimeWindow.newInstance(10000, 45000), shipment.getPickupTimeWindow());
+ Assertions.assertEquals(TimeWindow.newInstance(11000, 44000), shipment.getDeliveryTimeWindow());
locationsPerShipmentElement.computeIfAbsent("ShipmenElement1_pickup", (k) -> new HashSet<>())
.add(shipment.getFrom().toString());
locationsPerShipmentElement.computeIfAbsent("ShipmenElement1_delivery", (k) -> new HashSet<>())
.add(shipment.getTo().toString());
} else if (shipment.getSize() == 2) {
- Assert.assertEquals(400, shipment.getPickupServiceTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(400, shipment.getDeliveryServiceTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(TimeWindow.newInstance(11000, 44000), shipment.getPickupTimeWindow());
- Assert.assertEquals(TimeWindow.newInstance(20000, 40000), shipment.getDeliveryTimeWindow());
+ Assertions.assertEquals(400, shipment.getPickupServiceTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(400, shipment.getDeliveryServiceTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(TimeWindow.newInstance(11000, 44000), shipment.getPickupTimeWindow());
+ Assertions.assertEquals(TimeWindow.newInstance(20000, 40000), shipment.getDeliveryTimeWindow());
locationsPerShipmentElement.computeIfAbsent("ShipmenElement2_pickup", (k) -> new HashSet<>())
.add(shipment.getFrom().toString());
locationsPerShipmentElement.computeIfAbsent("ShipmenElement2_delivery", (k) -> new HashSet<>())
.add(shipment.getTo().toString());
} else if (shipment.getSize() == 3) {
- Assert.assertEquals(600, shipment.getPickupServiceTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(600, shipment.getDeliveryServiceTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(TimeWindow.newInstance(11000, 44000), shipment.getPickupTimeWindow());
- Assert.assertEquals(TimeWindow.newInstance(20000, 40000), shipment.getDeliveryTimeWindow());
+ Assertions.assertEquals(600, shipment.getPickupServiceTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(600, shipment.getDeliveryServiceTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(TimeWindow.newInstance(11000, 44000), shipment.getPickupTimeWindow());
+ Assertions.assertEquals(TimeWindow.newInstance(20000, 40000), shipment.getDeliveryTimeWindow());
locationsPerShipmentElement.computeIfAbsent("ShipmenElement2_pickup", (k) -> new HashSet<>())
.add(shipment.getFrom().toString());
locationsPerShipmentElement.computeIfAbsent("ShipmenElement2_delivery", (k) -> new HashSet<>())
.add(shipment.getTo().toString());
} else
- Assert.fail("Shipment has an unexpected demand.");
+ Assertions.fail("Shipment has an unexpected demand.");
}
- Assert.assertEquals(15, countDemand);
- Assert.assertEquals(4, countShipmentsWithCertainDemand.getInt(0));
- Assert.assertEquals(6, countShipmentsWithCertainDemand.getInt(2));
- Assert.assertEquals(1, countShipmentsWithCertainDemand.getInt(3));
- Assert.assertEquals(4, locationsPerShipmentElement.get("ShipmenElement1_pickup").size());
- Assert.assertEquals(1, locationsPerShipmentElement.get("ShipmenElement1_delivery").size());
- Assert.assertTrue(locationsPerShipmentElement.get("ShipmenElement1_delivery").contains("i(2,0)"));
- Assert.assertEquals(1, locationsPerShipmentElement.get("ShipmenElement2_pickup").size());
- Assert.assertEquals(2, locationsPerShipmentElement.get("ShipmenElement2_delivery").size());
+ Assertions.assertEquals(15, countDemand);
+ Assertions.assertEquals(4, countShipmentsWithCertainDemand.getInt(0));
+ Assertions.assertEquals(6, countShipmentsWithCertainDemand.getInt(2));
+ Assertions.assertEquals(1, countShipmentsWithCertainDemand.getInt(3));
+ Assertions.assertEquals(4, locationsPerShipmentElement.get("ShipmenElement1_pickup").size());
+ Assertions.assertEquals(1, locationsPerShipmentElement.get("ShipmenElement1_delivery").size());
+ Assertions.assertTrue(locationsPerShipmentElement.get("ShipmenElement1_delivery").contains("i(2,0)"));
+ Assertions.assertEquals(1, locationsPerShipmentElement.get("ShipmenElement2_pickup").size());
+ Assertions.assertEquals(2, locationsPerShipmentElement.get("ShipmenElement2_delivery").size());
// check carrier 3
Carrier testCarrier3 = CarriersUtils.getCarriers(scenario).getCarriers()
.get(Id.create("testCarrier3", Carrier.class));
- Assert.assertEquals(0, testCarrier3.getServices().size());
- Assert.assertEquals(4, testCarrier3.getShipments().size());
+ Assertions.assertEquals(0, testCarrier3.getServices().size());
+ Assertions.assertEquals(4, testCarrier3.getShipments().size());
countShipmentsWithCertainDemand = new Object2IntOpenHashMap<>();
locationsPerShipmentElement = new HashMap<>();
countDemand = 0;
for (CarrierShipment shipment : testCarrier3.getShipments().values()) {
countShipmentsWithCertainDemand.merge((Integer) shipment.getSize(), 1, Integer::sum);
countDemand = countDemand + shipment.getSize();
- Assert.assertEquals(5, shipment.getSize());
- Assert.assertEquals(2000, shipment.getPickupServiceTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1250, shipment.getDeliveryServiceTime(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(TimeWindow.newInstance(8000, 50000), shipment.getPickupTimeWindow());
- Assert.assertEquals(TimeWindow.newInstance(10000, 60000), shipment.getDeliveryTimeWindow());
+ Assertions.assertEquals(5, shipment.getSize());
+ Assertions.assertEquals(2000, shipment.getPickupServiceTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1250, shipment.getDeliveryServiceTime(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(TimeWindow.newInstance(8000, 50000), shipment.getPickupTimeWindow());
+ Assertions.assertEquals(TimeWindow.newInstance(10000, 60000), shipment.getDeliveryTimeWindow());
locationsPerShipmentElement.computeIfAbsent("ShipmenElement1_pickup", (k) -> new HashSet<>())
.add(shipment.getFrom().toString());
locationsPerShipmentElement.computeIfAbsent("ShipmenElement1_delivery", (k) -> new HashSet<>())
.add(shipment.getTo().toString());
}
- Assert.assertEquals(20, countDemand);
- Assert.assertEquals(4, countShipmentsWithCertainDemand.getInt(5));
- Assert.assertEquals(2, locationsPerShipmentElement.get("ShipmenElement1_pickup").size());
- Assert.assertEquals(4, locationsPerShipmentElement.get("ShipmenElement1_delivery").size());
+ Assertions.assertEquals(20, countDemand);
+ Assertions.assertEquals(4, countShipmentsWithCertainDemand.getInt(5));
+ Assertions.assertEquals(2, locationsPerShipmentElement.get("ShipmenElement1_pickup").size());
+ Assertions.assertEquals(4, locationsPerShipmentElement.get("ShipmenElement1_delivery").size());
for (String locationsOfShipmentElement : locationsPerShipmentElement.get("ShipmenElement1_delivery")) {
Link link = network.getLinks().get(Id.createLinkId(locationsOfShipmentElement));
- Assert.assertTrue(
+ Assertions.assertTrue(
FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, null, null));
- Assert.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape,
+ Assertions.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape,
new String[] { "area1" }, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape,
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape,
new String[] { "area2" }, null));
}
}
@Test
- public void csvDemandReader() throws IOException {
+ void csvDemandReader() throws IOException {
Path demandCSVLocation = Path.of(utils.getPackageInputDirectory() + "testDemandCSV.csv");
Set demandInformation = DemandReaderFromCSV.readDemandInformation(demandCSVLocation);
- Assert.assertEquals(5, demandInformation.size());
+ Assertions.assertEquals(5, demandInformation.size());
for (DemandInformationElement demandInformationElement : demandInformation) {
if (demandInformationElement.getCarrierName().equals("testCarrier1")
&& demandInformationElement.getNumberOfJobs() == 4) {
- Assert.assertEquals(0, (int) demandInformationElement.getDemandToDistribute());
- Assert.assertNull(demandInformationElement.getShareOfPopulationWithFirstJobElement());
- Assert.assertEquals(1, demandInformationElement.getAreasFirstJobElement().length);
- Assert.assertEquals("area2", demandInformationElement.getAreasFirstJobElement()[0]);
- Assert.assertNull(demandInformationElement.getNumberOfFirstJobElementLocations());
- Assert.assertNull(demandInformationElement.getLocationsOfFirstJobElement());
- Assert.assertEquals(180, (int) demandInformationElement.getFirstJobElementTimePerUnit());
- Assert.assertEquals(TimeWindow.newInstance(3000, 13000),
+ Assertions.assertEquals(0, (int) demandInformationElement.getDemandToDistribute());
+ Assertions.assertNull(demandInformationElement.getShareOfPopulationWithFirstJobElement());
+ Assertions.assertEquals(1, demandInformationElement.getAreasFirstJobElement().length);
+ Assertions.assertEquals("area2", demandInformationElement.getAreasFirstJobElement()[0]);
+ Assertions.assertNull(demandInformationElement.getNumberOfFirstJobElementLocations());
+ Assertions.assertNull(demandInformationElement.getLocationsOfFirstJobElement());
+ Assertions.assertEquals(180, (int) demandInformationElement.getFirstJobElementTimePerUnit());
+ Assertions.assertEquals(TimeWindow.newInstance(3000, 13000),
demandInformationElement.getFirstJobElementTimeWindow());
- Assert.assertNull(demandInformationElement.getShareOfPopulationWithSecondJobElement());
- Assert.assertNull(demandInformationElement.getNumberOfSecondJobElementLocations());
- Assert.assertNull(demandInformationElement.getLocationsOfSecondJobElement());
- Assert.assertNull(demandInformationElement.getSecondJobElementTimePerUnit());
- Assert.assertNull(demandInformationElement.getSecondJobElementTimeWindow());
+ Assertions.assertNull(demandInformationElement.getShareOfPopulationWithSecondJobElement());
+ Assertions.assertNull(demandInformationElement.getNumberOfSecondJobElementLocations());
+ Assertions.assertNull(demandInformationElement.getLocationsOfSecondJobElement());
+ Assertions.assertNull(demandInformationElement.getSecondJobElementTimePerUnit());
+ Assertions.assertNull(demandInformationElement.getSecondJobElementTimeWindow());
} else if (demandInformationElement.getCarrierName().equals("testCarrier1")
&& demandInformationElement.getNumberOfJobs() == 10) {
- Assert.assertEquals(12, (int) demandInformationElement.getDemandToDistribute());
- Assert.assertNull(demandInformationElement.getShareOfPopulationWithFirstJobElement());
- Assert.assertNull(demandInformationElement.getAreasFirstJobElement());
- Assert.assertEquals(4, (int) demandInformationElement.getNumberOfFirstJobElementLocations());
- Assert.assertEquals(1, demandInformationElement.getLocationsOfFirstJobElement().length);
- Assert.assertEquals("i(2,0)", demandInformationElement.getLocationsOfFirstJobElement()[0]);
- Assert.assertEquals(100, (int) demandInformationElement.getFirstJobElementTimePerUnit());
- Assert.assertEquals(TimeWindow.newInstance(5000, 20000),
+ Assertions.assertEquals(12, (int) demandInformationElement.getDemandToDistribute());
+ Assertions.assertNull(demandInformationElement.getShareOfPopulationWithFirstJobElement());
+ Assertions.assertNull(demandInformationElement.getAreasFirstJobElement());
+ Assertions.assertEquals(4, (int) demandInformationElement.getNumberOfFirstJobElementLocations());
+ Assertions.assertEquals(1, demandInformationElement.getLocationsOfFirstJobElement().length);
+ Assertions.assertEquals("i(2,0)", demandInformationElement.getLocationsOfFirstJobElement()[0]);
+ Assertions.assertEquals(100, (int) demandInformationElement.getFirstJobElementTimePerUnit());
+ Assertions.assertEquals(TimeWindow.newInstance(5000, 20000),
demandInformationElement.getFirstJobElementTimeWindow());
- Assert.assertNull(demandInformationElement.getShareOfPopulationWithSecondJobElement());
- Assert.assertNull(demandInformationElement.getAreasSecondJobElement());
- Assert.assertNull(demandInformationElement.getNumberOfSecondJobElementLocations());
- Assert.assertNull(demandInformationElement.getLocationsOfSecondJobElement());
- Assert.assertNull(demandInformationElement.getSecondJobElementTimePerUnit());
- Assert.assertNull(demandInformationElement.getSecondJobElementTimeWindow());
+ Assertions.assertNull(demandInformationElement.getShareOfPopulationWithSecondJobElement());
+ Assertions.assertNull(demandInformationElement.getAreasSecondJobElement());
+ Assertions.assertNull(demandInformationElement.getNumberOfSecondJobElementLocations());
+ Assertions.assertNull(demandInformationElement.getLocationsOfSecondJobElement());
+ Assertions.assertNull(demandInformationElement.getSecondJobElementTimePerUnit());
+ Assertions.assertNull(demandInformationElement.getSecondJobElementTimeWindow());
} else if (demandInformationElement.getCarrierName().equals("testCarrier2")
&& demandInformationElement.getDemandToDistribute() == 0) {
- Assert.assertEquals(0, (int) demandInformationElement.getDemandToDistribute());
- Assert.assertEquals(4, (int) demandInformationElement.getNumberOfJobs());
- Assert.assertNull(demandInformationElement.getShareOfPopulationWithFirstJobElement());
- Assert.assertNull(demandInformationElement.getAreasFirstJobElement());
- Assert.assertNull(demandInformationElement.getNumberOfFirstJobElementLocations());
- Assert.assertNull(demandInformationElement.getLocationsOfFirstJobElement());
- Assert.assertEquals(300, (int) demandInformationElement.getFirstJobElementTimePerUnit());
- Assert.assertEquals(TimeWindow.newInstance(10000, 45000),
+ Assertions.assertEquals(0, (int) demandInformationElement.getDemandToDistribute());
+ Assertions.assertEquals(4, (int) demandInformationElement.getNumberOfJobs());
+ Assertions.assertNull(demandInformationElement.getShareOfPopulationWithFirstJobElement());
+ Assertions.assertNull(demandInformationElement.getAreasFirstJobElement());
+ Assertions.assertNull(demandInformationElement.getNumberOfFirstJobElementLocations());
+ Assertions.assertNull(demandInformationElement.getLocationsOfFirstJobElement());
+ Assertions.assertEquals(300, (int) demandInformationElement.getFirstJobElementTimePerUnit());
+ Assertions.assertEquals(TimeWindow.newInstance(10000, 45000),
demandInformationElement.getFirstJobElementTimeWindow());
- Assert.assertNull(demandInformationElement.getShareOfPopulationWithSecondJobElement());
- Assert.assertNull(demandInformationElement.getAreasSecondJobElement());
- Assert.assertEquals(1, (int) demandInformationElement.getNumberOfSecondJobElementLocations());
- Assert.assertEquals(1, demandInformationElement.getLocationsOfSecondJobElement().length);
- Assert.assertTrue(demandInformationElement.getLocationsOfSecondJobElement()[0].equals("i(2,0)"));
- Assert.assertEquals(350, (int) demandInformationElement.getSecondJobElementTimePerUnit());
- Assert.assertEquals(TimeWindow.newInstance(11000, 44000),
+ Assertions.assertNull(demandInformationElement.getShareOfPopulationWithSecondJobElement());
+ Assertions.assertNull(demandInformationElement.getAreasSecondJobElement());
+ Assertions.assertEquals(1, (int) demandInformationElement.getNumberOfSecondJobElementLocations());
+ Assertions.assertEquals(1, demandInformationElement.getLocationsOfSecondJobElement().length);
+ Assertions.assertTrue(demandInformationElement.getLocationsOfSecondJobElement()[0].equals("i(2,0)"));
+ Assertions.assertEquals(350, (int) demandInformationElement.getSecondJobElementTimePerUnit());
+ Assertions.assertEquals(TimeWindow.newInstance(11000, 44000),
demandInformationElement.getSecondJobElementTimeWindow());
} else if (demandInformationElement.getCarrierName().equals("testCarrier2")
&& demandInformationElement.getDemandToDistribute() == 15) {
- Assert.assertEquals(15, (int) demandInformationElement.getDemandToDistribute());
- Assert.assertEquals(7, (int) demandInformationElement.getNumberOfJobs());
- Assert.assertNull(demandInformationElement.getShareOfPopulationWithFirstJobElement());
- Assert.assertNull(demandInformationElement.getAreasFirstJobElement());
- Assert.assertEquals(1, (int) demandInformationElement.getNumberOfFirstJobElementLocations());
- Assert.assertNull(demandInformationElement.getLocationsOfFirstJobElement());
- Assert.assertEquals(200, (int) demandInformationElement.getFirstJobElementTimePerUnit());
- Assert.assertEquals(TimeWindow.newInstance(11000, 44000),
+ Assertions.assertEquals(15, (int) demandInformationElement.getDemandToDistribute());
+ Assertions.assertEquals(7, (int) demandInformationElement.getNumberOfJobs());
+ Assertions.assertNull(demandInformationElement.getShareOfPopulationWithFirstJobElement());
+ Assertions.assertNull(demandInformationElement.getAreasFirstJobElement());
+ Assertions.assertEquals(1, (int) demandInformationElement.getNumberOfFirstJobElementLocations());
+ Assertions.assertNull(demandInformationElement.getLocationsOfFirstJobElement());
+ Assertions.assertEquals(200, (int) demandInformationElement.getFirstJobElementTimePerUnit());
+ Assertions.assertEquals(TimeWindow.newInstance(11000, 44000),
demandInformationElement.getFirstJobElementTimeWindow());
- Assert.assertNull(demandInformationElement.getShareOfPopulationWithSecondJobElement());
- Assert.assertNull(demandInformationElement.getAreasSecondJobElement());
- Assert.assertEquals(2, (int) demandInformationElement.getNumberOfSecondJobElementLocations());
- Assert.assertNull(demandInformationElement.getLocationsOfSecondJobElement());
- Assert.assertEquals(200, (int) demandInformationElement.getSecondJobElementTimePerUnit());
- Assert.assertEquals(TimeWindow.newInstance(20000, 40000),
+ Assertions.assertNull(demandInformationElement.getShareOfPopulationWithSecondJobElement());
+ Assertions.assertNull(demandInformationElement.getAreasSecondJobElement());
+ Assertions.assertEquals(2, (int) demandInformationElement.getNumberOfSecondJobElementLocations());
+ Assertions.assertNull(demandInformationElement.getLocationsOfSecondJobElement());
+ Assertions.assertEquals(200, (int) demandInformationElement.getSecondJobElementTimePerUnit());
+ Assertions.assertEquals(TimeWindow.newInstance(20000, 40000),
demandInformationElement.getSecondJobElementTimeWindow());
} else if (demandInformationElement.getCarrierName().equals("testCarrier3")) {
- Assert.assertEquals(20, (int) demandInformationElement.getDemandToDistribute());
- Assert.assertNull(demandInformationElement.getNumberOfJobs());
- Assert.assertEquals(0.125, (double) demandInformationElement.getShareOfPopulationWithFirstJobElement(),
+ Assertions.assertEquals(20, (int) demandInformationElement.getDemandToDistribute());
+ Assertions.assertNull(demandInformationElement.getNumberOfJobs());
+ Assertions.assertEquals(0.125, (double) demandInformationElement.getShareOfPopulationWithFirstJobElement(),
MatsimTestUtils.EPSILON);
- Assert.assertNull(demandInformationElement.getAreasFirstJobElement());
- Assert.assertNull(demandInformationElement.getNumberOfFirstJobElementLocations());
- Assert.assertNull(demandInformationElement.getLocationsOfFirstJobElement());
- Assert.assertEquals(400, (int) demandInformationElement.getFirstJobElementTimePerUnit());
- Assert.assertEquals(TimeWindow.newInstance(8000, 50000),
+ Assertions.assertNull(demandInformationElement.getAreasFirstJobElement());
+ Assertions.assertNull(demandInformationElement.getNumberOfFirstJobElementLocations());
+ Assertions.assertNull(demandInformationElement.getLocationsOfFirstJobElement());
+ Assertions.assertEquals(400, (int) demandInformationElement.getFirstJobElementTimePerUnit());
+ Assertions.assertEquals(TimeWindow.newInstance(8000, 50000),
demandInformationElement.getFirstJobElementTimeWindow());
- Assert.assertEquals(0.4, (double) demandInformationElement.getShareOfPopulationWithSecondJobElement(),
+ Assertions.assertEquals(0.4, (double) demandInformationElement.getShareOfPopulationWithSecondJobElement(),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, demandInformationElement.getAreasSecondJobElement().length);
- Assert.assertEquals("area1", demandInformationElement.getAreasSecondJobElement()[0]);
- Assert.assertNull(demandInformationElement.getNumberOfSecondJobElementLocations());
- Assert.assertNull(demandInformationElement.getLocationsOfSecondJobElement());
- Assert.assertEquals(250, (int) demandInformationElement.getSecondJobElementTimePerUnit());
- Assert.assertEquals(TimeWindow.newInstance(10000, 60000),
+ Assertions.assertEquals(1, demandInformationElement.getAreasSecondJobElement().length);
+ Assertions.assertEquals("area1", demandInformationElement.getAreasSecondJobElement()[0]);
+ Assertions.assertNull(demandInformationElement.getNumberOfSecondJobElementLocations());
+ Assertions.assertNull(demandInformationElement.getLocationsOfSecondJobElement());
+ Assertions.assertEquals(250, (int) demandInformationElement.getSecondJobElementTimePerUnit());
+ Assertions.assertEquals(TimeWindow.newInstance(10000, 60000),
demandInformationElement.getSecondJobElementTimeWindow());
} else
- Assert.fail("No expected demandInformationElement found");
+ Assertions.fail("No expected demandInformationElement found");
}
}
}
diff --git a/contribs/application/src/test/java/org/matsim/freightDemandGeneration/FreightDemandGenerationTest.java b/contribs/application/src/test/java/org/matsim/freightDemandGeneration/FreightDemandGenerationTest.java
index 82ee3fc674a..a79ca63b52d 100644
--- a/contribs/application/src/test/java/org/matsim/freightDemandGeneration/FreightDemandGenerationTest.java
+++ b/contribs/application/src/test/java/org/matsim/freightDemandGeneration/FreightDemandGenerationTest.java
@@ -1,9 +1,9 @@
package org.matsim.freightDemandGeneration;
import org.apache.logging.log4j.LogManager;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
import java.nio.file.Path;
@@ -15,11 +15,11 @@
*/
public class FreightDemandGenerationTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testMain() {
+ void testMain() {
try {
Path output = Path.of(utils.getOutputDirectory());
Path vehicleFilePath = Path.of(utils.getPackageInputDirectory() + "testVehicleTypes.xml");
@@ -57,7 +57,7 @@ public void testMain() {
LogManager.getLogger(this.getClass()).fatal("there was an exception: \n" + ee);
ee.printStackTrace();
// if one catches an exception, then one needs to explicitly fail the test:
- Assert.fail();
+ Assertions.fail();
}
}
}
diff --git a/contribs/application/src/test/java/org/matsim/freightDemandGeneration/FreightDemandGenerationUtilsTest.java b/contribs/application/src/test/java/org/matsim/freightDemandGeneration/FreightDemandGenerationUtilsTest.java
index c8dbaeff5df..e1528caf871 100644
--- a/contribs/application/src/test/java/org/matsim/freightDemandGeneration/FreightDemandGenerationUtilsTest.java
+++ b/contribs/application/src/test/java/org/matsim/freightDemandGeneration/FreightDemandGenerationUtilsTest.java
@@ -3,9 +3,9 @@
import java.nio.file.Path;
import java.util.Collection;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.locationtech.jts.geom.Point;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
@@ -18,81 +18,83 @@
import org.matsim.core.population.PopulationUtils;
import org.matsim.core.utils.geometry.geotools.MGC;
import org.matsim.testcases.MatsimTestUtils;
-import org.opengis.feature.simple.SimpleFeature;
-
+import org.opengis.feature.simple.SimpleFeature;
+
/**
* @author Ricardo Ewert
*
*/
public class FreightDemandGenerationUtilsTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
-
- @Test
- public void testPreparePopulation() {
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
+
+ @Test
+ void testPreparePopulation() {
String populationLocation = utils.getPackageInputDirectory() + "testPopulation.xml";
Population population = PopulationUtils.readPopulation(populationLocation);
FreightDemandGenerationUtils.preparePopulation(population, 1.0, 1.0, "changeNumberOfLocationsWithDemand");
- Assert.assertEquals(8, population.getPersons().size());
- Assert.assertEquals(1.0,population.getAttributes().getAttribute("sampleSize"));
- Assert.assertEquals(1.0,population.getAttributes().getAttribute("samplingTo"));
- Assert.assertEquals("changeNumberOfLocationsWithDemand",population.getAttributes().getAttribute("samplingOption"));
+ Assertions.assertEquals(8, population.getPersons().size());
+ Assertions.assertEquals(1.0,population.getAttributes().getAttribute("sampleSize"));
+ Assertions.assertEquals(1.0,population.getAttributes().getAttribute("samplingTo"));
+ Assertions.assertEquals("changeNumberOfLocationsWithDemand",population.getAttributes().getAttribute("samplingOption"));
Person person = population.getPersons().get(Id.createPersonId("person1"));
- Assert.assertEquals(1200.0,person.getAttributes().getAttribute("homeX"));
- Assert.assertEquals(7700.0,person.getAttributes().getAttribute("homeY"));
- Assert.assertEquals(0, person.getPlans().size());
- Assert.assertNull(person.getSelectedPlan());
+ Assertions.assertEquals(1200.0,person.getAttributes().getAttribute("homeX"));
+ Assertions.assertEquals(7700.0,person.getAttributes().getAttribute("homeY"));
+ Assertions.assertEquals(0, person.getPlans().size());
+ Assertions.assertNull(person.getSelectedPlan());
person = population.getPersons().get(Id.createPersonId("person2"));
- Assert.assertEquals(2900.0,person.getAttributes().getAttribute("homeX"));
- Assert.assertEquals(2800.0,person.getAttributes().getAttribute("homeY"));
- Assert.assertEquals(0, person.getPlans().size());
- Assert.assertNull(person.getSelectedPlan());
+ Assertions.assertEquals(2900.0,person.getAttributes().getAttribute("homeX"));
+ Assertions.assertEquals(2800.0,person.getAttributes().getAttribute("homeY"));
+ Assertions.assertEquals(0, person.getPlans().size());
+ Assertions.assertNull(person.getSelectedPlan());
person = population.getPersons().get(Id.createPersonId("person3"));
- Assert.assertEquals(4200.0,person.getAttributes().getAttribute("homeX"));
- Assert.assertEquals(4400.0,person.getAttributes().getAttribute("homeY"));
- Assert.assertEquals(0, person.getPlans().size());
- Assert.assertNull(person.getSelectedPlan());
+ Assertions.assertEquals(4200.0,person.getAttributes().getAttribute("homeX"));
+ Assertions.assertEquals(4400.0,person.getAttributes().getAttribute("homeY"));
+ Assertions.assertEquals(0, person.getPlans().size());
+ Assertions.assertNull(person.getSelectedPlan());
person = population.getPersons().get(Id.createPersonId("person4"));
- Assert.assertEquals(5200.0,person.getAttributes().getAttribute("homeX"));
- Assert.assertEquals(2600.0,person.getAttributes().getAttribute("homeY"));
- Assert.assertEquals(0, person.getPlans().size());
- Assert.assertNull(person.getSelectedPlan());
+ Assertions.assertEquals(5200.0,person.getAttributes().getAttribute("homeX"));
+ Assertions.assertEquals(2600.0,person.getAttributes().getAttribute("homeY"));
+ Assertions.assertEquals(0, person.getPlans().size());
+ Assertions.assertNull(person.getSelectedPlan());
person = population.getPersons().get(Id.createPersonId("person5"));
- Assert.assertEquals(5200.0,person.getAttributes().getAttribute("homeX"));
- Assert.assertEquals(5500.0,person.getAttributes().getAttribute("homeY"));
- Assert.assertEquals(0, person.getPlans().size());
- Assert.assertNull(person.getSelectedPlan());
+ Assertions.assertEquals(5200.0,person.getAttributes().getAttribute("homeX"));
+ Assertions.assertEquals(5500.0,person.getAttributes().getAttribute("homeY"));
+ Assertions.assertEquals(0, person.getPlans().size());
+ Assertions.assertNull(person.getSelectedPlan());
person = population.getPersons().get(Id.createPersonId("person6"));
- Assert.assertEquals(7900.0,person.getAttributes().getAttribute("homeX"));
- Assert.assertEquals(7500.0,person.getAttributes().getAttribute("homeY"));
- Assert.assertEquals(0, person.getPlans().size());
- Assert.assertNull(person.getSelectedPlan());
+ Assertions.assertEquals(7900.0,person.getAttributes().getAttribute("homeX"));
+ Assertions.assertEquals(7500.0,person.getAttributes().getAttribute("homeY"));
+ Assertions.assertEquals(0, person.getPlans().size());
+ Assertions.assertNull(person.getSelectedPlan());
person = population.getPersons().get(Id.createPersonId("person7"));
- Assert.assertEquals(4900.0,person.getAttributes().getAttribute("homeX"));
- Assert.assertEquals(8900.0,person.getAttributes().getAttribute("homeY"));
- Assert.assertEquals(0, person.getPlans().size());
- Assert.assertNull(person.getSelectedPlan());
+ Assertions.assertEquals(4900.0,person.getAttributes().getAttribute("homeX"));
+ Assertions.assertEquals(8900.0,person.getAttributes().getAttribute("homeY"));
+ Assertions.assertEquals(0, person.getPlans().size());
+ Assertions.assertNull(person.getSelectedPlan());
person = population.getPersons().get(Id.createPersonId("person8"));
- Assert.assertEquals(8400.0,person.getAttributes().getAttribute("homeX"));
- Assert.assertEquals(5200.0,person.getAttributes().getAttribute("homeY"));
- Assert.assertEquals(0, person.getPlans().size());
- Assert.assertNull(person.getSelectedPlan());
- }
- @Test
- public void testCoordOfMiddlePointOfLink() {
+ Assertions.assertEquals(8400.0,person.getAttributes().getAttribute("homeX"));
+ Assertions.assertEquals(5200.0,person.getAttributes().getAttribute("homeY"));
+ Assertions.assertEquals(0, person.getPlans().size());
+ Assertions.assertNull(person.getSelectedPlan());
+ }
+
+ @Test
+ void testCoordOfMiddlePointOfLink() {
Network network = NetworkUtils.readNetwork("https://raw.githubusercontent.com/matsim-org/matsim-libs/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml");
Link link = network.getLinks().get(Id.createLinkId("i(8,8)"));
Coord middlePoint = FreightDemandGenerationUtils.getCoordOfMiddlePointOfLink(link);
- Assert.assertEquals(7500, middlePoint.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(8000, middlePoint.getY(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(7500, middlePoint.getX(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8000, middlePoint.getY(), MatsimTestUtils.EPSILON);
Link link2 = network.getLinks().get(Id.createLinkId("j(5,8)"));
Coord middlePoint2 = FreightDemandGenerationUtils.getCoordOfMiddlePointOfLink(link2);
- Assert.assertEquals(5000, middlePoint2.getX(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(7500, middlePoint2.getY(), MatsimTestUtils.EPSILON);
- }
- @Test
- public void testReducePopulationToShapeArea() {
+ Assertions.assertEquals(5000, middlePoint2.getX(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(7500, middlePoint2.getY(), MatsimTestUtils.EPSILON);
+ }
+
+ @Test
+ void testReducePopulationToShapeArea() {
String populationLocation = utils.getPackageInputDirectory() + "testPopulation.xml";
Population population = PopulationUtils.readPopulation(populationLocation);
FreightDemandGenerationUtils.preparePopulation(population, 1.0, 1.0, "changeNumberOfLocationsWithDemand");
@@ -100,39 +102,41 @@ public void testReducePopulationToShapeArea() {
ShpOptions shp = new ShpOptions(shapeFilePath,"WGS84", null);
ShpOptions.Index index = shp.createIndex("WGS84", "_");
FreightDemandGenerationUtils.reducePopulationToShapeArea(population, index);
- Assert.assertEquals(6, population.getPersons().size());
- Assert.assertFalse(population.getPersons().containsKey(Id.createPersonId("person2")));
- Assert.assertFalse(population.getPersons().containsKey(Id.createPersonId("person4")));
- }
- @Test
- public void testCheckPositionInShape_link() {
+ Assertions.assertEquals(6, population.getPersons().size());
+ Assertions.assertFalse(population.getPersons().containsKey(Id.createPersonId("person2")));
+ Assertions.assertFalse(population.getPersons().containsKey(Id.createPersonId("person4")));
+ }
+
+ @Test
+ void testCheckPositionInShape_link() {
Network network = NetworkUtils.readNetwork("https://raw.githubusercontent.com/matsim-org/matsim-libs/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml");
Link link = network.getLinks().get(Id.createLinkId("i(8,8)"));
Path shapeFilePath = Path.of(utils.getPackageInputDirectory() + "testShape/testShape.shp");
ShpOptions shp = new ShpOptions(shapeFilePath,"WGS84", null);
Collection polygonsInShape = shp.readFeatures();
- Assert.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, null, null));
- Assert.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area1"}, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area2"}, null));
+ Assertions.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, null, null));
+ Assertions.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area1"}, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area2"}, null));
link = network.getLinks().get(Id.createLinkId("i(6,3)R"));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, null, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area1"}, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area2"}, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, null, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area1"}, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(link, null, polygonsInShape, new String[]{"area2"}, null));
- }
- @Test
- public void testCheckPositionInShape_point() {
+ }
+
+ @Test
+ void testCheckPositionInShape_point() {
Path shapeFilePath = Path.of(utils.getPackageInputDirectory() + "testShape/testShape.shp");
ShpOptions shp = new ShpOptions(shapeFilePath,"WGS84", null);
Collection polygonsInShape = shp.readFeatures();
Point point = MGC.xy2Point(6000, 6000);
- Assert.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, null, null));
- Assert.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, new String[]{"area1"}, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, new String[]{"area2"}, null));
+ Assertions.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, null, null));
+ Assertions.assertTrue(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, new String[]{"area1"}, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, new String[]{"area2"}, null));
point = MGC.xy2Point(2000, 2000);
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, null, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, new String[]{"area1"}, null));
- Assert.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, new String[]{"area2"}, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, null, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, new String[]{"area1"}, null));
+ Assertions.assertFalse(FreightDemandGenerationUtils.checkPositionInShape(null, point, polygonsInShape, new String[]{"area2"}, null));
}
}
diff --git a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/LanduseBuildingAnalysisTest.java b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/LanduseBuildingAnalysisTest.java
index 9ba27596185..9957d7ef446 100644
--- a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/LanduseBuildingAnalysisTest.java
+++ b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/LanduseBuildingAnalysisTest.java
@@ -20,9 +20,9 @@
package org.matsim.smallScaleCommercialTrafficGeneration;
import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.application.options.ShpOptions;
import org.matsim.application.options.ShpOptions.Index;
import org.matsim.testcases.MatsimTestUtils;
@@ -42,11 +42,11 @@
*/
public class LanduseBuildingAnalysisTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testReadOfDataDistributionPerZoneAndBuildingAnalysis() throws IOException {
+ void testReadOfDataDistributionPerZoneAndBuildingAnalysis() throws IOException {
HashMap> landuseCategoriesAndDataConnection = new HashMap>();
HashMap>> buildingsPerZone = new HashMap<>();
@@ -65,24 +65,24 @@ public void testReadOfDataDistributionPerZoneAndBuildingAnalysis() throws IOExce
inputDataDirectory, usedLanduseConfiguration,
shapeFileLandusePath, shapeFileZonePath, shapeFileBuildingsPath, null, buildingsPerZone);
- Assert.assertEquals(3, resultingDataPerZone.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, resultingDataPerZone.size(), MatsimTestUtils.EPSILON);
- Assert.assertTrue(resultingDataPerZone.containsKey("testArea1_area1"));
- Assert.assertTrue(resultingDataPerZone.containsKey("testArea1_area2"));
- Assert.assertTrue(resultingDataPerZone.containsKey("testArea2_area3"));
+ Assertions.assertTrue(resultingDataPerZone.containsKey("testArea1_area1"));
+ Assertions.assertTrue(resultingDataPerZone.containsKey("testArea1_area2"));
+ Assertions.assertTrue(resultingDataPerZone.containsKey("testArea2_area3"));
for (String zone : resultingDataPerZone.keySet()) {
Object2DoubleMap categories = resultingDataPerZone.get(zone);
int employeeSum = 0;
- Assert.assertEquals(8, categories.size(), MatsimTestUtils.EPSILON);
- Assert.assertTrue(categories.containsKey("Inhabitants"));
- Assert.assertTrue(categories.containsKey("Employee"));
- Assert.assertTrue(categories.containsKey("Employee Primary Sector"));
- Assert.assertTrue(categories.containsKey("Employee Construction"));
- Assert.assertTrue(categories.containsKey("Employee Secondary Sector Rest"));
- Assert.assertTrue(categories.containsKey("Employee Retail"));
- Assert.assertTrue(categories.containsKey("Employee Traffic/Parcels"));
- Assert.assertTrue(categories.containsKey("Employee Tertiary Sector Rest"));
+ Assertions.assertEquals(8, categories.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertTrue(categories.containsKey("Inhabitants"));
+ Assertions.assertTrue(categories.containsKey("Employee"));
+ Assertions.assertTrue(categories.containsKey("Employee Primary Sector"));
+ Assertions.assertTrue(categories.containsKey("Employee Construction"));
+ Assertions.assertTrue(categories.containsKey("Employee Secondary Sector Rest"));
+ Assertions.assertTrue(categories.containsKey("Employee Retail"));
+ Assertions.assertTrue(categories.containsKey("Employee Traffic/Parcels"));
+ Assertions.assertTrue(categories.containsKey("Employee Tertiary Sector Rest"));
employeeSum += (int) categories.getDouble("Employee Primary Sector");
employeeSum += (int) categories.getDouble("Employee Construction");
@@ -91,60 +91,60 @@ public void testReadOfDataDistributionPerZoneAndBuildingAnalysis() throws IOExce
employeeSum += (int) categories.getDouble("Employee Traffic/Parcels");
employeeSum += (int) categories.getDouble("Employee Tertiary Sector Rest");
- Assert.assertEquals(categories.getDouble("Employee"), employeeSum, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(categories.getDouble("Employee"), employeeSum, MatsimTestUtils.EPSILON);
if (zone.equals("testArea1_area1")) {
- Assert.assertEquals(4000, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
+ Assertions.assertEquals(4000, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(3500, resultingDataPerZone.get(zone).getDouble("Employee"),
+ Assertions.assertEquals(3500, resultingDataPerZone.get(zone).getDouble("Employee"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(0, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
+ Assertions.assertEquals(0, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
+ Assertions.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
+ Assertions.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
MatsimTestUtils.EPSILON);
}
if (zone.equals("testArea1_area2")) {
- Assert.assertEquals(4000, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
+ Assertions.assertEquals(4000, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(6500, resultingDataPerZone.get(zone).getDouble("Employee"),
+ Assertions.assertEquals(6500, resultingDataPerZone.get(zone).getDouble("Employee"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1500, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
+ Assertions.assertEquals(1500, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1500, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
+ Assertions.assertEquals(1500, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(2000, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
+ Assertions.assertEquals(2000, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
MatsimTestUtils.EPSILON);
}
if (zone.equals("testArea2_area3")) {
- Assert.assertEquals(800, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
+ Assertions.assertEquals(800, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee"),
+ Assertions.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(50, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
+ Assertions.assertEquals(50, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(200, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
+ Assertions.assertEquals(200, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(100, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
+ Assertions.assertEquals(100, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(150, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
+ Assertions.assertEquals(150, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(200, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
+ Assertions.assertEquals(200, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(300, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
+ Assertions.assertEquals(300, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
MatsimTestUtils.EPSILON);
}
}
@@ -153,93 +153,93 @@ public void testReadOfDataDistributionPerZoneAndBuildingAnalysis() throws IOExce
Index indexZones = SmallScaleCommercialTrafficUtils.getIndexZones(shapeFileZonePath, shapeCRS);
ShpOptions shpBuildings = new ShpOptions(shapeFileBuildingsPath, null, StandardCharsets.UTF_8);
List buildingsFeatures = shpBuildings.readFeatures();
- Assert.assertEquals(31, buildingsFeatures.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(31, buildingsFeatures.size(), MatsimTestUtils.EPSILON);
LanduseBuildingAnalysis.analyzeBuildingType(buildingsFeatures, buildingsPerZone,
landuseCategoriesAndDataConnection, shapeFileLandusePath, indexZones, shapeCRS);
- Assert.assertEquals(3, buildingsPerZone.size(), MatsimTestUtils.EPSILON);
- Assert.assertTrue(buildingsPerZone.containsKey("testArea1_area1"));
- Assert.assertTrue(buildingsPerZone.containsKey("testArea1_area2"));
- Assert.assertTrue(buildingsPerZone.containsKey("testArea2_area3"));
+ Assertions.assertEquals(3, buildingsPerZone.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertTrue(buildingsPerZone.containsKey("testArea1_area1"));
+ Assertions.assertTrue(buildingsPerZone.containsKey("testArea1_area2"));
+ Assertions.assertTrue(buildingsPerZone.containsKey("testArea2_area3"));
// test for area1
HashMap> builingsPerArea1 = buildingsPerZone.get("testArea1_area1");
- Assert.assertEquals(7, builingsPerArea1.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(7, builingsPerArea1.size(), MatsimTestUtils.EPSILON);
ArrayList inhabitantsBuildings = builingsPerArea1.get("Inhabitants");
- Assert.assertEquals(4, inhabitantsBuildings.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(4, inhabitantsBuildings.size(), MatsimTestUtils.EPSILON);
for (SimpleFeature singleBuilding : inhabitantsBuildings) {
int id = (int) (long) singleBuilding.getAttribute("osm_id");
if (id == 11) {
- Assert.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
- Assert.assertEquals("apartments", String.valueOf(singleBuilding.getAttribute("type")));
+ Assertions.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
+ Assertions.assertEquals("apartments", String.valueOf(singleBuilding.getAttribute("type")));
} else if (id == 12) {
- Assert.assertEquals("1", String.valueOf(singleBuilding.getAttribute("levels")));
- Assert.assertEquals("house", String.valueOf(singleBuilding.getAttribute("type")));
+ Assertions.assertEquals("1", String.valueOf(singleBuilding.getAttribute("levels")));
+ Assertions.assertEquals("house", String.valueOf(singleBuilding.getAttribute("type")));
} else if (id == 13) {
- Assert.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
- Assert.assertEquals("residential", String.valueOf(singleBuilding.getAttribute("type")));
+ Assertions.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
+ Assertions.assertEquals("residential", String.valueOf(singleBuilding.getAttribute("type")));
} else if (id == 19) {
- Assert.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
- Assert.assertEquals("detached", String.valueOf(singleBuilding.getAttribute("type")));
+ Assertions.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
+ Assertions.assertEquals("detached", String.valueOf(singleBuilding.getAttribute("type")));
} else
- Assert.fail();
+ Assertions.fail();
}
- Assert.assertFalse(builingsPerArea1.containsKey("Employee Primary Sector"));
- Assert.assertEquals(1, builingsPerArea1.get("Employee Construction").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea1.get("Employee Secondary Sector Rest").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, builingsPerArea1.get("Employee Retail").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea1.get("Employee Traffic/Parcels").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, builingsPerArea1.get("Employee Tertiary Sector Rest").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, builingsPerArea1.get("Employee").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertFalse(builingsPerArea1.containsKey("Employee Primary Sector"));
+ Assertions.assertEquals(1, builingsPerArea1.get("Employee Construction").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea1.get("Employee Secondary Sector Rest").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, builingsPerArea1.get("Employee Retail").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea1.get("Employee Traffic/Parcels").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, builingsPerArea1.get("Employee Tertiary Sector Rest").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, builingsPerArea1.get("Employee").size(), MatsimTestUtils.EPSILON);
// test for area2
HashMap> builingsPerArea2 = buildingsPerZone.get("testArea1_area2");
- Assert.assertEquals(8, builingsPerArea2.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8, builingsPerArea2.size(), MatsimTestUtils.EPSILON);
ArrayList employeeRetail = builingsPerArea2.get("Employee Retail");
- Assert.assertEquals(2, employeeRetail.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, employeeRetail.size(), MatsimTestUtils.EPSILON);
for (SimpleFeature singleBuilding : employeeRetail) {
int id = (int) (long) singleBuilding.getAttribute("osm_id");
if (id == 1) {
- Assert.assertEquals("1", String.valueOf(singleBuilding.getAttribute("levels")));
- Assert.assertEquals("retail", String.valueOf(singleBuilding.getAttribute("type")));
+ Assertions.assertEquals("1", String.valueOf(singleBuilding.getAttribute("levels")));
+ Assertions.assertEquals("retail", String.valueOf(singleBuilding.getAttribute("type")));
} else if (id == 3) {
- Assert.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
- Assert.assertEquals("retail", String.valueOf(singleBuilding.getAttribute("type")));
+ Assertions.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
+ Assertions.assertEquals("retail", String.valueOf(singleBuilding.getAttribute("type")));
} else
- Assert.fail();
+ Assertions.fail();
}
- Assert.assertEquals(2, builingsPerArea2.get("Inhabitants").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea2.get("Employee Primary Sector").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea2.get("Employee Construction").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea2.get("Employee Secondary Sector Rest").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, builingsPerArea2.get("Employee Traffic/Parcels").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, builingsPerArea2.get("Employee Tertiary Sector Rest").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(8, builingsPerArea2.get("Employee").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, builingsPerArea2.get("Inhabitants").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea2.get("Employee Primary Sector").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea2.get("Employee Construction").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea2.get("Employee Secondary Sector Rest").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, builingsPerArea2.get("Employee Traffic/Parcels").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, builingsPerArea2.get("Employee Tertiary Sector Rest").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8, builingsPerArea2.get("Employee").size(), MatsimTestUtils.EPSILON);
// test for area3
HashMap> builingsPerArea3 = buildingsPerZone.get("testArea2_area3");
- Assert.assertEquals(8, builingsPerArea3.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8, builingsPerArea3.size(), MatsimTestUtils.EPSILON);
ArrayList tertiaryRetail = builingsPerArea3.get("Employee Tertiary Sector Rest");
- Assert.assertEquals(1, tertiaryRetail.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, tertiaryRetail.size(), MatsimTestUtils.EPSILON);
for (SimpleFeature singleBuilding : tertiaryRetail) {
int id = (int) (long) singleBuilding.getAttribute("osm_id");
if (id == 26) {
- Assert.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
- Assert.assertEquals("foundation", String.valueOf(singleBuilding.getAttribute("type")));
+ Assertions.assertEquals("2", String.valueOf(singleBuilding.getAttribute("levels")));
+ Assertions.assertEquals("foundation", String.valueOf(singleBuilding.getAttribute("type")));
} else
- Assert.fail();
+ Assertions.fail();
}
- Assert.assertEquals(3, builingsPerArea3.get("Inhabitants").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea3.get("Employee Primary Sector").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea3.get("Employee Construction").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea3.get("Employee Secondary Sector Rest").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, builingsPerArea3.get("Employee Traffic/Parcels").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, builingsPerArea3.get("Employee Retail").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(7, builingsPerArea3.get("Employee").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, builingsPerArea3.get("Inhabitants").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea3.get("Employee Primary Sector").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea3.get("Employee Construction").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea3.get("Employee Secondary Sector Rest").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, builingsPerArea3.get("Employee Traffic/Parcels").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, builingsPerArea3.get("Employee Retail").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(7, builingsPerArea3.get("Employee").size(), MatsimTestUtils.EPSILON);
}
@Test
- public void testLanduseDistribution() throws IOException {
+ void testLanduseDistribution() throws IOException {
HashMap> landuseCategoriesAndDataConnection = new HashMap>();
HashMap>> buildingsPerZone = new HashMap<>();
@@ -257,24 +257,24 @@ public void testLanduseDistribution() throws IOException {
inputDataDirectory, usedLanduseConfiguration,
shapeFileLandusePath, shapeFileZonePath, shapeFileBuildingsPath, null, buildingsPerZone);
- Assert.assertEquals(3, resultingDataPerZone.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, resultingDataPerZone.size(), MatsimTestUtils.EPSILON);
- Assert.assertTrue(resultingDataPerZone.containsKey("testArea1_area1"));
- Assert.assertTrue(resultingDataPerZone.containsKey("testArea1_area2"));
- Assert.assertTrue(resultingDataPerZone.containsKey("testArea2_area3"));
+ Assertions.assertTrue(resultingDataPerZone.containsKey("testArea1_area1"));
+ Assertions.assertTrue(resultingDataPerZone.containsKey("testArea1_area2"));
+ Assertions.assertTrue(resultingDataPerZone.containsKey("testArea2_area3"));
for (String zone : resultingDataPerZone.keySet()) {
Object2DoubleMap categories = resultingDataPerZone.get(zone);
int employeeSum = 0;
- Assert.assertEquals(8, categories.size(), MatsimTestUtils.EPSILON);
- Assert.assertTrue(categories.containsKey("Inhabitants"));
- Assert.assertTrue(categories.containsKey("Employee"));
- Assert.assertTrue(categories.containsKey("Employee Primary Sector"));
- Assert.assertTrue(categories.containsKey("Employee Construction"));
- Assert.assertTrue(categories.containsKey("Employee Secondary Sector Rest"));
- Assert.assertTrue(categories.containsKey("Employee Retail"));
- Assert.assertTrue(categories.containsKey("Employee Traffic/Parcels"));
- Assert.assertTrue(categories.containsKey("Employee Tertiary Sector Rest"));
+ Assertions.assertEquals(8, categories.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertTrue(categories.containsKey("Inhabitants"));
+ Assertions.assertTrue(categories.containsKey("Employee"));
+ Assertions.assertTrue(categories.containsKey("Employee Primary Sector"));
+ Assertions.assertTrue(categories.containsKey("Employee Construction"));
+ Assertions.assertTrue(categories.containsKey("Employee Secondary Sector Rest"));
+ Assertions.assertTrue(categories.containsKey("Employee Retail"));
+ Assertions.assertTrue(categories.containsKey("Employee Traffic/Parcels"));
+ Assertions.assertTrue(categories.containsKey("Employee Tertiary Sector Rest"));
employeeSum += (int) categories.getDouble("Employee Primary Sector");
employeeSum += (int) categories.getDouble("Employee Construction");
@@ -283,60 +283,60 @@ public void testLanduseDistribution() throws IOException {
employeeSum += (int) categories.getDouble("Employee Traffic/Parcels");
employeeSum += (int) categories.getDouble("Employee Tertiary Sector Rest");
- Assert.assertEquals(categories.getDouble("Employee"), employeeSum, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(categories.getDouble("Employee"), employeeSum, MatsimTestUtils.EPSILON);
if (zone.equals("testArea1_area1")) {
- Assert.assertEquals(4000, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
+ Assertions.assertEquals(4000, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(3500, resultingDataPerZone.get(zone).getDouble("Employee"),
+ Assertions.assertEquals(3500, resultingDataPerZone.get(zone).getDouble("Employee"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(0, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
+ Assertions.assertEquals(0, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
+ Assertions.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
+ Assertions.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
MatsimTestUtils.EPSILON);
}
if (zone.equals("testArea1_area2")) {
- Assert.assertEquals(4000, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
+ Assertions.assertEquals(4000, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(6500, resultingDataPerZone.get(zone).getDouble("Employee"),
+ Assertions.assertEquals(6500, resultingDataPerZone.get(zone).getDouble("Employee"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1500, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
+ Assertions.assertEquals(1500, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
+ Assertions.assertEquals(500, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1500, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
+ Assertions.assertEquals(1500, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(2000, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
+ Assertions.assertEquals(2000, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
MatsimTestUtils.EPSILON);
}
if (zone.equals("testArea2_area3")) {
- Assert.assertEquals(800, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
+ Assertions.assertEquals(800, resultingDataPerZone.get(zone).getDouble("Inhabitants"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee"),
+ Assertions.assertEquals(1000, resultingDataPerZone.get(zone).getDouble("Employee"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(50, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
+ Assertions.assertEquals(50, resultingDataPerZone.get(zone).getDouble("Employee Primary Sector"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(200, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
+ Assertions.assertEquals(200, resultingDataPerZone.get(zone).getDouble("Employee Construction"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(100, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
+ Assertions.assertEquals(100, resultingDataPerZone.get(zone).getDouble("Employee Secondary Sector Rest"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(150, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
+ Assertions.assertEquals(150, resultingDataPerZone.get(zone).getDouble("Employee Retail"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(200, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
+ Assertions.assertEquals(200, resultingDataPerZone.get(zone).getDouble("Employee Traffic/Parcels"),
MatsimTestUtils.EPSILON);
- Assert.assertEquals(300, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
+ Assertions.assertEquals(300, resultingDataPerZone.get(zone).getDouble("Employee Tertiary Sector Rest"),
MatsimTestUtils.EPSILON);
}
}
diff --git a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/RunGenerateSmallScaleCommercialTrafficTest.java b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/RunGenerateSmallScaleCommercialTrafficTest.java
index d0f4620ac71..62127e7e2f5 100644
--- a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/RunGenerateSmallScaleCommercialTrafficTest.java
+++ b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/RunGenerateSmallScaleCommercialTrafficTest.java
@@ -19,9 +19,9 @@
* *********************************************************************** */
package org.matsim.smallScaleCommercialTrafficGeneration;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.population.Person;
import org.matsim.api.core.v01.population.Population;
@@ -43,11 +43,11 @@
*/
public class RunGenerateSmallScaleCommercialTrafficTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testMainRunAndResults() {
+ void testMainRunAndResults() {
String inputDataDirectory = utils.getPackageInputDirectory() + "config_demand.xml";
String output = utils.getOutputDirectory();
String sample = "0.1";
@@ -102,19 +102,19 @@ public void testMainRunAndResults() {
assert population != null;
for (Person person : population.getPersons().values()) {
- Assert.assertNotNull(person.getSelectedPlan());
- Assert.assertTrue(person.getAttributes().getAsMap().containsKey("tourStartArea"));
- Assert.assertTrue(person.getAttributes().getAsMap().containsKey("vehicles"));
- Assert.assertTrue(person.getAttributes().getAsMap().containsKey("subpopulation"));
- Assert.assertTrue(person.getAttributes().getAsMap().containsKey("purpose"));
+ Assertions.assertNotNull(person.getSelectedPlan());
+ Assertions.assertTrue(person.getAttributes().getAsMap().containsKey("tourStartArea"));
+ Assertions.assertTrue(person.getAttributes().getAsMap().containsKey("vehicles"));
+ Assertions.assertTrue(person.getAttributes().getAsMap().containsKey("subpopulation"));
+ Assertions.assertTrue(person.getAttributes().getAsMap().containsKey("purpose"));
}
- Assert.assertEquals(CarriersUtils.addOrGetCarriers(scenarioWSolution).getCarriers().size(),
+ Assertions.assertEquals(CarriersUtils.addOrGetCarriers(scenarioWSolution).getCarriers().size(),
CarriersUtils.addOrGetCarriers(scenarioWOSolution).getCarriers().size(), 0);
int countedTours = 0;
for (Carrier carrier_withSolution : CarriersUtils.addOrGetCarriers(scenarioWSolution).getCarriers().values()) {
countedTours += carrier_withSolution.getSelectedPlan().getScheduledTours().size();
}
- Assert.assertEquals(population.getPersons().size(), countedTours, 0);
+ Assertions.assertEquals(population.getPersons().size(), countedTours, 0);
}
}
diff --git a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/SmallScaleCommercialTrafficUtilsTest.java b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/SmallScaleCommercialTrafficUtilsTest.java
index 84c5e0bd188..0b89332ca30 100644
--- a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/SmallScaleCommercialTrafficUtilsTest.java
+++ b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/SmallScaleCommercialTrafficUtilsTest.java
@@ -19,9 +19,9 @@
* *********************************************************************** */
package org.matsim.smallScaleCommercialTrafficGeneration;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Link;
@@ -46,11 +46,11 @@
*/
public class SmallScaleCommercialTrafficUtilsTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void findZoneOfLinksTest() throws IOException, URISyntaxException {
+ void findZoneOfLinksTest() throws IOException, URISyntaxException {
Path inputDataDirectory = Path.of(utils.getPackageInputDirectory());
Path shapeFileZonePath = inputDataDirectory.resolve("shp/testZones.shp");
@@ -67,14 +67,14 @@ public void findZoneOfLinksTest() throws IOException, URISyntaxException {
.filterLinksForZones(scenario, shpZones, SmallScaleCommercialTrafficUtils.getIndexZones(shapeFileZonePath, config.global().getCoordinateSystem()),
buildingsPerZone);
- Assert.assertEquals(3, regionLinksMap.size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(60, regionLinksMap.get("testArea1_area1").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(41, regionLinksMap.get("testArea1_area2").size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(28, regionLinksMap.get("testArea2_area3").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, regionLinksMap.size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(60, regionLinksMap.get("testArea1_area1").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(41, regionLinksMap.get("testArea1_area2").size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(28, regionLinksMap.get("testArea2_area3").size(), MatsimTestUtils.EPSILON);
- Assert.assertNull(SmallScaleCommercialTrafficUtils.findZoneOfLink(Id.createLinkId("j(5,4)"), regionLinksMap));
- Assert.assertEquals("testArea1_area1", SmallScaleCommercialTrafficUtils.findZoneOfLink(Id.createLinkId("j(6,5)R"), regionLinksMap));
- Assert.assertEquals("testArea1_area2", SmallScaleCommercialTrafficUtils.findZoneOfLink(Id.createLinkId("j(2,7)R"), regionLinksMap));
- Assert.assertEquals("testArea2_area3", SmallScaleCommercialTrafficUtils.findZoneOfLink(Id.createLinkId("j(2,2)R"), regionLinksMap));
+ Assertions.assertNull(SmallScaleCommercialTrafficUtils.findZoneOfLink(Id.createLinkId("j(5,4)"), regionLinksMap));
+ Assertions.assertEquals("testArea1_area1", SmallScaleCommercialTrafficUtils.findZoneOfLink(Id.createLinkId("j(6,5)R"), regionLinksMap));
+ Assertions.assertEquals("testArea1_area2", SmallScaleCommercialTrafficUtils.findZoneOfLink(Id.createLinkId("j(2,7)R"), regionLinksMap));
+ Assertions.assertEquals("testArea2_area3", SmallScaleCommercialTrafficUtils.findZoneOfLink(Id.createLinkId("j(2,2)R"), regionLinksMap));
}
}
diff --git a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/TrafficVolumeGenerationTest.java b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/TrafficVolumeGenerationTest.java
index fe522f7462d..c1d80ed77d6 100644
--- a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/TrafficVolumeGenerationTest.java
+++ b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/TrafficVolumeGenerationTest.java
@@ -20,9 +20,9 @@
package org.matsim.smallScaleCommercialTrafficGeneration;
import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Link;
@@ -49,11 +49,11 @@
*/
public class TrafficVolumeGenerationTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testTrafficVolumeGenerationCommercialPersonTraffic() throws IOException {
+ void testTrafficVolumeGenerationCommercialPersonTraffic() throws IOException {
HashMap> landuseCategoriesAndDataConnection = new HashMap<>();
HashMap>> buildingsPerZone = new HashMap<>();
@@ -84,52 +84,52 @@ public void testTrafficVolumeGenerationCommercialPersonTraffic() throws IOExcept
HashMap> trafficVolumePerTypeAndZone_stop = TrafficVolumeGeneration
.createTrafficVolume_stop(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_start.size());
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_stop.size());
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_start.size());
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_stop.size());
for (String zone : resultingDataPerZone.keySet()) {
TrafficVolumeKey trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey(zone, modesORvehTypes.get(0));
- Assert.assertTrue(trafficVolumePerTypeAndZone_start.containsKey(trafficVolumeKey));
- Assert.assertTrue(trafficVolumePerTypeAndZone_stop.containsKey(trafficVolumeKey));
+ Assertions.assertTrue(trafficVolumePerTypeAndZone_start.containsKey(trafficVolumeKey));
+ Assertions.assertTrue(trafficVolumePerTypeAndZone_stop.containsKey(trafficVolumeKey));
}
TrafficVolumeKey trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea1_area1", modesORvehTypes.get(0));
- Assert.assertEquals(30, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(124, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(277, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(175, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(250, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(105, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(426, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(121, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(65, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(30, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(124, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(277, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(175, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(250, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(105, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(426, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(121, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(65, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea1_area2", modesORvehTypes.get(0));
- Assert.assertEquals(30, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(211, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(514, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(441, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(630, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(202, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(859, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(246, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(102, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(30, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(211, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(514, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(441, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(630, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(202, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(859, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(246, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(102, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea2_area3", modesORvehTypes.get(0));
- Assert.assertEquals(6, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(34, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(79, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(62, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(88, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(34, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(79, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(62, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(88, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(31, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(128, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(37, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(17, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(31, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(128, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(37, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(17, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
//test with different sample
@@ -139,51 +139,51 @@ public void testTrafficVolumeGenerationCommercialPersonTraffic() throws IOExcept
trafficVolumePerTypeAndZone_stop = TrafficVolumeGeneration
.createTrafficVolume_stop(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_start.size());
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_stop.size());
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_start.size());
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_stop.size());
trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea1_area1", modesORvehTypes.get(0));
- Assert.assertEquals(7, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(31, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(69, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(44, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(63, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(26, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(106, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(30, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(16, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(7, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(31, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(69, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(44, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(63, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(26, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(106, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(30, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(16, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea1_area2", modesORvehTypes.get(0));
- Assert.assertEquals(7, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(53, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(129, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(110, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(158, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(50, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(215, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(61, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(25, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(7, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(53, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(129, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(110, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(158, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(50, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(215, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(61, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(25, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea2_area3", modesORvehTypes.get(0));
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(8, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(20, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(15, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(22, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(8, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(32, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(9, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(4, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(20, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(15, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(22, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(32, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(9, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(4, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
}
@Test
- public void testTrafficVolumeGenerationGoodsTraffic() throws IOException {
+ void testTrafficVolumeGenerationGoodsTraffic() throws IOException {
HashMap> landuseCategoriesAndDataConnection = new HashMap<>();
HashMap>> buildingsPerZone = new HashMap<>();
@@ -214,14 +214,14 @@ public void testTrafficVolumeGenerationGoodsTraffic() throws IOException {
HashMap> trafficVolumePerTypeAndZone_stop = TrafficVolumeGeneration
.createTrafficVolume_stop(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
- Assert.assertEquals(15, trafficVolumePerTypeAndZone_start.size());
- Assert.assertEquals(15, trafficVolumePerTypeAndZone_stop.size());
+ Assertions.assertEquals(15, trafficVolumePerTypeAndZone_start.size());
+ Assertions.assertEquals(15, trafficVolumePerTypeAndZone_stop.size());
for (String zone : resultingDataPerZone.keySet()) {
for (String modesORvehType : modesORvehTypes) {
TrafficVolumeKey trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey(zone, modesORvehType);
- Assert.assertTrue(trafficVolumePerTypeAndZone_start.containsKey(trafficVolumeKey));
- Assert.assertTrue(trafficVolumePerTypeAndZone_stop.containsKey(trafficVolumeKey));
+ Assertions.assertTrue(trafficVolumePerTypeAndZone_start.containsKey(trafficVolumeKey));
+ Assertions.assertTrue(trafficVolumePerTypeAndZone_stop.containsKey(trafficVolumeKey));
}
}
@@ -249,83 +249,83 @@ public void testTrafficVolumeGenerationGoodsTraffic() throws IOException {
sumStart += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(i);
sumStop += trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(i);
if (modeORvehType.equals("vehTyp1")) {
- Assert.assertEquals(5, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(16, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(101, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(36, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(33, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(5, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(17, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(73, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(54, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(5, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(16, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(101, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(36, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(33, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(5, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(17, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(73, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(54, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
}
if (modeORvehType.equals("vehTyp2")) {
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(21, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(11, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(23, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(10, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(13, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(20, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(7, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(11, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(21, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(11, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(23, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(10, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(13, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(20, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(7, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(11, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
}
if (modeORvehType.equals("vehTyp3")) {
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(44, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(42, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(28, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(23, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(4, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(8, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(28, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(73, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(15, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(44, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(42, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(28, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(23, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(4, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(28, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(73, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(15, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
}
if (modeORvehType.equals("vehTyp4")) {
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(10, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(13, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(0, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(5, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(20, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(5, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(10, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(13, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(0, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(5, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(20, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(5, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
}
if (modeORvehType.equals("vehTyp5")) {
- Assert.assertEquals(2, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(4, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(29, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(72, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(31, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(4, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(20, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(133, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(8, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(4, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(29, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(72, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(31, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(4, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(20, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(133, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
}
}
- Assert.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
- Assert.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
}
// test for "testArea1_area2"
@@ -352,8 +352,8 @@ public void testTrafficVolumeGenerationGoodsTraffic() throws IOException {
sumStart += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(i);
sumStop += trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(i);
}
- Assert.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
- Assert.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
}
// test for "testArea2_area3"
@@ -380,13 +380,13 @@ public void testTrafficVolumeGenerationGoodsTraffic() throws IOException {
sumStart += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(i);
sumStop += trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(i);
}
- Assert.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
- Assert.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
}
}
@Test
- public void testAddingExistingScenarios() throws Exception {
+ void testAddingExistingScenarios() throws Exception {
Path inputDataDirectory = Path.of(utils.getPackageInputDirectory());
Path shapeFileZonePath = inputDataDirectory.resolve("shp/testZones.shp");
@@ -406,53 +406,53 @@ public void testAddingExistingScenarios() throws Exception {
SmallScaleCommercialTrafficUtils.readExistingModels(scenario, sample, regionLinksMap);
- Assert.assertEquals(3, CarriersUtils.getCarriers(scenario).getCarriers().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, CarriersUtils.getCarrierVehicleTypes(scenario).getVehicleTypes().size(), MatsimTestUtils.EPSILON);
- Assert.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleServiceCarrier_carrier1", Carrier.class)));
- Assert.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleServiceCarrier_carrier2", Carrier.class)));
- Assert.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleShipmentCarrier_carrier1", Carrier.class)));
+ Assertions.assertEquals(3, CarriersUtils.getCarriers(scenario).getCarriers().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, CarriersUtils.getCarrierVehicleTypes(scenario).getVehicleTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleServiceCarrier_carrier1", Carrier.class)));
+ Assertions.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleServiceCarrier_carrier2", Carrier.class)));
+ Assertions.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleShipmentCarrier_carrier1", Carrier.class)));
Carrier addedCarrier1 = CarriersUtils.getCarriers(scenario).getCarriers().get(Id.create("exampleServiceCarrier_carrier1", Carrier.class));
- Assert.assertNotNull(addedCarrier1.getSelectedPlan());
- Assert.assertEquals(0, CarriersUtils.getJspritIterations(addedCarrier1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier1.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier1.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(3, addedCarrier1.getSelectedPlan().getScheduledTours().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(30, addedCarrier1.getServices().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, addedCarrier1.getAttributes().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("commercialPersonTraffic", addedCarrier1.getAttributes().getAttribute("subpopulation"));
- Assert.assertEquals(2, (int) addedCarrier1.getAttributes().getAttribute("purpose"));
- Assert.assertEquals("exampleServiceCarrier", addedCarrier1.getAttributes().getAttribute("existingModel"));
- Assert.assertEquals("car", addedCarrier1.getAttributes().getAttribute("networkMode"));
- Assert.assertNull(addedCarrier1.getAttributes().getAttribute("vehicleType"));
- Assert.assertEquals("testArea2_area3", addedCarrier1.getAttributes().getAttribute("tourStartArea"));
+ Assertions.assertNotNull(addedCarrier1.getSelectedPlan());
+ Assertions.assertEquals(0, CarriersUtils.getJspritIterations(addedCarrier1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier1.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier1.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, addedCarrier1.getSelectedPlan().getScheduledTours().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(30, addedCarrier1.getServices().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, addedCarrier1.getAttributes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals("commercialPersonTraffic", addedCarrier1.getAttributes().getAttribute("subpopulation"));
+ Assertions.assertEquals(2, (int) addedCarrier1.getAttributes().getAttribute("purpose"));
+ Assertions.assertEquals("exampleServiceCarrier", addedCarrier1.getAttributes().getAttribute("existingModel"));
+ Assertions.assertEquals("car", addedCarrier1.getAttributes().getAttribute("networkMode"));
+ Assertions.assertNull(addedCarrier1.getAttributes().getAttribute("vehicleType"));
+ Assertions.assertEquals("testArea2_area3", addedCarrier1.getAttributes().getAttribute("tourStartArea"));
Carrier addedCarrier2 = CarriersUtils.getCarriers(scenario).getCarriers().get(Id.create("exampleServiceCarrier_carrier2", Carrier.class));
- Assert.assertNotNull(addedCarrier2.getSelectedPlan());
- Assert.assertEquals(0, CarriersUtils.getJspritIterations(addedCarrier2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier2.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier2.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, addedCarrier2.getSelectedPlan().getScheduledTours().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(20, addedCarrier2.getServices().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("commercialPersonTraffic", addedCarrier2.getAttributes().getAttribute("subpopulation"));
- Assert.assertEquals(2, (int) addedCarrier2.getAttributes().getAttribute("purpose"));
- Assert.assertEquals("exampleServiceCarrier", addedCarrier2.getAttributes().getAttribute("existingModel"));
- Assert.assertEquals("car", addedCarrier2.getAttributes().getAttribute("networkMode"));
- Assert.assertNull(addedCarrier2.getAttributes().getAttribute("vehicleType"));
- Assert.assertEquals("testArea2_area3", addedCarrier2.getAttributes().getAttribute("tourStartArea"));
+ Assertions.assertNotNull(addedCarrier2.getSelectedPlan());
+ Assertions.assertEquals(0, CarriersUtils.getJspritIterations(addedCarrier2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier2.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier2.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, addedCarrier2.getSelectedPlan().getScheduledTours().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(20, addedCarrier2.getServices().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals("commercialPersonTraffic", addedCarrier2.getAttributes().getAttribute("subpopulation"));
+ Assertions.assertEquals(2, (int) addedCarrier2.getAttributes().getAttribute("purpose"));
+ Assertions.assertEquals("exampleServiceCarrier", addedCarrier2.getAttributes().getAttribute("existingModel"));
+ Assertions.assertEquals("car", addedCarrier2.getAttributes().getAttribute("networkMode"));
+ Assertions.assertNull(addedCarrier2.getAttributes().getAttribute("vehicleType"));
+ Assertions.assertEquals("testArea2_area3", addedCarrier2.getAttributes().getAttribute("tourStartArea"));
Carrier addedCarrier3 = CarriersUtils.getCarriers(scenario).getCarriers().get(Id.create("exampleShipmentCarrier_carrier1", Carrier.class));
- Assert.assertNull(addedCarrier3.getSelectedPlan());
- Assert.assertEquals(50, CarriersUtils.getJspritIterations(addedCarrier3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier3.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier3.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(FleetSize.INFINITE, addedCarrier3.getCarrierCapabilities().getFleetSize());
- Assert.assertEquals(0, addedCarrier3.getServices().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(5, addedCarrier3.getShipments().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertNull(addedCarrier3.getSelectedPlan());
+ Assertions.assertEquals(50, CarriersUtils.getJspritIterations(addedCarrier3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier3.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier3.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(FleetSize.INFINITE, addedCarrier3.getCarrierCapabilities().getFleetSize());
+ Assertions.assertEquals(0, addedCarrier3.getServices().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(5, addedCarrier3.getShipments().size(), MatsimTestUtils.EPSILON);
}
@Test
- public void testAddingExistingScenariosWithSample() throws Exception {
+ void testAddingExistingScenariosWithSample() throws Exception {
Path inputDataDirectory = Path.of(utils.getPackageInputDirectory());
Path shapeFileZonePath = inputDataDirectory.resolve("shp/testZones.shp");
@@ -472,38 +472,38 @@ public void testAddingExistingScenariosWithSample() throws Exception {
SmallScaleCommercialTrafficUtils.readExistingModels(scenario, sample, regionLinksMap);
- Assert.assertEquals(2, CarriersUtils.getCarriers(scenario).getCarriers().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, CarriersUtils.getCarrierVehicleTypes(scenario).getVehicleTypes().size(), MatsimTestUtils.EPSILON);
- Assert.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleServiceCarrier_carrier1", Carrier.class)));
- Assert.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleShipmentCarrier_carrier1", Carrier.class)));
+ Assertions.assertEquals(2, CarriersUtils.getCarriers(scenario).getCarriers().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, CarriersUtils.getCarrierVehicleTypes(scenario).getVehicleTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleServiceCarrier_carrier1", Carrier.class)));
+ Assertions.assertTrue(CarriersUtils.getCarriers(scenario).getCarriers().containsKey(Id.create("exampleShipmentCarrier_carrier1", Carrier.class)));
Carrier addedCarrier1 = CarriersUtils.getCarriers(scenario).getCarriers().get(Id.create("exampleServiceCarrier_carrier1", Carrier.class));
- Assert.assertNotNull(addedCarrier1.getSelectedPlan());
- Assert.assertEquals(0, CarriersUtils.getJspritIterations(addedCarrier1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier1.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier1.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier1.getSelectedPlan().getScheduledTours().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(10, addedCarrier1.getServices().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, addedCarrier1.getAttributes().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals("commercialPersonTraffic", addedCarrier1.getAttributes().getAttribute("subpopulation"));
- Assert.assertEquals(2, (int) addedCarrier1.getAttributes().getAttribute("purpose"));
- Assert.assertEquals("exampleServiceCarrier", addedCarrier1.getAttributes().getAttribute("existingModel"));
- Assert.assertEquals("car", addedCarrier1.getAttributes().getAttribute("networkMode"));
- Assert.assertNull(addedCarrier1.getAttributes().getAttribute("vehicleType"));
- Assert.assertEquals("testArea2_area3", addedCarrier1.getAttributes().getAttribute("tourStartArea"));
+ Assertions.assertNotNull(addedCarrier1.getSelectedPlan());
+ Assertions.assertEquals(0, CarriersUtils.getJspritIterations(addedCarrier1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier1.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier1.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier1.getSelectedPlan().getScheduledTours().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(10, addedCarrier1.getServices().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, addedCarrier1.getAttributes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals("commercialPersonTraffic", addedCarrier1.getAttributes().getAttribute("subpopulation"));
+ Assertions.assertEquals(2, (int) addedCarrier1.getAttributes().getAttribute("purpose"));
+ Assertions.assertEquals("exampleServiceCarrier", addedCarrier1.getAttributes().getAttribute("existingModel"));
+ Assertions.assertEquals("car", addedCarrier1.getAttributes().getAttribute("networkMode"));
+ Assertions.assertNull(addedCarrier1.getAttributes().getAttribute("vehicleType"));
+ Assertions.assertEquals("testArea2_area3", addedCarrier1.getAttributes().getAttribute("tourStartArea"));
Carrier addedCarrier3 = CarriersUtils.getCarriers(scenario).getCarriers().get(Id.create("exampleShipmentCarrier_carrier1", Carrier.class));
- Assert.assertNull(addedCarrier3.getSelectedPlan());
- Assert.assertEquals(50, CarriersUtils.getJspritIterations(addedCarrier3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier3.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier3.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(FleetSize.INFINITE, addedCarrier3.getCarrierCapabilities().getFleetSize());
- Assert.assertEquals(0, addedCarrier3.getServices().size(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, addedCarrier3.getShipments().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertNull(addedCarrier3.getSelectedPlan());
+ Assertions.assertEquals(50, CarriersUtils.getJspritIterations(addedCarrier3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier3.getCarrierCapabilities().getCarrierVehicles().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier3.getCarrierCapabilities().getVehicleTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(FleetSize.INFINITE, addedCarrier3.getCarrierCapabilities().getFleetSize());
+ Assertions.assertEquals(0, addedCarrier3.getServices().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, addedCarrier3.getShipments().size(), MatsimTestUtils.EPSILON);
}
@Test
- public void testReducingDemandAfterAddingExistingScenarios_goods() throws Exception {
+ void testReducingDemandAfterAddingExistingScenarios_goods() throws Exception {
HashMap> landuseCategoriesAndDataConnection = new HashMap<>();
HashMap>> buildingsPerZone = new HashMap<>();
@@ -571,23 +571,23 @@ public void testReducingDemandAfterAddingExistingScenarios_goods() throws Except
sumStart += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(i);
sumStop += trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(i);
if (modeORvehType.equals("vehTyp3")) {
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(44, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(42, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(28, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(23, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(4, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(8, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(26, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(73, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(15, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(44, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(42, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(28, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(23, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(4, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(8, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(26, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(73, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(15, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
}
}
- Assert.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
- Assert.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
}
// test for "testArea1_area2"
@@ -614,8 +614,8 @@ public void testReducingDemandAfterAddingExistingScenarios_goods() throws Except
sumStart += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(i);
sumStop += trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(i);
}
- Assert.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
- Assert.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
}
// test for "testArea2_area3"
@@ -642,28 +642,28 @@ public void testReducingDemandAfterAddingExistingScenarios_goods() throws Except
sumStart += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(i);
sumStop += trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(i);
if (modeORvehType.equals("vehTyp3")) {
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(7, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(17, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(11, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(5, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
-
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(6, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(14, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(3, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(7, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(17, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(11, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(5, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
+
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(14, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(6), MatsimTestUtils.EPSILON);
}
}
- Assert.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
- Assert.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStart.get(i), sumStart, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(estimatesStop.get(i), sumStop, MatsimTestUtils.EPSILON);
}
}
@Test
- public void testReducingDemandAfterAddingExistingScenarios_commercialPersonTraffic() throws Exception {
+ void testReducingDemandAfterAddingExistingScenarios_commercialPersonTraffic() throws Exception {
HashMap> landuseCategoriesAndDataConnection = new HashMap<>();
HashMap>> buildingsPerZone = new HashMap<>();
@@ -711,58 +711,57 @@ public void testReducingDemandAfterAddingExistingScenarios_commercialPersonTraff
double sumOfStartOtherAreas = 0;
TrafficVolumeKey trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea1_area1", modesORvehTypes.get(0));
- Assert.assertEquals(30, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(30, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
sumOfStartOtherAreas += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2);
- Assert.assertEquals(277, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(175, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(250, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(277, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(175, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(250, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(85, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(426, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(121, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(65, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(85, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(426, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(121, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(65, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea1_area2", modesORvehTypes.get(0));
- Assert.assertEquals(30, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(30, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
sumOfStartOtherAreas += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2);
- Assert.assertEquals(514, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(441, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(630, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(514, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(441, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(630, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(187, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(859, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(246, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(102, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(10, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(187, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(859, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(246, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(102, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
trafficVolumeKey = TrafficVolumeGeneration.makeTrafficVolumeKey("testArea2_area3", modesORvehTypes.get(0));
- Assert.assertEquals(6, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(0, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
sumOfStartOtherAreas += trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(2);
- Assert.assertEquals(79, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(62, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(88, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(79, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(62, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(88, trafficVolumePerTypeAndZone_start.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals(27, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals(128, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
- Assert.assertEquals(37, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
- Assert.assertEquals(17, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(2, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(27, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(128, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(37, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(4), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(17, trafficVolumePerTypeAndZone_stop.get(trafficVolumeKey).getDouble(5), MatsimTestUtils.EPSILON);
- Assert.assertEquals(330, sumOfStartOtherAreas, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(330, sumOfStartOtherAreas, MatsimTestUtils.EPSILON);
}
-
@Test
- public void testTrafficVolumeKeyGeneration() {
+ void testTrafficVolumeKeyGeneration() {
String zone = "zone1";
String mode = "modeA";
TrafficVolumeKey newKey = TrafficVolumeGeneration.makeTrafficVolumeKey(zone, mode);
- Assert.assertEquals(newKey.getZone(), zone);
- Assert.assertEquals(newKey.getModeORvehType(), mode);
+ Assertions.assertEquals(newKey.getZone(), zone);
+ Assertions.assertEquals(newKey.getModeORvehType(), mode);
}
}
diff --git a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/TripDistributionMatrixTest.java b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/TripDistributionMatrixTest.java
index 4392957d1c9..0c8f2522a37 100644
--- a/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/TripDistributionMatrixTest.java
+++ b/contribs/application/src/test/java/org/matsim/smallScaleCommercialTrafficGeneration/TripDistributionMatrixTest.java
@@ -20,9 +20,9 @@
package org.matsim.smallScaleCommercialTrafficGeneration;
import it.unimi.dsi.fastutil.objects.Object2DoubleMap;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.api.core.v01.network.Network;
@@ -43,11 +43,11 @@
*/
public class TripDistributionMatrixTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testTripDistributionCommercialPersonTrafficTraffic() throws IOException {
+ void testTripDistributionCommercialPersonTrafficTraffic() throws IOException {
HashMap> landuseCategoriesAndDataConnection = new HashMap>();
HashMap>> buildingsPerZone = new HashMap<>();
@@ -104,16 +104,16 @@ public void testTripDistributionCommercialPersonTrafficTraffic() throws IOExcept
odMatrix.clearRoundingError();
//tests
- Assert.assertEquals(3, odMatrix.getListOfZones().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, odMatrix.getListOfZones().size(), MatsimTestUtils.EPSILON);
for (String zone : resultingDataPerZone.keySet()) {
- Assert.assertTrue(odMatrix.getListOfZones().contains(zone));
+ Assertions.assertTrue(odMatrix.getListOfZones().contains(zone));
}
- Assert.assertEquals(1, odMatrix.getListOfModesOrVehTypes().size(), MatsimTestUtils.EPSILON);
- Assert.assertTrue(odMatrix.getListOfModesOrVehTypes().contains("total"));
+ Assertions.assertEquals(1, odMatrix.getListOfModesOrVehTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertTrue(odMatrix.getListOfModesOrVehTypes().contains("total"));
- Assert.assertEquals(5, odMatrix.getListOfPurposes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(5, odMatrix.getListOfPurposes().size(), MatsimTestUtils.EPSILON);
for (int i = 1; i <= 5; i++) {
- Assert.assertTrue(odMatrix.getListOfPurposes().contains(i));
+ Assertions.assertTrue(odMatrix.getListOfPurposes().contains(i));
}
double sumStartServices = 0;
double sumStopServices = 0;
@@ -129,15 +129,15 @@ public void testTripDistributionCommercialPersonTrafficTraffic() throws IOExcept
sumStartServices += odMatrix.getSumOfServicesForStartZone(zone, modeORvehType, purpose,
usedTrafficType);
double planedVolume = trafficVolumePerTypeAndZone_stop.get(key).getDouble(purpose);
- Assert.assertEquals(planedVolume, generatedVolume, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(planedVolume, generatedVolume, MatsimTestUtils.EPSILON);
}
}
}
- Assert.assertEquals(sumStartServices, sumStopServices, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(sumStartServices, sumStopServices, MatsimTestUtils.EPSILON);
}
@Test
- public void testTripDistributionGoodsTraffic() throws IOException {
+ void testTripDistributionGoodsTraffic() throws IOException {
HashMap> landuseCategoriesAndDataConnection = new HashMap>();
HashMap>> buildingsPerZone = new HashMap<>();
@@ -194,18 +194,18 @@ public void testTripDistributionGoodsTraffic() throws IOException {
odMatrix.clearRoundingError();
//tests
- Assert.assertEquals(3, odMatrix.getListOfZones().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, odMatrix.getListOfZones().size(), MatsimTestUtils.EPSILON);
for (String zone : resultingDataPerZone.keySet()) {
- Assert.assertTrue(odMatrix.getListOfZones().contains(zone));
+ Assertions.assertTrue(odMatrix.getListOfZones().contains(zone));
}
- Assert.assertEquals(5, odMatrix.getListOfModesOrVehTypes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(5, odMatrix.getListOfModesOrVehTypes().size(), MatsimTestUtils.EPSILON);
for (String modeORvehType : modesORvehTypes) {
- Assert.assertTrue(odMatrix.getListOfModesOrVehTypes().contains(modeORvehType));
+ Assertions.assertTrue(odMatrix.getListOfModesOrVehTypes().contains(modeORvehType));
}
- Assert.assertEquals(6, odMatrix.getListOfPurposes().size(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(6, odMatrix.getListOfPurposes().size(), MatsimTestUtils.EPSILON);
for (int i = 1; i <= 6; i++) {
- Assert.assertTrue(odMatrix.getListOfPurposes().contains(i));
+ Assertions.assertTrue(odMatrix.getListOfPurposes().contains(i));
}
double sumStartServices = 0;
double sumStopServices = 0;
@@ -221,10 +221,10 @@ public void testTripDistributionGoodsTraffic() throws IOException {
sumStartServices += odMatrix.getSumOfServicesForStartZone(zone, modeORvehType, purpose,
usedTrafficType);
double planedVolume = trafficVolumePerTypeAndZone_stop.get(key).getDouble(purpose);
- Assert.assertEquals(planedVolume, generatedVolume, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(planedVolume, generatedVolume, MatsimTestUtils.EPSILON);
}
}
}
- Assert.assertEquals(sumStartServices, sumStopServices, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(sumStartServices, sumStopServices, MatsimTestUtils.EPSILON);
}
}
diff --git a/contribs/application/test/input/org/matsim/application/prepare/CreateLandUseShpTest/andorra-latest-free.shp.zip b/contribs/application/test/input/org/matsim/application/prepare/CreateLandUseShpTest/andorra-latest-free.shp.zip
index 3e1b339376e..8c2e290f582 100644
Binary files a/contribs/application/test/input/org/matsim/application/prepare/CreateLandUseShpTest/andorra-latest-free.shp.zip and b/contribs/application/test/input/org/matsim/application/prepare/CreateLandUseShpTest/andorra-latest-free.shp.zip differ
diff --git a/contribs/av/src/test/java/org/matsim/contrib/av/flow/RunAvExampleIT.java b/contribs/av/src/test/java/org/matsim/contrib/av/flow/RunAvExampleIT.java
index 442047d0674..ddc697ee825 100644
--- a/contribs/av/src/test/java/org/matsim/contrib/av/flow/RunAvExampleIT.java
+++ b/contribs/av/src/test/java/org/matsim/contrib/av/flow/RunAvExampleIT.java
@@ -26,19 +26,19 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
/**
* @author jbischoff
*/
public class RunAvExampleIT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testAvFlowExample() throws MalformedURLException {
+ void testAvFlowExample() throws MalformedURLException {
URL configUrl = new File(utils.getPackageInputDirectory() + "config.xml").toURI().toURL();
new RunAvExample().run(configUrl, false);
}
diff --git a/contribs/av/src/test/java/org/matsim/contrib/av/flow/TestAvFlowFactor.java b/contribs/av/src/test/java/org/matsim/contrib/av/flow/TestAvFlowFactor.java
index 67837840838..8a486ca716e 100644
--- a/contribs/av/src/test/java/org/matsim/contrib/av/flow/TestAvFlowFactor.java
+++ b/contribs/av/src/test/java/org/matsim/contrib/av/flow/TestAvFlowFactor.java
@@ -26,9 +26,9 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.events.LinkEnterEvent;
@@ -44,11 +44,11 @@
import org.matsim.vis.otfvis.OTFVisConfigGroup;
public class TestAvFlowFactor {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testAvFlowFactor() throws MalformedURLException {
+ void testAvFlowFactor() throws MalformedURLException {
URL configUrl = new File(utils.getPackageInputDirectory() + "config.xml").toURI().toURL();
Config config = ConfigUtils.loadConfig(configUrl, new OTFVisConfigGroup());
Scenario scenario = ScenarioUtils.loadScenario(config);
@@ -70,8 +70,8 @@ public void testAvFlowFactor() throws MalformedURLException {
controler.getEvents().addHandler(vehicleTimeCounter);
controler.run();
- Assert.assertEquals(vehicleTimeCounter.lastAVEnterTime, 32598, 0.1);
- Assert.assertEquals(vehicleTimeCounter.lastNonAVEnterTime, 36179, 0.1);
+ Assertions.assertEquals(vehicleTimeCounter.lastAVEnterTime, 32598, 0.1);
+ Assertions.assertEquals(vehicleTimeCounter.lastNonAVEnterTime, 36179, 0.1);
}
diff --git a/contribs/av/src/test/java/org/matsim/contrib/av/intermodal/RunTaxiPTIntermodalExampleIT.java b/contribs/av/src/test/java/org/matsim/contrib/av/intermodal/RunTaxiPTIntermodalExampleIT.java
index 7fe1d1624c6..2721030096d 100644
--- a/contribs/av/src/test/java/org/matsim/contrib/av/intermodal/RunTaxiPTIntermodalExampleIT.java
+++ b/contribs/av/src/test/java/org/matsim/contrib/av/intermodal/RunTaxiPTIntermodalExampleIT.java
@@ -29,9 +29,9 @@
import java.util.List;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
import org.matsim.api.core.v01.population.Leg;
@@ -48,11 +48,11 @@
* @author jbischoff
*/
public class RunTaxiPTIntermodalExampleIT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testIntermodalExample() throws MalformedURLException {
+ void testIntermodalExample() throws MalformedURLException {
URL configUrl = new File(utils.getClassInputDirectory() + "config.xml").toURI().toURL();
new RunTaxiPTIntermodalExample().run(configUrl, false);
@@ -83,7 +83,7 @@ public void testIntermodalExample() throws MalformedURLException {
}
}
- Assert.assertTrue("no pt agent has any intermodal route (=taxi for access or egress to pt)",
- intermodalTripCounter > 0);
+ Assertions.assertTrue(intermodalTripCounter > 0,
+ "no pt agent has any intermodal route (=taxi for access or egress to pt)");
}
}
diff --git a/contribs/av/src/test/java/org/matsim/contrib/av/robotaxi/run/RunDrtAndTaxiExampleTest.java b/contribs/av/src/test/java/org/matsim/contrib/av/robotaxi/run/RunDrtAndTaxiExampleTest.java
index 2a85956ae3f..aa513d2a9e5 100644
--- a/contribs/av/src/test/java/org/matsim/contrib/av/robotaxi/run/RunDrtAndTaxiExampleTest.java
+++ b/contribs/av/src/test/java/org/matsim/contrib/av/robotaxi/run/RunDrtAndTaxiExampleTest.java
@@ -22,13 +22,13 @@
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
public class RunDrtAndTaxiExampleTest {
@Test
- public void run() {
+ void run() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"),
"one_taxi_and_one_shared_taxi_config.xml");
RunDrtAndTaxiExample.run(configUrl, false);
diff --git a/contribs/av/src/test/java/org/matsim/contrib/av/robotaxi/run/RunRobotaxiExampleIT.java b/contribs/av/src/test/java/org/matsim/contrib/av/robotaxi/run/RunRobotaxiExampleIT.java
index 9c56af75336..a256bd46e52 100644
--- a/contribs/av/src/test/java/org/matsim/contrib/av/robotaxi/run/RunRobotaxiExampleIT.java
+++ b/contribs/av/src/test/java/org/matsim/contrib/av/robotaxi/run/RunRobotaxiExampleIT.java
@@ -22,7 +22,7 @@
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
@@ -31,7 +31,7 @@
*/
public class RunRobotaxiExampleIT {
@Test
- public void testRun() {
+ void testRun() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_taxi_config.xml");
RunRobotaxiExample.run(configUrl, false);
}
diff --git a/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleLinkSpeedCalculatorTest.java b/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleLinkSpeedCalculatorTest.java
index 1af7f1aec93..8d58af0313f 100644
--- a/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleLinkSpeedCalculatorTest.java
+++ b/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleLinkSpeedCalculatorTest.java
@@ -1,8 +1,8 @@
package org.matsim.contrib.bicycle;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
@@ -30,18 +30,19 @@
import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class BicycleLinkSpeedCalculatorTest {
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ public MatsimTestUtils utils = new MatsimTestUtils();
private static final double MAX_BICYCLE_SPEED = 15;
private final Config config = ConfigUtils.createConfig();
private BicycleConfigGroup configGroup;
private final Network unusedNetwork = NetworkUtils.createNetwork();
- @Before
+ @BeforeEach
public void before() {
configGroup = ConfigUtils.addOrGetModule( config, BicycleConfigGroup.class );
configGroup.setMaxBicycleSpeedForRouting(MAX_BICYCLE_SPEED);
@@ -58,8 +59,8 @@ private static Vehicle createVehicle(double maxVelocity, long id) {
return VehicleUtils.createVehicle(Id.createVehicleId(id), type);
}
- @Test
- public void getMaximumVelocity_bike() {
+ @Test
+ void getMaximumVelocity_bike() {
Link link = createLinkWithNoGradientAndNoSpecialSurface();
QVehicle vehicle = new QVehicleImpl(createVehicle(link.getFreespeed() * 0.5, 1)); // higher speed than the default
@@ -70,8 +71,8 @@ public void getMaximumVelocity_bike() {
assertEquals(vehicle.getMaximumVelocity(), speed, 0.0);
}
- @Test
- public void getMaximumVelocity_bike_fasterThanFreespeed() {
+ @Test
+ void getMaximumVelocity_bike_fasterThanFreespeed() {
Link link = createLinkWithNoGradientAndNoSpecialSurface();
QVehicle vehicle = new QVehicleImpl(createVehicle(link.getFreespeed() * 2, 1));
@@ -82,8 +83,8 @@ public void getMaximumVelocity_bike_fasterThanFreespeed() {
assertEquals(link.getFreespeed(), speed, 0.0);
}
- @Test
- public void getMaximumVelocityForLink_bikeIsNull() {
+ @Test
+ void getMaximumVelocityForLink_bikeIsNull() {
Link link = createLinkWithNoGradientAndNoSpecialSurface();
BicycleLinkSpeedCalculatorDefaultImpl calculator = new BicycleLinkSpeedCalculatorDefaultImpl(config);
@@ -93,8 +94,8 @@ public void getMaximumVelocityForLink_bikeIsNull() {
assertEquals(configGroup.getMaxBicycleSpeedForRouting(), speed, 0.001);
}
- @Test
- public void getMaximumVelocityForLink_withGradient() {
+ @Test
+ void getMaximumVelocityForLink_withGradient() {
Link linkForComparison = createLinkWithNoGradientAndNoSpecialSurface();
Link linkWithGradient = createLink(100, "paved", "not-a-cycle-way", 1.0);
@@ -108,8 +109,8 @@ public void getMaximumVelocityForLink_withGradient() {
assertTrue(comparisonSpeed > gradientSpeed);
}
- @Test
- public void getMaximumVelocityForLink_withReducedSpeedFactor() {
+ @Test
+ void getMaximumVelocityForLink_withReducedSpeedFactor() {
Link linkForComparison = createLinkWithNoGradientAndNoSpecialSurface();
Link linkWithReducedSpeed = createLink(0, "paved", "not-a-cycle-way", 0.5);
@@ -123,8 +124,8 @@ public void getMaximumVelocityForLink_withReducedSpeedFactor() {
assertTrue(comparisonSpeed > gradientSpeed);
}
- @Test
- public void getMaximumVelocityForLink_noSpeedFactor() {
+ @Test
+ void getMaximumVelocityForLink_noSpeedFactor() {
var link = createLinkWithNoGradientAndNoSpecialSurface();
var vehicle = createVehicle(link.getFreespeed() + 1, 1);
@@ -135,8 +136,8 @@ public void getMaximumVelocityForLink_noSpeedFactor() {
assertEquals(link.getFreespeed(), speed, 0.001);
}
- @Test
- public void getMaximumVelocityForLink_withRoughSurface() {
+ @Test
+ void getMaximumVelocityForLink_withRoughSurface() {
Link linkForComparison = createLinkWithNoGradientAndNoSpecialSurface();
Link linkWithCobbleStone = createLink(0, "cobblestone", "not-a-cycle-way", 1.0);
@@ -177,8 +178,8 @@ private Link createLink(double elevation, String surfaceType, String wayType, do
return link;
}
- @Test
- public void getMaximumVelocityForLink_withCycleWay() {
+ @Test
+ void getMaximumVelocityForLink_withCycleWay() {
Link linkForComparison = createLinkWithNoGradientAndNoSpecialSurface();
Link linkWithCobbleStone = createLink(0, "some-surface", BicycleUtils.CYCLEWAY, 1.0);
diff --git a/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleUtilityUtilsTest.java b/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleUtilityUtilsTest.java
index 19697a3afaf..3d9d4ff5c90 100644
--- a/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleUtilityUtilsTest.java
+++ b/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/BicycleUtilityUtilsTest.java
@@ -1,41 +1,41 @@
package org.matsim.contrib.bicycle;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.core.network.NetworkUtils;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public class BicycleUtilityUtilsTest {
@Test
- public void getGradientNoFromZ() {
+ void getGradientNoFromZ() {
var link = createLink(new Coord(0, 0), new Coord(100, 0, 100));
assertEquals(0., BicycleUtils.getGradient(link ), 0.00001 );
}
@Test
- public void getGradientNoToZ() {
+ void getGradientNoToZ() {
var link = createLink(new Coord(0, 0, 100), new Coord(100, 0));
assertEquals(0., BicycleUtils.getGradient(link ), 0.00001 );
}
@Test
- public void getGradientFlat() {
+ void getGradientFlat() {
var link = createLink(new Coord(0, 0, 100), new Coord(100, 0, 100));
assertEquals(0., BicycleUtils.getGradient(link ), 0.00001 );
}
@Test
- public void getGradientUphill() {
+ void getGradientUphill() {
var link = createLink(new Coord(0, 0, 0), new Coord(100, 0, 100));
assertEquals(1., BicycleUtils.getGradient(link ), 0.00001 );
}
@Test
- public void getGradientDownhill() {
+ void getGradientDownhill() {
var link = createLink(new Coord(0, 0, 100), new Coord(100, 0, 0));
assertEquals(0., BicycleUtils.getGradient(link ), 0.00001 );
}
diff --git a/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/run/BicycleTest.java b/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/run/BicycleTest.java
index 0f2dea83a91..961e43f0182 100644
--- a/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/run/BicycleTest.java
+++ b/contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/run/BicycleTest.java
@@ -20,9 +20,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
@@ -63,8 +63,8 @@
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.matsim.utils.eventsfilecomparison.EventsFileComparator.Result.FILES_ARE_EQUAL;
/**
@@ -75,10 +75,11 @@ public class BicycleTest {
private static final String bicycleMode = "bicycle";
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ public MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testNormal() {
+ void testNormal() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
config.addModule(new BicycleConfigGroup());
RunBicycleExample.fillConfigWithBicycleStandardValues(config);
@@ -96,8 +97,9 @@ public void testNormal() {
LOG.info("Checking MATSim events file ...");
final String eventsFilenameReference = utils.getInputDirectory() + "output_events.xml.gz";
final String eventsFilenameNew = utils.getOutputDirectory() + "output_events.xml.gz";
- assertEquals("Different event files.", FILES_ARE_EQUAL,
- new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew));
+ assertEquals(FILES_ARE_EQUAL,
+ new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew),
+ "Different event files.");
Scenario scenarioReference = ScenarioUtils.createScenario(ConfigUtils.createConfig());
Scenario scenarioCurrent = ScenarioUtils.createScenario(ConfigUtils.createConfig());
@@ -106,13 +108,13 @@ public void testNormal() {
for (Id personId : scenarioReference.getPopulation().getPersons().keySet()) {
double scoreReference = scenarioReference.getPopulation().getPersons().get(personId).getSelectedPlan().getScore();
double scoreCurrent = scenarioCurrent.getPopulation().getPersons().get(personId).getSelectedPlan().getScore();
- Assert.assertEquals("Scores of persons " + personId + " are different", scoreReference, scoreCurrent, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(scoreReference, scoreCurrent, MatsimTestUtils.EPSILON, "Scores of persons " + personId + " are different");
}
- assertTrue("Populations are different", PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()));
+ assertTrue(PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()), "Populations are different");
}
@Test
- public void testCobblestone() {
+ void testCobblestone() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
config.addModule(new BicycleConfigGroup());
RunBicycleExample.fillConfigWithBicycleStandardValues(config);
@@ -133,19 +135,20 @@ public void testCobblestone() {
Scenario scenarioCurrent = ScenarioUtils.createScenario( ConfigUtils.createConfig() );
new PopulationReader( scenarioReference ).readFile( utils.getInputDirectory() + "output_plans.xml.gz" );
new PopulationReader( scenarioCurrent ).readFile( utils.getOutputDirectory() + "output_plans.xml.gz" );
- assertTrue( "Populations are different", PopulationUtils.equalPopulation( scenarioReference.getPopulation(), scenarioCurrent.getPopulation() ) );
+ assertTrue( PopulationUtils.equalPopulation( scenarioReference.getPopulation(), scenarioCurrent.getPopulation() ), "Populations are different" );
}
{
LOG.info( "Checking MATSim events file ..." );
final String eventsFilenameReference = utils.getInputDirectory() + "output_events.xml.gz";
final String eventsFilenameNew = utils.getOutputDirectory() + "output_events.xml.gz";
- assertEquals( "Different event files.", FILES_ARE_EQUAL,
- new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew ));
+ assertEquals( FILES_ARE_EQUAL,
+ new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew ),
+ "Different event files.");
}
}
@Test
- public void testPedestrian() {
+ void testPedestrian() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
config.addModule(new BicycleConfigGroup());
RunBicycleExample.fillConfigWithBicycleStandardValues(config);
@@ -163,18 +166,19 @@ public void testPedestrian() {
LOG.info("Checking MATSim events file ...");
final String eventsFilenameReference = utils.getInputDirectory() + "output_events.xml.gz";
final String eventsFilenameNew = utils.getOutputDirectory() + "output_events.xml.gz";
- assertEquals("Different event files.", FILES_ARE_EQUAL,
- new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew));
+ assertEquals(FILES_ARE_EQUAL,
+ new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew),
+ "Different event files.");
Scenario scenarioReference = ScenarioUtils.createScenario(ConfigUtils.createConfig());
Scenario scenarioCurrent = ScenarioUtils.createScenario(ConfigUtils.createConfig());
new PopulationReader(scenarioReference).readFile(utils.getInputDirectory() + "output_plans.xml.gz");
new PopulationReader(scenarioCurrent).readFile(utils.getOutputDirectory() + "output_plans.xml.gz");
- assertTrue("Populations are different", PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()));
+ assertTrue(PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()), "Populations are different");
}
@Test
- public void testLane() {
+ void testLane() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
config.addModule(new BicycleConfigGroup());
RunBicycleExample.fillConfigWithBicycleStandardValues(config);
@@ -192,18 +196,19 @@ public void testLane() {
LOG.info("Checking MATSim events file ...");
final String eventsFilenameReference = utils.getInputDirectory() + "output_events.xml.gz";
final String eventsFilenameNew = utils.getOutputDirectory() + "output_events.xml.gz";
- assertEquals("Different event files.", FILES_ARE_EQUAL,
- new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew));
+ assertEquals(FILES_ARE_EQUAL,
+ new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew),
+ "Different event files.");
Scenario scenarioReference = ScenarioUtils.createScenario(ConfigUtils.createConfig());
Scenario scenarioCurrent = ScenarioUtils.createScenario(ConfigUtils.createConfig());
new PopulationReader(scenarioReference).readFile(utils.getInputDirectory() + "output_plans.xml.gz");
new PopulationReader(scenarioCurrent).readFile(utils.getOutputDirectory() + "output_plans.xml.gz");
- assertTrue("Populations are different", PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()));
+ assertTrue(PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()), "Populations are different");
}
@Test
- public void testGradient() {
+ void testGradient() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
config.addModule(new BicycleConfigGroup());
RunBicycleExample.fillConfigWithBicycleStandardValues(config);
@@ -221,18 +226,19 @@ public void testGradient() {
LOG.info("Checking MATSim events file ...");
final String eventsFilenameReference = utils.getInputDirectory() + "output_events.xml.gz";
final String eventsFilenameNew = utils.getOutputDirectory() + "output_events.xml.gz";
- assertEquals("Different event files.", FILES_ARE_EQUAL,
- new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew));
+ assertEquals(FILES_ARE_EQUAL,
+ new EventsFileComparator().setIgnoringCoordinates( true ).runComparison( eventsFilenameReference, eventsFilenameNew),
+ "Different event files.");
Scenario scenarioReference = ScenarioUtils.createScenario(ConfigUtils.createConfig());
Scenario scenarioCurrent = ScenarioUtils.createScenario(ConfigUtils.createConfig());
new PopulationReader(scenarioReference).readFile(utils.getInputDirectory() + "output_plans.xml.gz");
new PopulationReader(scenarioCurrent).readFile(utils.getOutputDirectory() + "output_plans.xml.gz");
- assertTrue("Populations are different", PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()));
+ assertTrue(PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()), "Populations are different");
}
@Test
- public void testGradientLane() {
+ void testGradientLane() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
config.addModule(new BicycleConfigGroup());
RunBicycleExample.fillConfigWithBicycleStandardValues(config);
@@ -251,18 +257,19 @@ public void testGradientLane() {
LOG.info("Checking MATSim events file ...");
final String eventsFilenameReference = utils.getInputDirectory() + "output_events.xml.gz";
final String eventsFilenameNew = utils.getOutputDirectory() + "output_events.xml.gz";
- assertEquals("Different event files.", FILES_ARE_EQUAL,
- new EventsFileComparator().setIgnoringCoordinates( true ).runComparison(eventsFilenameReference, eventsFilenameNew));
+ assertEquals(FILES_ARE_EQUAL,
+ new EventsFileComparator().setIgnoringCoordinates( true ).runComparison(eventsFilenameReference, eventsFilenameNew),
+ "Different event files.");
Scenario scenarioReference = ScenarioUtils.createScenario(ConfigUtils.createConfig());
Scenario scenarioCurrent = ScenarioUtils.createScenario(ConfigUtils.createConfig());
new PopulationReader(scenarioReference).readFile(utils.getInputDirectory() + "output_plans.xml.gz");
new PopulationReader(scenarioCurrent).readFile(utils.getOutputDirectory() + "output_plans.xml.gz");
- assertTrue("Populations are different", PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()));
+ assertTrue(PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()), "Populations are different");
}
@Test
- public void testNormal10It() {
+ void testNormal10It() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
config.addModule(new BicycleConfigGroup());
RunBicycleExample.fillConfigWithBicycleStandardValues(config);
@@ -283,17 +290,19 @@ public void testNormal10It() {
LOG.info("Checking MATSim events file ...");
final String eventsFilenameReference = utils.getInputDirectory() + "output_events.xml.gz";
final String eventsFilenameNew = utils.getOutputDirectory() + "output_events.xml.gz";
- assertEquals("Different event files.", FILES_ARE_EQUAL,
- new EventsFileComparator().setIgnoringCoordinates( true ).runComparison(eventsFilenameReference, eventsFilenameNew));
+ assertEquals(FILES_ARE_EQUAL,
+ new EventsFileComparator().setIgnoringCoordinates( true ).runComparison(eventsFilenameReference, eventsFilenameNew),
+ "Different event files.");
Scenario scenarioReference = ScenarioUtils.createScenario(ConfigUtils.createConfig());
Scenario scenarioCurrent = ScenarioUtils.createScenario(ConfigUtils.createConfig());
new PopulationReader(scenarioReference).readFile(utils.getInputDirectory() + "output_plans.xml.gz");
new PopulationReader(scenarioCurrent).readFile(utils.getOutputDirectory() + "output_plans.xml.gz");
- assertTrue("Populations are different", PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()));
+ assertTrue(PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()), "Populations are different");
}
- @Test public void testLinkBasedScoring() {
+ @Test
+ void testLinkBasedScoring() {
// {
// Config config = createConfig( 0 );
// BicycleConfigGroup bicycleConfigGroup = (BicycleConfigGroup) config.getModules().get( "bicycle" );
@@ -320,11 +329,13 @@ public void testNormal10It() {
for (Id personId : scenarioReference.getPopulation().getPersons().keySet()) {
double scoreReference = scenarioReference.getPopulation().getPersons().get(personId).getSelectedPlan().getScore();
double scoreCurrent = scenarioCurrent.getPopulation().getPersons().get(personId).getSelectedPlan().getScore();
- Assert.assertEquals("Scores of persons " + personId + " are different", scoreReference, scoreCurrent, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(scoreReference, scoreCurrent, MatsimTestUtils.EPSILON, "Scores of persons " + personId + " are different");
}
// assertTrue("Populations are different", PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()));
}
- @Test public void testLinkVsLegMotorizedScoring() {
+
+ @Test
+ void testLinkVsLegMotorizedScoring() {
// --- withOUT additional car traffic:
// {
// Config config2 = createConfig( 0 );
@@ -406,10 +417,11 @@ public void testNormal10It() {
for (Id personId : scenarioReference.getPopulation().getPersons().keySet()) {
double scoreReference = scenarioReference.getPopulation().getPersons().get(personId).getSelectedPlan().getScore();
double scoreCurrent = scenarioCurrent.getPopulation().getPersons().get(personId).getSelectedPlan().getScore();
- Assert.assertEquals("Scores of person=" + personId + " are different", scoreReference, scoreCurrent, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(scoreReference, scoreCurrent, MatsimTestUtils.EPSILON, "Scores of person=" + personId + " are different");
}
// assertTrue("Populations are different", PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()));
}
+
// @Test public void testMotorizedInteraction() {
//// Config config = ConfigUtils.createConfig("./src/main/resources/bicycle_example/");
// Config config = createConfig( 10 );
@@ -440,7 +452,7 @@ public void testNormal10It() {
// }
@Test
- public void testInfrastructureSpeedFactor() {
+ void testInfrastructureSpeedFactor() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
config.addModule(new BicycleConfigGroup());
@@ -523,19 +535,19 @@ public void install() {
controler.run();
- Assert.assertEquals("All bicycle users should use the longest but fastest route where the bicycle infrastructur speed factor is set to 1.0", 3, linkHandler.getLinkId2demand().get(Id.createLinkId("2")), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Only the car user should use the shortest route", 1, linkHandler.getLinkId2demand().get(Id.createLinkId("6")), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3, linkHandler.getLinkId2demand().get(Id.createLinkId("2")), MatsimTestUtils.EPSILON, "All bicycle users should use the longest but fastest route where the bicycle infrastructur speed factor is set to 1.0");
+ Assertions.assertEquals(1, linkHandler.getLinkId2demand().get(Id.createLinkId("6")), MatsimTestUtils.EPSILON, "Only the car user should use the shortest route");
- Assert.assertEquals("Wrong travel time (bicycle user)", 1.0 + Math.ceil( 13000 / (25.0 /3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("2")).get(0), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time (bicycle user)", 1.0 + Math.ceil( 13000 / (25.0 /3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("2")).get(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time (bicycle user)", 1.0 + Math.ceil( 13000 / (25.0 /3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("2")).get(2), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1.0 + Math.ceil( 13000 / (25.0 /3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("2")).get(0), MatsimTestUtils.EPSILON, "Wrong travel time (bicycle user)");
+ Assertions.assertEquals(1.0 + Math.ceil( 13000 / (25.0 /3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("2")).get(1), MatsimTestUtils.EPSILON, "Wrong travel time (bicycle user)");
+ Assertions.assertEquals(1.0 + Math.ceil( 13000 / (25.0 /3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("2")).get(2), MatsimTestUtils.EPSILON, "Wrong travel time (bicycle user)");
- Assert.assertEquals("Wrong travel time (car user)", Math.ceil( 10000 / (13.88) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(0), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(Math.ceil( 10000 / (13.88) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(0), MatsimTestUtils.EPSILON, "Wrong travel time (car user)");
}
@Test
- public void testInfrastructureSpeedFactorDistanceMoreRelevantThanTravelTime() {
+ void testInfrastructureSpeedFactorDistanceMoreRelevantThanTravelTime() {
Config config = ConfigUtils.createConfig(utils.getClassInputDirectory() );
BicycleConfigGroup bicycleConfigGroup = ConfigUtils.addOrGetModule( config, BicycleConfigGroup.class );
@@ -610,11 +622,11 @@ public void testInfrastructureSpeedFactorDistanceMoreRelevantThanTravelTime() {
controler.run();
- Assert.assertEquals("All bicycle users should use the shortest route even though the bicycle infrastructur speed factor is set to 0.1", 4, linkHandler.getLinkId2demand().get(Id.createLinkId("6")), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time (car user)", Math.ceil(10000 / 13.88 ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(0), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time (bicycle user)", Math.ceil( 10000 / (25. * 0.1 / 3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(1), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time (bicycle user)", Math.ceil( 10000 / (25. * 0.1 / 3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(2), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time (bicycle user)", Math.ceil( 10000 / (25. * 0.1 / 3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(3), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(4, linkHandler.getLinkId2demand().get(Id.createLinkId("6")), MatsimTestUtils.EPSILON, "All bicycle users should use the shortest route even though the bicycle infrastructur speed factor is set to 0.1");
+ Assertions.assertEquals(Math.ceil(10000 / 13.88 ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(0), MatsimTestUtils.EPSILON, "Wrong travel time (car user)");
+ Assertions.assertEquals(Math.ceil( 10000 / (25. * 0.1 / 3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(1), MatsimTestUtils.EPSILON, "Wrong travel time (bicycle user)");
+ Assertions.assertEquals(Math.ceil( 10000 / (25. * 0.1 / 3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(2), MatsimTestUtils.EPSILON, "Wrong travel time (bicycle user)");
+ Assertions.assertEquals(Math.ceil( 10000 / (25. * 0.1 / 3.6) ), linkHandler.getLinkId2travelTimes().get(Id.createLinkId("6")).get(3), MatsimTestUtils.EPSILON, "Wrong travel time (bicycle user)");
}
private Config createConfig( int lastIteration ){
diff --git a/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/car/CadytsCarIT.java b/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/car/CadytsCarIT.java
index 6b72ab1b664..848b371c711 100644
--- a/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/car/CadytsCarIT.java
+++ b/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/car/CadytsCarIT.java
@@ -23,9 +23,9 @@
import cadyts.measurements.SingleLinkMeasurement;
import cadyts.utilities.io.tabularFileParser.TabularFileParser;
import cadyts.utilities.misc.DynamicData;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.network.Link;
@@ -78,11 +78,11 @@
*/
public class CadytsCarIT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public final void testInitialization() {
+ final void testInitialization() {
final String CADYTS_STRATEGY_NAME = "ccc";
String inputDir = this.utils.getClassInputDirectory();
@@ -141,20 +141,20 @@ public PlanStrategy get() {
CadytsContext context = injector.getInstance(CadytsContext.class);
//test calibration settings
- Assert.assertEquals(true, context.getCalibrator().getBruteForce());
- Assert.assertEquals(false, context.getCalibrator().getCenterRegression());
- Assert.assertEquals(Integer.MAX_VALUE, context.getCalibrator().getFreezeIteration());
- Assert.assertEquals(8.0, context.getCalibrator().getMinStddev(SingleLinkMeasurement.TYPE.FLOW_VEH_H), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1, context.getCalibrator().getPreparatoryIterations());
- Assert.assertEquals(0.95, context.getCalibrator().getRegressionInertia(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(1.0, context.getCalibrator().getVarianceScale(), MatsimTestUtils.EPSILON);
- Assert.assertEquals(3600.0, context.getCalibrator().getTimeBinSize_s(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(true, context.getCalibrator().getBruteForce());
+ Assertions.assertEquals(false, context.getCalibrator().getCenterRegression());
+ Assertions.assertEquals(Integer.MAX_VALUE, context.getCalibrator().getFreezeIteration());
+ Assertions.assertEquals(8.0, context.getCalibrator().getMinStddev(SingleLinkMeasurement.TYPE.FLOW_VEH_H), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1, context.getCalibrator().getPreparatoryIterations());
+ Assertions.assertEquals(0.95, context.getCalibrator().getRegressionInertia(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(1.0, context.getCalibrator().getVarianceScale(), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(3600.0, context.getCalibrator().getTimeBinSize_s(), MatsimTestUtils.EPSILON);
}
//--------------------------------------------------------------
@Test
- public final void testCalibrationAsScoring() throws IOException {
+ final void testCalibrationAsScoring() throws IOException {
final double beta=30. ;
final int lastIteration = 20 ;
@@ -212,26 +212,26 @@ public ScoringFunction createNewScoringFunction(Person person) {
//scenario data test
Scenario scenario = injector.getInstance(Scenario.class);
- Assert.assertEquals("Different number of links in network.", scenario.getNetwork().getLinks().size() , 23 );
- Assert.assertEquals("Different number of nodes in network.", scenario.getNetwork().getNodes().size() , 15 );
+ Assertions.assertEquals(scenario.getNetwork().getLinks().size() , 23, "Different number of links in network." );
+ Assertions.assertEquals(scenario.getNetwork().getNodes().size() , 15, "Different number of nodes in network." );
- Assert.assertNotNull("Population is null.", scenario.getPopulation());
+ Assertions.assertNotNull(scenario.getPopulation(), "Population is null.");
- Assert.assertEquals("Num. of persons in population is wrong.", scenario.getPopulation().getPersons().size(), 5);
- Assert.assertEquals("Scale factor is wrong.", scenario.getConfig().counts().getCountsScaleFactor(), 1.0, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(scenario.getPopulation().getPersons().size(), 5, "Num. of persons in population is wrong.");
+ Assertions.assertEquals(scenario.getConfig().counts().getCountsScaleFactor(), 1.0, MatsimTestUtils.EPSILON, "Scale factor is wrong.");
//counts
- Assert.assertEquals("Count file is wrong.", scenario.getConfig().counts().getCountsFileName(), inputDir + "counts5.xml");
+ Assertions.assertEquals(scenario.getConfig().counts().getCountsFileName(), inputDir + "counts5.xml", "Count file is wrong.");
Counts occupCounts = new Counts<>();
new MatsimCountsReader(occupCounts).readFile(scenario.getConfig().counts().getCountsFileName());
Count count = occupCounts.getCount(Id.create(19, Link.class));
- Assert.assertEquals("Occupancy counts description is wrong", occupCounts.getDescription(), "counts values for equil net");
- Assert.assertEquals("CsId is wrong.", count.getCsLabel() , "link_19");
- Assert.assertEquals("Volume of hour 6 is wrong", count.getVolume(7).getValue(), 5.0 , MatsimTestUtils.EPSILON);
- Assert.assertEquals("Max count volume is wrong.", count.getMaxVolume().getValue(), 5.0 , MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(occupCounts.getDescription(), "counts values for equil net", "Occupancy counts description is wrong");
+ Assertions.assertEquals(count.getCsLabel() , "link_19", "CsId is wrong.");
+ Assertions.assertEquals(count.getVolume(7).getValue(), 5.0 , MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong");
+ Assertions.assertEquals(count.getMaxVolume().getValue(), 5.0 , MatsimTestUtils.EPSILON, "Max count volume is wrong.");
String outCounts = outputDir + "ITERS/it." + lastIteration + "/" + lastIteration + ".countscompare.txt";
AdHocCountsReaderCar reader = new AdHocCountsReaderCar(outCounts);
@@ -240,29 +240,29 @@ public ScoringFunction createNewScoringFunction(Person person) {
{
double[] simValues = reader.getSimulatedValues( locId11 );
double[] realValues = reader.getRealValues( locId11 );
- Assert.assertEquals( "Volume of hour 6 is wrong", 0.0, simValues[6], MatsimTestUtils.EPSILON );
- Assert.assertEquals( "Volume of hour 6 is wrong", 0.0, realValues[6], MatsimTestUtils.EPSILON );
+ Assertions.assertEquals( 0.0, simValues[6], MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong" );
+ Assertions.assertEquals( 0.0, realValues[6], MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong" );
}
{
Id locId12 = Id.create( "12", Link.class );
double[] simValues = reader.getSimulatedValues( locId12 );
double[] realValues = reader.getRealValues( locId12 );
- Assert.assertEquals( "Volume of hour 6 is wrong", 0.0, simValues[6], MatsimTestUtils.EPSILON );
- Assert.assertEquals( "Volume of hour 6 is wrong", 0.0, realValues[6], MatsimTestUtils.EPSILON );
+ Assertions.assertEquals( 0.0, simValues[6], MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong" );
+ Assertions.assertEquals( 0.0, realValues[6], MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong" );
}
Id locId19 = Id.create( "19", Link.class );
{
double[] simValues = reader.getSimulatedValues( locId19 );
double[] realValues = reader.getRealValues( locId19 );
- Assert.assertEquals( "Volume of hour 6 is wrong", 5.0, simValues[6], MatsimTestUtils.EPSILON );
- Assert.assertEquals( "Volume of hour 6 is wrong", 5.0, realValues[6], MatsimTestUtils.EPSILON );
+ Assertions.assertEquals( 5.0, simValues[6], MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong" );
+ Assertions.assertEquals( 5.0, realValues[6], MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong" );
}
{
Id locId21 = Id.create( "21", Link.class );
double[] simValues = reader.getSimulatedValues( locId21 );
double[] realValues = reader.getRealValues( locId21 );
- Assert.assertEquals( "Volume of hour 6 is wrong", 5.0, simValues[6], MatsimTestUtils.EPSILON );
- Assert.assertEquals( "Volume of hour 6 is wrong", 5.0, realValues[6], MatsimTestUtils.EPSILON );
+ Assertions.assertEquals( 5.0, simValues[6], MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong" );
+ Assertions.assertEquals( 5.0, realValues[6], MatsimTestUtils.EPSILON, "Volume of hour 6 is wrong" );
}
// test calibration statistics
String testCalibStatPath = outputDir + "calibration-stats.txt";
@@ -273,7 +273,7 @@ public ScoringFunction createNewScoringFunction(Person person) {
// Assert.assertEquals("different Count_ll", "-0.046875", outStatData.getCount_ll() );
// Assert.assertEquals("different Count_ll_pred_err", "0.01836234363152515" , outStatData.getCount_ll_pred_err() );
// Assert.assertEquals("different Link_lambda_avg", "-2.2604922388914356E-10", outStatData.getLink_lambda_avg() );
- Assert.assertEquals("different Link_lambda_avg", "3.2261421242498865E-5", outStatData.getLink_lambda_avg() );
+ Assertions.assertEquals("3.2261421242498865E-5", outStatData.getLink_lambda_avg(), "different Link_lambda_avg" );
// Assert.assertEquals("different Link_lambda_max", "0.0" , outStatData.getLink_lambda_max() );
// Assert.assertEquals("different Link_lambda_min", "-7.233575164452593E-9", outStatData.getLink_lambda_min() );
// Assert.assertEquals("different Link_lambda_stddev", "1.261054219517188E-9", outStatData.getLink_lambda_stddev());
@@ -283,7 +283,7 @@ public ScoringFunction createNewScoringFunction(Person person) {
// Assert.assertEquals("different Plan_lambda_min", "-7.233575164452593E-9" , outStatData.getPlan_lambda_min() );
// Assert.assertEquals("different Plan_lambda_stddev", "0.0" , outStatData.getPlan_lambda_stddev());
// Assert.assertEquals("different Total_ll", "-0.046875", outStatData.getTotal_ll() );
- Assert.assertEquals("different Total_ll", "0.0", outStatData.getTotal_ll() );
+ Assertions.assertEquals("0.0", outStatData.getTotal_ll(), "different Total_ll" );
//test link offsets
final Network network = scenario.getNetwork();
@@ -304,10 +304,10 @@ public ScoringFunction createNewScoringFunction(Person person) {
isZero = (Math.abs(linkOffsets.getBinValue(link19 , binIndex) - 0.0) < MatsimTestUtils.EPSILON);
}while (isZero && binIndex<86400);
- Assert.assertEquals("Wrong bin index for first link offset", 6, binIndex);
+ Assertions.assertEquals(6, binIndex, "Wrong bin index for first link offset");
- Assert.assertEquals("Wrong link offset of link 11", 0.0, linkOffsets.getBinValue(link11 , binIndex), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong link offset of link 19", 0.0014707121641471912, linkOffsets.getBinValue(link19 , binIndex), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(0.0, linkOffsets.getBinValue(link11 , binIndex), MatsimTestUtils.EPSILON, "Wrong link offset of link 11");
+ Assertions.assertEquals(0.0014707121641471912, linkOffsets.getBinValue(link19 , binIndex), MatsimTestUtils.EPSILON, "Wrong link offset of link 19");
}
diff --git a/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/car/CadytsCarWithPtScenarioIT.java b/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/car/CadytsCarWithPtScenarioIT.java
index 58f3b81fb2f..943cebbe4f0 100644
--- a/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/car/CadytsCarWithPtScenarioIT.java
+++ b/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/car/CadytsCarWithPtScenarioIT.java
@@ -1,11 +1,11 @@
package org.matsim.contrib.cadyts.car;
-import static org.junit.Assert.assertTrue;
-
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.events.handler.LinkLeaveEventHandler;
@@ -22,8 +22,9 @@
public class CadytsCarWithPtScenarioIT {
- @Test @Ignore
- public void testCadytsWithPtVehicles() {
+ @Test
+ @Disabled
+ void testCadytsWithPtVehicles() {
final Config config = ConfigUtils.loadConfig(IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("siouxfalls-2014"), "config_default.xml"));
config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.overwriteExistingFiles);
config.controller().setLastIteration(0);
@@ -43,8 +44,8 @@ public void testCadytsWithPtVehicles() {
}
});
controler.run();
- assertTrue("There's at least one bus on the test link", bussesSeenOnLink.get() > 0);
- assertTrue("This test runs to the end, meaning cadyts doesn't throw an exception with pt", true);
+ assertTrue(bussesSeenOnLink.get() > 0, "There's at least one bus on the test link");
+ assertTrue(true, "This test runs to the end, meaning cadyts doesn't throw an exception with pt");
}
}
diff --git a/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/utils/CalibrationStatReaderTest.java b/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/utils/CalibrationStatReaderTest.java
index cf1c31b9126..98cc6caaebe 100644
--- a/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/utils/CalibrationStatReaderTest.java
+++ b/contribs/cadytsIntegration/src/test/java/org/matsim/contrib/cadyts/utils/CalibrationStatReaderTest.java
@@ -20,37 +20,36 @@
package org.matsim.contrib.cadyts.utils;
import java.io.IOException;
-
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.testcases.MatsimTestUtils;
import cadyts.utilities.io.tabularFileParser.TabularFileParser;
public class CalibrationStatReaderTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testReader() throws IOException {
+ void testReader() throws IOException {
TabularFileParser tabularFileParser = new TabularFileParser();
String calibStatFile = this.utils.getInputDirectory() + "calibration-stats.txt";
CalibrationStatReader calibrationStatReader = new CalibrationStatReader();
tabularFileParser.parse(calibStatFile, calibrationStatReader);
CalibrationStatReader.StatisticsData statData6= calibrationStatReader.getCalStatMap().get(Integer.valueOf(6));
- Assert.assertEquals("different Count_ll", "-1.546875", statData6.getCount_ll() );
- Assert.assertEquals("different Count_ll_pred_err", "9.917082938182276E-8" , statData6.getCount_ll_pred_err() );
- Assert.assertEquals("different Link_lambda_avg", "0.0013507168476099964", statData6.getLink_lambda_avg() );
- Assert.assertEquals("different Link_lambda_max", "0.031434867572002166" , statData6.getLink_lambda_max() );
- Assert.assertEquals("different Link_lambda_min", "0.0", statData6.getLink_lambda_min() );
- Assert.assertEquals("different Link_lambda_stddev", "0.0058320747961925256" , statData6.getLink_lambda_stddev());
- Assert.assertEquals("different P2p_ll", "--" , statData6.getP2p_ll());
- Assert.assertEquals("different Plan_lambda_avg", "0.04322293912351989", statData6.getPlan_lambda_avg() );
- Assert.assertEquals("different Plan_lambda_max", "0.04715229919344063" , statData6.getPlan_lambda_max() );
- Assert.assertEquals("different Plan_lambda_min", "0.03929357905359915" , statData6.getPlan_lambda_min() );
- Assert.assertEquals("different Plan_lambda_stddev", "0.004200662608832472" , statData6.getPlan_lambda_stddev());
- Assert.assertEquals("different Total_ll", "-1.546875", statData6.getTotal_ll() );
+ Assertions.assertEquals("-1.546875", statData6.getCount_ll(), "different Count_ll" );
+ Assertions.assertEquals("9.917082938182276E-8" , statData6.getCount_ll_pred_err(), "different Count_ll_pred_err" );
+ Assertions.assertEquals("0.0013507168476099964", statData6.getLink_lambda_avg(), "different Link_lambda_avg" );
+ Assertions.assertEquals("0.031434867572002166" , statData6.getLink_lambda_max(), "different Link_lambda_max" );
+ Assertions.assertEquals("0.0", statData6.getLink_lambda_min(), "different Link_lambda_min" );
+ Assertions.assertEquals("0.0058320747961925256" , statData6.getLink_lambda_stddev(), "different Link_lambda_stddev");
+ Assertions.assertEquals("--" , statData6.getP2p_ll(), "different P2p_ll");
+ Assertions.assertEquals("0.04322293912351989", statData6.getPlan_lambda_avg(), "different Plan_lambda_avg" );
+ Assertions.assertEquals("0.04715229919344063" , statData6.getPlan_lambda_max(), "different Plan_lambda_max" );
+ Assertions.assertEquals("0.03929357905359915" , statData6.getPlan_lambda_min(), "different Plan_lambda_min" );
+ Assertions.assertEquals("0.004200662608832472" , statData6.getPlan_lambda_stddev(), "different Plan_lambda_stddev");
+ Assertions.assertEquals("-1.546875", statData6.getTotal_ll(), "different Total_ll" );
}
}
diff --git a/contribs/carsharing/src/test/java/org/matsim/contrib/carsharing/runExample/RunCarsharingIT.java b/contribs/carsharing/src/test/java/org/matsim/contrib/carsharing/runExample/RunCarsharingIT.java
index 9431005a492..045303dc9c2 100644
--- a/contribs/carsharing/src/test/java/org/matsim/contrib/carsharing/runExample/RunCarsharingIT.java
+++ b/contribs/carsharing/src/test/java/org/matsim/contrib/carsharing/runExample/RunCarsharingIT.java
@@ -25,9 +25,9 @@
import com.google.inject.Inject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.analysis.LegHistogram;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
@@ -55,10 +55,10 @@ public class RunCarsharingIT {
private final static Logger log = LogManager.getLogger(RunCarsharingIT.class);
- @Rule public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public final void test() {
+ final void test() {
Config config = ConfigUtils.loadConfig(utils.getClassInputDirectory() + "/config.xml",
new FreeFloatingConfigGroup(),
new OneWayCarsharingConfigGroup(),
@@ -162,63 +162,63 @@ void testOutput(int iteration) {
if (TransportMode.walk.equals(legMode)) {
// walk is used for access+egress to car
// -> number of walk legs for access+egress equals twice the number of car legs = 44
- Assert.assertEquals(44, nOfModeLegs);
+ Assertions.assertEquals(44, nOfModeLegs);
} else if ("oneway_vehicle".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if (TransportMode.car.equals(legMode)) {
- Assert.assertEquals(22, nOfModeLegs);
+ Assertions.assertEquals(22, nOfModeLegs);
} else if ("egress_walk_ow".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if ("access_walk_ow".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
}
} else if (iteration == 10) {
if (TransportMode.walk.equals(legMode)) {
- Assert.assertEquals(2, nOfModeLegs);
+ Assertions.assertEquals(2, nOfModeLegs);
} else if ("bike".equals(legMode)) {
- Assert.assertEquals(2, nOfModeLegs);
+ Assertions.assertEquals(2, nOfModeLegs);
} else if (TransportMode.car.equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if ("twoway_vehicle".equals(legMode)) {
- Assert.assertEquals(6, nOfModeLegs);
+ Assertions.assertEquals(6, nOfModeLegs);
} else if ("oneway_vehicle".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if ("egress_walk_ow".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if ("access_walk_ow".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if ("egress_walk_tw".equals(legMode)) {
- Assert.assertEquals(3, nOfModeLegs);
+ Assertions.assertEquals(3, nOfModeLegs);
} else if ("access_walk_tw".equals(legMode)) {
- Assert.assertEquals(3, nOfModeLegs);
+ Assertions.assertEquals(3, nOfModeLegs);
} else if ("egress_walk_ff".equals(legMode)) {
- Assert.assertEquals(2, nOfModeLegs);
+ Assertions.assertEquals(2, nOfModeLegs);
} else if ("access_walk_ff".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
}
} else if (iteration == 20) {
if (TransportMode.walk.equals(legMode)) {
- Assert.assertEquals(5, nOfModeLegs);
+ Assertions.assertEquals(5, nOfModeLegs);
} else if ("bike".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if ("twoway_vehicle".equals(legMode)) {
- Assert.assertEquals(6, nOfModeLegs);
+ Assertions.assertEquals(6, nOfModeLegs);
} else if ("freefloating_vehicle".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if ("egress_walk_tw".equals(legMode)) {
- Assert.assertEquals(3, nOfModeLegs);
+ Assertions.assertEquals(3, nOfModeLegs);
} else if ("access_walk_tw".equals(legMode)) {
- Assert.assertEquals(3, nOfModeLegs);
+ Assertions.assertEquals(3, nOfModeLegs);
} else if ("access_walk_ff".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
} else if ("egress_walk_ff".equals(legMode)) {
- Assert.assertEquals(0, nOfModeLegs);
+ Assertions.assertEquals(0, nOfModeLegs);
}
}
diff --git a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/ChangeCommercialJobOperatorTest.java b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/ChangeCommercialJobOperatorTest.java
index 18de26d446d..5dad7e11991 100644
--- a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/ChangeCommercialJobOperatorTest.java
+++ b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/ChangeCommercialJobOperatorTest.java
@@ -1,7 +1,7 @@
package org.matsim.contrib.commercialTrafficApplications.jointDemand;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
@@ -17,8 +17,8 @@
public class ChangeCommercialJobOperatorTest {
- @Test
- public void getPlanAlgoInstance() {
+ @Test
+ void getPlanAlgoInstance() {
Carriers carriers = TestScenarioGeneration.generateCarriers();
@@ -31,18 +31,18 @@ public void getPlanAlgoInstance() {
Activity work = (Activity) testPlan.getPlanElements().get(2);
Id carrierId = JointDemandUtils.getCurrentlySelectedCarrierForJob(work, 1);
- Assert.assertEquals("the person should expect a pizza", "pizza", JointDemandUtils.getCarrierMarket(carriers.getCarriers().get(carrierId)));
- Assert.assertTrue("the person should expect a pizza from the italian place", carrierId.toString().contains("italian"));
+ Assertions.assertEquals("pizza", JointDemandUtils.getCarrierMarket(carriers.getCarriers().get(carrierId)), "the person should expect a pizza");
+ Assertions.assertTrue(carrierId.toString().contains("italian"), "the person should expect a pizza from the italian place");
changeCommercialJobOperator.getPlanAlgoInstance().run(testPlan);
carrierId = JointDemandUtils.getCurrentlySelectedCarrierForJob(work, 1);
- Assert.assertTrue("the person should expect a pizza from the american place", carrierId.toString().contains("american"));
+ Assertions.assertTrue(carrierId.toString().contains("american"), "the person should expect a pizza from the american place");
changeCommercialJobOperator.getPlanAlgoInstance().run(testPlan);
carrierId = JointDemandUtils.getCurrentlySelectedCarrierForJob(work, 1);
- Assert.assertTrue("the person should expect a pizza from the italian place", carrierId.toString().contains("italian"));
+ Assertions.assertTrue(carrierId.toString().contains("italian"), "the person should expect a pizza from the italian place");
}
diff --git a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/CommercialTrafficIntegrationTest.java b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/CommercialTrafficIntegrationTest.java
index 27b59b0d621..c0132d8903c 100644
--- a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/CommercialTrafficIntegrationTest.java
+++ b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/CommercialTrafficIntegrationTest.java
@@ -1,6 +1,6 @@
package org.matsim.contrib.commercialTrafficApplications.jointDemand;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Scenario;
import org.matsim.freight.carriers.FreightCarriersConfigGroup;
import org.matsim.freight.carriers.CarriersUtils;
@@ -12,8 +12,8 @@
public class CommercialTrafficIntegrationTest {
- @Test
- public void runCommercialTrafficIT() {
+ @Test
+ void runCommercialTrafficIT() {
Config config = ConfigUtils.loadConfig("./scenarios/grid/jointDemand_config.xml");
config.controller().setLastIteration(5);
ConfigUtils.addOrGetModule(config, JointDemandConfigGroup.class);
diff --git a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/DefaultCommercialServiceScoreTest.java b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/DefaultCommercialServiceScoreTest.java
index b96b3e5ca86..d2ce82e986d 100644
--- a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/DefaultCommercialServiceScoreTest.java
+++ b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/DefaultCommercialServiceScoreTest.java
@@ -1,19 +1,19 @@
package org.matsim.contrib.commercialTrafficApplications.jointDemand;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.contrib.commercialTrafficApplications.jointDemand.DefaultCommercialServiceScore;
public class DefaultCommercialServiceScoreTest {
- @Test
- public void calcScore() {
+ @Test
+ void calcScore() {
DefaultCommercialServiceScore serviceScore = new DefaultCommercialServiceScore(6, -6, 1800);
- Assert.assertEquals(serviceScore.calcScore(0), 6., 0.001);
- Assert.assertEquals(serviceScore.calcScore(1800), 0, 0.001);
- Assert.assertEquals(serviceScore.calcScore(3600), -6., 0.001);
- Assert.assertEquals(serviceScore.calcScore(7200), -6., 0.001);
+ Assertions.assertEquals(serviceScore.calcScore(0), 6., 0.001);
+ Assertions.assertEquals(serviceScore.calcScore(1800), 0, 0.001);
+ Assertions.assertEquals(serviceScore.calcScore(3600), -6., 0.001);
+ Assertions.assertEquals(serviceScore.calcScore(7200), -6., 0.001);
}
}
\ No newline at end of file
diff --git a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/IsTheRightCustomerScoredTest.java b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/IsTheRightCustomerScoredTest.java
index b9f40a81c5d..813601153ce 100644
--- a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/IsTheRightCustomerScoredTest.java
+++ b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/IsTheRightCustomerScoredTest.java
@@ -18,9 +18,9 @@
package org.matsim.contrib.commercialTrafficApplications.jointDemand;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.population.Activity;
@@ -41,7 +41,7 @@ public class IsTheRightCustomerScoredTest {
Scenario scenario;
- @Before
+ @BeforeEach
public void setUp() {
Config config = ConfigUtils.loadConfig("./scenarios/grid/jointDemand_config.xml");
@@ -98,8 +98,8 @@ private void preparePopulation(Scenario scenario) {
}
- @Test
- public void testIfTheRightPersonIsScoredForReceivingAJob() {
+ @Test
+ void testIfTheRightPersonIsScoredForReceivingAJob() {
Plan partyPizzaPlan = scenario.getPopulation().getPersons().get(Id.createPersonId("customerOrderingForParty")).getSelectedPlan();
Plan lonelyPizzaPlan = scenario.getPopulation().getPersons().get(Id.createPersonId("customerOrderingJustForItself")).getSelectedPlan();
Plan nonCustomerPlan = scenario.getPopulation().getPersons().get(Id.createPersonId("nonCustomer")).getSelectedPlan();
@@ -113,14 +113,14 @@ public void testIfTheRightPersonIsScoredForReceivingAJob() {
.map(carrierService -> carrierService.getId())
.findFirst().orElseThrow(() -> new RuntimeException("no service activity found in scheduledTours"));
- Assert.assertEquals("the person that is delivered pizza should be customerOrderingForParty", partyPizzaPlan.getPerson().getId().toString(), serviceActivity.toString().split("_")[0]);
+ Assertions.assertEquals(partyPizzaPlan.getPerson().getId().toString(), serviceActivity.toString().split("_")[0], "the person that is delivered pizza should be customerOrderingForParty");
//compare scores
- Assert.assertTrue("the plan of the customer receiving a job should get a higher score than the plan of the non customer ", partyPizzaPlan.getScore() > nonCustomerPlan.getScore());
- Assert.assertTrue("the plan of the customer receiving a job should get a higher score than the plan of the customer not receiving one ", partyPizzaPlan.getScore() > lonelyPizzaPlan.getScore());
- Assert.assertTrue("the difference of receiving a job in time and not receiving it at all should be the maxJobScore=" + MAX_JOB_SCORE + " as job is performed in time", partyPizzaPlan.getScore() - lonelyPizzaPlan.getScore() == MAX_JOB_SCORE);
- Assert.assertEquals("not receiving a job at all should be scored with zero", lonelyPizzaPlan.getScore(), 0.0, MatsimTestUtils.EPSILON);
- Assert.assertTrue(lonelyPizzaPlan.getScore() - nonCustomerPlan.getScore() == 0);
+ Assertions.assertTrue(partyPizzaPlan.getScore() > nonCustomerPlan.getScore(), "the plan of the customer receiving a job should get a higher score than the plan of the non customer ");
+ Assertions.assertTrue(partyPizzaPlan.getScore() > lonelyPizzaPlan.getScore(), "the plan of the customer receiving a job should get a higher score than the plan of the customer not receiving one ");
+ Assertions.assertTrue(partyPizzaPlan.getScore() - lonelyPizzaPlan.getScore() == MAX_JOB_SCORE, "the difference of receiving a job in time and not receiving it at all should be the maxJobScore=" + MAX_JOB_SCORE + " as job is performed in time");
+ Assertions.assertEquals(lonelyPizzaPlan.getScore(), 0.0, MatsimTestUtils.EPSILON, "not receiving a job at all should be scored with zero");
+ Assertions.assertTrue(lonelyPizzaPlan.getScore() - nonCustomerPlan.getScore() == 0);
}
diff --git a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/RunJointDemandCarExampleSkipIntervalIT.java b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/RunJointDemandCarExampleSkipIntervalIT.java
index 5ec00c316dc..884319ca6ef 100644
--- a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/RunJointDemandCarExampleSkipIntervalIT.java
+++ b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/RunJointDemandCarExampleSkipIntervalIT.java
@@ -1,13 +1,13 @@
package org.matsim.contrib.commercialTrafficApplications.jointDemand;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
public class RunJointDemandCarExampleSkipIntervalIT {
@Test
- public void main() throws IOException {
+ void main() throws IOException {
RunJointDemandCarToggleJspritExample.main(new String[0]);
}
}
\ No newline at end of file
diff --git a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandCarExampleIT.java b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandCarExampleIT.java
index 5d07acb7686..663f68d69e2 100644
--- a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandCarExampleIT.java
+++ b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandCarExampleIT.java
@@ -1,6 +1,6 @@
package org.matsim.contrib.commercialTrafficApplications.jointDemand.examples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.contrib.commercialTrafficApplications.jointDemand.examples.RunJointDemandCarExample;
import java.io.IOException;
@@ -8,7 +8,7 @@
public class RunJointDemandCarExampleIT {
@Test
- public void main() throws IOException {
+ void main() throws IOException {
RunJointDemandCarExample.main(new String[0]);
}
}
\ No newline at end of file
diff --git a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandDRTExampleIT.java b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandDRTExampleIT.java
index 30fbe9ef2c0..e62b15cc0ba 100644
--- a/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandDRTExampleIT.java
+++ b/contribs/commercialTrafficApplications/src/test/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/examples/RunJointDemandDRTExampleIT.java
@@ -1,6 +1,6 @@
package org.matsim.contrib.commercialTrafficApplications.jointDemand.examples;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.contrib.commercialTrafficApplications.jointDemand.examples.RunJointDemandDRTExample;
import java.io.IOException;
@@ -8,7 +8,7 @@
public class RunJointDemandDRTExampleIT {
@Test
- public void main() throws IOException {
+ void main() throws IOException {
RunJointDemandDRTExample.main(new String[0]);
}
}
\ No newline at end of file
diff --git a/contribs/common/src/main/java/org/matsim/contrib/common/timeprofile/ProfileWriter.java b/contribs/common/src/main/java/org/matsim/contrib/common/timeprofile/ProfileWriter.java
index 768ec3ea404..e98f9cbb2b4 100644
--- a/contribs/common/src/main/java/org/matsim/contrib/common/timeprofile/ProfileWriter.java
+++ b/contribs/common/src/main/java/org/matsim/contrib/common/timeprofile/ProfileWriter.java
@@ -87,7 +87,8 @@ public void notifyIterationEnds(IterationEndsEvent event) {
}
}
- if (this.matsimServices.getConfig().controller().isCreateGraphs()) {
+ int createGraphsInterval = this.matsimServices.getConfig().controller().getCreateGraphsInterval();
+ if (createGraphsInterval > 0 && event.getIteration() % createGraphsInterval == 0) {
DefaultTableXYDataset xyDataset = createXYDataset(times, profiles);
generateImage(xyDataset, TimeProfileCharts.ChartType.Line);
generateImage(xyDataset, TimeProfileCharts.ChartType.StackedArea);
@@ -103,7 +104,7 @@ private DefaultTableXYDataset createXYDataset(double[] times, Map {
XYSeries series = new XYSeries(name, true, false);
for (int i = 0; i < times.length; i++) {
- series.add((double)times[i] / 3600, profile[i]);
+ series.add((double) times[i] / 3600, profile[i]);
}
seriesList.add(series);
});
diff --git a/contribs/common/src/main/java/org/matsim/contrib/common/timeprofile/TimeProfileCollector.java b/contribs/common/src/main/java/org/matsim/contrib/common/timeprofile/TimeProfileCollector.java
index e44bebb84d7..ce926be9116 100644
--- a/contribs/common/src/main/java/org/matsim/contrib/common/timeprofile/TimeProfileCollector.java
+++ b/contribs/common/src/main/java/org/matsim/contrib/common/timeprofile/TimeProfileCollector.java
@@ -99,8 +99,13 @@ public void notifyMobsimBeforeCleanup(@SuppressWarnings("rawtypes") MobsimBefore
}
}
- for (ChartType t : chartTypes) {
- generateImage(header, t);
+ int createGraphsInterval = matsimServices.getConfig().controller().getCreateGraphsInterval();
+ boolean createGraphs = createGraphsInterval >0 && matsimServices.getIterationNumber() % createGraphsInterval == 0;
+
+ if(createGraphs){
+ for (ChartType t : chartTypes) {
+ generateImage(header, t);
+ }
}
}
diff --git a/contribs/common/src/test/java/org/matsim/contrib/common/collections/PartialSortTest.java b/contribs/common/src/test/java/org/matsim/contrib/common/collections/PartialSortTest.java
index 84371963d61..2609969dd8c 100644
--- a/contribs/common/src/test/java/org/matsim/contrib/common/collections/PartialSortTest.java
+++ b/contribs/common/src/test/java/org/matsim/contrib/common/collections/PartialSortTest.java
@@ -24,9 +24,9 @@
import static org.matsim.contrib.common.collections.PartialSort.kSmallestElements;
import java.util.Comparator;
-import java.util.stream.Stream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import java.util.stream.Stream;
/**
* @author Michal Maciejewski (michalm)
@@ -35,36 +35,36 @@ public class PartialSortTest {
private final Comparator comparator = Integer::compareTo;
@Test
- public void k0_noneSelected() {
+ void k0_noneSelected() {
assertThat(kSmallestElements(0, Stream.of(), comparator)).isEmpty();
assertThat(kSmallestElements(0, Stream.of(7, 1, 4, 9, 8), comparator)).isEmpty();
}
@Test
- public void reversedComparator_largestElementsSelected() {
+ void reversedComparator_largestElementsSelected() {
assertThat(kSmallestElements(1, Stream.of(7, 1, 4, 9, 8), comparator.reversed())).containsExactly(9);
assertThat(kSmallestElements(3, Stream.of(7, 1, 4, 9, 8), comparator.reversed())).containsExactly(9, 8, 7);
}
@Test
- public void allElementsPairwiseNonEqual_inputOrderNotImportant() {
+ void allElementsPairwiseNonEqual_inputOrderNotImportant() {
assertThat(kSmallestElements(3, Stream.of(1, 7, 9, 8), comparator)).containsExactly(1, 7, 8);
assertThat(kSmallestElements(3, Stream.of(9, 8, 7, 1), comparator)).containsExactly(1, 7, 8);
}
@Test
- public void exactlyKElementsProvided() {
+ void exactlyKElementsProvided() {
assertThat(kSmallestElements(3, Stream.of(7, 1, 4), comparator)).containsExactly(1, 4, 7);
}
@Test
- public void moreThenKElementsProvided() {
+ void moreThenKElementsProvided() {
assertThat(kSmallestElements(3, Stream.of(7, 1, 4, 9, 8), comparator)).containsExactly(1, 4, 7);
assertThat(kSmallestElements(3, Stream.of(13, 7, 1, 55, 4, 9, 8, 11), comparator)).containsExactly(1, 4, 7);
}
@Test
- public void lessThenKElementsProvided() {
+ void lessThenKElementsProvided() {
assertThat(kSmallestElements(3, Stream.of(7, 1), comparator)).containsExactly(1, 7);
assertThat(kSmallestElements(3, Stream.of(13), comparator)).containsExactly(13);
assertThat(kSmallestElements(3, Stream.of(), comparator)).isEmpty();
diff --git a/contribs/common/src/test/java/org/matsim/contrib/common/diversitygeneration/planselectors/DiversityGeneratingPlansRemoverTest.java b/contribs/common/src/test/java/org/matsim/contrib/common/diversitygeneration/planselectors/DiversityGeneratingPlansRemoverTest.java
index a0025ce5638..04a8efe7547 100644
--- a/contribs/common/src/test/java/org/matsim/contrib/common/diversitygeneration/planselectors/DiversityGeneratingPlansRemoverTest.java
+++ b/contribs/common/src/test/java/org/matsim/contrib/common/diversitygeneration/planselectors/DiversityGeneratingPlansRemoverTest.java
@@ -4,8 +4,7 @@
import gnu.trove.map.TMap;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
@@ -37,7 +36,7 @@
public class DiversityGeneratingPlansRemoverTest {
private static final Logger log = LogManager.getLogger( DiversityGeneratingPlansRemoverTest.class ) ;
-
+
private final Id node0 = Id.createNodeId( "node0" ) ;
private final Id node1 = Id.createNodeId( "node1" ) ;
private final Id node2 = Id.createNodeId( "node2" ) ;
@@ -45,12 +44,12 @@ public class DiversityGeneratingPlansRemoverTest {
private final Id link0_1 = Id.createLinkId( "dummy0-1" );
private final Id link1_2 = Id.createLinkId( "dummy1-2" );
private final Id link2_3 = Id.createLinkId( "dummyN" );
-
+
@Test
- public void calcWeights() {
+ void calcWeights() {
// yy This is not really a strong test. Rather something I wrote for debugging. Would be a good
// starting point for a fuller test. kai, jul'18
-
+
Scenario scenario = ScenarioUtils.createScenario( ConfigUtils.createConfig() ) ;
{
Network net = scenario.getNetwork();
@@ -130,11 +129,11 @@ public void calcWeights() {
plans.put("hwh_car_otherMode",plan) ;
}
pop.addPerson( person );
-
+
DiversityGeneratingPlansRemover.Builder builder = new DiversityGeneratingPlansRemover.Builder() ;
builder.setNetwork( scenario.getNetwork() ) ;
final DiversityGeneratingPlansRemover remover = builder.get();
-
+
for ( Map.Entry entry : plans.entrySet() ) {
log.info( "similarity " + entry.getKey() + " to self is " + remover.similarity( entry.getValue(), entry.getValue() ) );
log.info("") ;
@@ -145,7 +144,7 @@ public void calcWeights() {
}
log.info("") ;
}
-
+
// {
// final double similarity = remover.similarity( person.getPlans().get( 0 ), person.getPlans().get( 1 ) );
// log.info( "similarity 0 to 1: " + similarity );
@@ -161,7 +160,7 @@ public void calcWeights() {
// log.info( "similarity 0 to 2: " + similarity );
// Assert.assertEquals( 12.0, similarity, 10.*Double.MIN_VALUE );
// }
-
+
final Map retVal = remover.calcWeights( person.getPlans() );
log.info("") ;
for ( Map.Entry entry : retVal.entrySet() ) {
@@ -173,13 +172,13 @@ public void calcWeights() {
}
double[] expecteds = new double[]{1.0,0.0} ;
-
+
// Assert.assertArrayEquals( expecteds, Doubles.toArray( retVal.values() ) , 10.*Double.MIN_VALUE );
}
-
-
+
+
}
-
+
private Plan createHwhPlan( final PopulationFactory pf ) {
Plan plan = pf.createPlan() ;
{
@@ -221,8 +220,8 @@ private Plan createHwhPlan( final PopulationFactory pf ) {
plan.setScore(90.) ;
return plan;
}
-
+
@Test
- public void selectPlan() {
+ void selectPlan() {
}
}
diff --git a/contribs/common/src/test/java/org/matsim/contrib/common/util/WeightedRandomSelectionTest.java b/contribs/common/src/test/java/org/matsim/contrib/common/util/WeightedRandomSelectionTest.java
index f96b4468202..2c33545ebe5 100644
--- a/contribs/common/src/test/java/org/matsim/contrib/common/util/WeightedRandomSelectionTest.java
+++ b/contribs/common/src/test/java/org/matsim/contrib/common/util/WeightedRandomSelectionTest.java
@@ -26,8 +26,8 @@
import java.util.Random;
import org.apache.commons.lang3.mutable.MutableDouble;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author michalm
@@ -37,7 +37,7 @@ public class WeightedRandomSelectionTest {
private final MutableDouble randomDouble = new MutableDouble();
private WeightedRandomSelection weightedRandomSelection;
- @Before
+ @BeforeEach
public void init() {
weightedRandomSelection = new WeightedRandomSelection<>(new Random() {
@Override
@@ -48,7 +48,7 @@ public double nextDouble(double from, double to) {
}
@Test
- public void testIncorrectInput() {
+ void testIncorrectInput() {
assertIncorrectWeight(-Double.MIN_VALUE);
assertIncorrectWeight(-1);
assertIncorrectWeight(-Double.MAX_VALUE);
@@ -71,7 +71,7 @@ private void assertIncorrectWeight(double weight) {
}
@Test
- public void testEmptyList() {
+ void testEmptyList() {
assertThat(weightedRandomSelection.size()).isEqualTo(0);
assertThatThrownBy(() -> weightedRandomSelection.select())//
.isExactlyInstanceOf(IllegalStateException.class)//
@@ -79,7 +79,7 @@ public void testEmptyList() {
}
@Test
- public void testZeroTotalWeight() {
+ void testZeroTotalWeight() {
weightedRandomSelection.add("A", 0.);
weightedRandomSelection.add("B", 0.);
assertThatThrownBy(() -> weightedRandomSelection.select())//
@@ -88,7 +88,7 @@ public void testZeroTotalWeight() {
}
@Test
- public void testSingleValueList() {
+ void testSingleValueList() {
weightedRandomSelection.add("A", 1);
assertThat(weightedRandomSelection.size()).isEqualTo(1);
@@ -100,7 +100,7 @@ public void testSingleValueList() {
}
@Test
- public void testThreeValuesList() {
+ void testThreeValuesList() {
weightedRandomSelection.add("A", 1);
weightedRandomSelection.add("B", 0.5);
weightedRandomSelection.add("C", 1.5);
diff --git a/contribs/common/src/test/java/org/matsim/integration/always/BetaTravelTest66IT.java b/contribs/common/src/test/java/org/matsim/integration/always/BetaTravelTest66IT.java
index 935e4c61fb8..e6a0711851a 100644
--- a/contribs/common/src/test/java/org/matsim/integration/always/BetaTravelTest66IT.java
+++ b/contribs/common/src/test/java/org/matsim/integration/always/BetaTravelTest66IT.java
@@ -20,20 +20,20 @@
package org.matsim.integration.always;
-import static org.junit.Assert.assertEquals;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import jakarta.inject.Inject;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import jakarta.inject.Provider;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
@@ -90,11 +90,11 @@
*/
public class BetaTravelTest66IT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
- /* This TestCase uses a custom Controler, named TestControler, to load
+ /*This TestCase uses a custom Controler, named TestControler, to load
* specific strategies. The strategies make use of a test-specific
* TimeAllocationMutator, the TimeAllocationMutatorBottleneck.
* LinkAnalyzer, an event handler, collects some statistics on the
@@ -130,7 +130,8 @@ public class BetaTravelTest66IT {
*
* @author mrieser
*/
- @Test public void testBetaTravel_66() {
+ @Test
+ void testBetaTravel_66() {
Config config = utils.loadConfig("../../examples/scenarios/equil/config.xml");
ConfigUtils.loadConfig(config, utils.getInputDirectory() + "config.xml");
config.controller().setWritePlansInterval(0);
diff --git a/contribs/common/src/test/java/org/matsim/integration/always/BetaTravelTest6IT.java b/contribs/common/src/test/java/org/matsim/integration/always/BetaTravelTest6IT.java
index 9db009cbcf8..49ec89733a1 100644
--- a/contribs/common/src/test/java/org/matsim/integration/always/BetaTravelTest6IT.java
+++ b/contribs/common/src/test/java/org/matsim/integration/always/BetaTravelTest6IT.java
@@ -20,20 +20,20 @@
package org.matsim.integration.always;
-import static org.junit.Assert.assertEquals;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import jakarta.inject.Inject;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import jakarta.inject.Provider;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
@@ -91,11 +91,11 @@
*/
public class BetaTravelTest6IT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
- /* This TestCase uses a custom Controler, named TestControler, to load
+ /*This TestCase uses a custom Controler, named TestControler, to load
* specific strategies. The strategies make use of a test-specific
* TimeAllocationMutator, the TimeAllocationMutatorBottleneck.
* LinkAnalyzer, an event handler, collects some statistics on the
@@ -130,7 +130,8 @@ public class BetaTravelTest6IT {
*
* @author mrieser
*/
- @Test public void testBetaTravel_6() {
+ @Test
+ void testBetaTravel_6() {
Config config = utils.loadConfig("../../examples/scenarios/equil/config.xml"); // default config
ConfigUtils.loadConfig(config, utils.getInputDirectory() + "config.xml"); // specific setting for this test
config.controller().setWritePlansInterval(0);
diff --git a/contribs/decongestion/src/test/java/org/matsim/contrib/decongestion/DecongestionPricingTestIT.java b/contribs/decongestion/src/test/java/org/matsim/contrib/decongestion/DecongestionPricingTestIT.java
index 58477477f23..2562177bd77 100644
--- a/contribs/decongestion/src/test/java/org/matsim/contrib/decongestion/DecongestionPricingTestIT.java
+++ b/contribs/decongestion/src/test/java/org/matsim/contrib/decongestion/DecongestionPricingTestIT.java
@@ -22,9 +22,9 @@
*/
package org.matsim.contrib.decongestion;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.analysis.ScoreStatsControlerListener.ScoreItem;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
@@ -54,15 +54,15 @@
*/
public class DecongestionPricingTestIT {
- @Rule
- public MatsimTestUtils testUtils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils testUtils = new MatsimTestUtils();
/**
* Kp = 0.0123
*
*/
@Test
- public final void test0a() {
+ final void test0a() {
System.out.println(testUtils.getPackageInputDirectory());
@@ -130,19 +130,19 @@ public void install() {
double tt1 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 63, null, null);
double tt2 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 15. * 60, null, null);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt0, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 150.5, tt1, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt2, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(100.0, tt0, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(150.5, tt1, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(100.0, tt2, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
final int index = config.controller().getLastIteration() - config.controller().getFirstIteration();
double avgScore = controler.getScoreStats().getScoreHistory().get( ScoreItem.executed ).get(index);
- Assert.assertEquals("Wrong average executed score. The tolls seem to have changed.", -33.940316666666666, avgScore, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-33.940316666666666, avgScore, MatsimTestUtils.EPSILON, "Wrong average executed score. The tolls seem to have changed.");
System.out.println(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().toString());
System.out.println(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().toString());
- Assert.assertEquals("Wrong average delay (capacity is set in a way that one of the two agents has to wait 101 sec. Thus the average is 50.5", 50.5, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().get(84), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong toll.", 50.5 * 0.0123, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(84), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(50.5, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().get(84), MatsimTestUtils.EPSILON, "Wrong average delay (capacity is set in a way that one of the two agents has to wait 101 sec. Thus the average is 50.5");
+ Assertions.assertEquals(50.5 * 0.0123, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(84), MatsimTestUtils.EPSILON, "Wrong toll.");
}
@@ -151,7 +151,7 @@ public void install() {
*
*/
@Test
- public final void test0amodified() {
+ final void test0amodified() {
System.out.println(testUtils.getPackageInputDirectory());
@@ -197,13 +197,13 @@ public void install() {
double tt1 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 63, null, null);
double tt2 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 15. * 60, null, null);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt0, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 150.5, tt1, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt2, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(100.0, tt0, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(150.5, tt1, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(100.0, tt2, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
final int index = config.controller().getLastIteration() - config.controller().getFirstIteration();
double avgScore = controler.getScoreStats().getScoreHistory().get( ScoreItem.executed ).get(index);
- Assert.assertEquals("Wrong average executed score. The tolls seem to have changed.", -33.940316666666666, avgScore, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-33.940316666666666, avgScore, MatsimTestUtils.EPSILON, "Wrong average executed score. The tolls seem to have changed.");
}
/**
@@ -211,7 +211,7 @@ public void install() {
*
*/
@Test
- public final void test0b() {
+ final void test0b() {
System.out.println(testUtils.getPackageInputDirectory());
@@ -279,19 +279,19 @@ public void install() {
double tt1 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 63, null, null);
double tt2 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 15. * 60, null, null);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt0, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 150.5, tt1, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt2, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(100.0, tt0, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(150.5, tt1, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(100.0, tt2, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
final int index = config.controller().getLastIteration() - config.controller().getFirstIteration();
double avgScore = controler.getScoreStats().getScoreHistory().get( ScoreItem.executed ).get(index);
- Assert.assertEquals("Wrong average executed score. The tolls seem to have changed.", -134.31916666666666, avgScore, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-134.31916666666666, avgScore, MatsimTestUtils.EPSILON, "Wrong average executed score. The tolls seem to have changed.");
System.out.println(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().toString());
System.out.println(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().toString());
- Assert.assertEquals("Wrong average delay (capacity is set in a way that one of the two agents has to wait 101 sec. Thus the average is 50.5", 50.5, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().get(84), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong toll.", 50.5 * 2, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(84), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(50.5, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().get(84), MatsimTestUtils.EPSILON, "Wrong average delay (capacity is set in a way that one of the two agents has to wait 101 sec. Thus the average is 50.5");
+ Assertions.assertEquals(50.5 * 2, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(84), MatsimTestUtils.EPSILON, "Wrong toll.");
}
/**
@@ -299,7 +299,7 @@ public void install() {
*
*/
@Test
- public final void test0bmodified() {
+ final void test0bmodified() {
System.out.println(testUtils.getPackageInputDirectory());
@@ -345,13 +345,13 @@ public void install() {
double tt1 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 63, null, null);
double tt2 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 15. * 60, null, null);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt0, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 150.5, tt1, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt2, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(100.0, tt0, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(150.5, tt1, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(100.0, tt2, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
final int index = config.controller().getLastIteration() - config.controller().getFirstIteration();
double avgScore = controler.getScoreStats().getScoreHistory().get( ScoreItem.executed ).get(index);
- Assert.assertEquals("Wrong average executed score. The tolls seem to have changed.", -134.31916666666666, avgScore, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-134.31916666666666, avgScore, MatsimTestUtils.EPSILON, "Wrong average executed score. The tolls seem to have changed.");
}
/**
@@ -359,7 +359,7 @@ public void install() {
*
*/
@Test
- public final void test0c() {
+ final void test0c() {
System.out.println(testUtils.getPackageInputDirectory());
@@ -419,19 +419,19 @@ public void install() {
double tt1 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 63, null, null);
double tt2 = controler.getLinkTravelTimes().getLinkTravelTime(scenario.getNetwork().getLinks().get(Id.createLinkId("link12")), 7 * 3600 + 15. * 60, null, null);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt0, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 150.5, tt1, MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong travel time. The run output seems to have changed.", 100.0, tt2, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(100.0, tt0, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(150.5, tt1, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
+ Assertions.assertEquals(100.0, tt2, MatsimTestUtils.EPSILON, "Wrong travel time. The run output seems to have changed.");
final int index = config.controller().getLastIteration() - config.controller().getFirstIteration();
double avgScore = controler.getScoreStats().getScoreHistory().get( ScoreItem.executed ).get(index);
- Assert.assertEquals("Wrong average executed score. The tolls seem to have changed.", -33.31916666666666, avgScore, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-33.31916666666666, avgScore, MatsimTestUtils.EPSILON, "Wrong average executed score. The tolls seem to have changed.");
System.out.println(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().toString());
System.out.println(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().toString());
- Assert.assertEquals("Wrong average delay (capacity is set in a way that one of the two agents has to wait 101 sec. Thus the average is 50.5", 50.5, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().get(84), MatsimTestUtils.EPSILON);
- Assert.assertNull("Wrong toll.", info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(84));
+ Assertions.assertEquals(50.5, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2avgDelay().get(84), MatsimTestUtils.EPSILON, "Wrong average delay (capacity is set in a way that one of the two agents has to wait 101 sec. Thus the average is 50.5");
+ Assertions.assertNull(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(84), "Wrong toll.");
}
@@ -440,7 +440,7 @@ public void install() {
*
*/
@Test
- public final void test1() {
+ final void test1() {
System.out.println(testUtils.getPackageInputDirectory());
@@ -489,11 +489,11 @@ public void install() {
final int index = config.controller().getLastIteration() - config.controller().getFirstIteration();
double avgScore = controler.getScoreStats().getScoreHistory().get( ScoreItem.executed ).get(index) ;
- Assert.assertEquals("Wrong average executed score. The run output seems to have changed.", -12036.177448472225, avgScore, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-12036.177448472225, avgScore, MatsimTestUtils.EPSILON, "Wrong average executed score. The run output seems to have changed.");
System.out.println(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().toString());
- Assert.assertEquals("Wrong toll in time bin 61.", 9.197000000000003, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(61), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong toll in time bin 73.", 12.963999999999984, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(73), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(9.197000000000003, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(61), MatsimTestUtils.EPSILON, "Wrong toll in time bin 61.");
+ Assertions.assertEquals(12.963999999999984, info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(73), MatsimTestUtils.EPSILON, "Wrong toll in time bin 73.");
}
/**
@@ -501,7 +501,7 @@ public void install() {
*
*/
@Test
- public final void test2() {
+ final void test2() {
System.out.println(testUtils.getPackageInputDirectory());
@@ -551,11 +551,11 @@ public void install() {
final int index = config.controller().getLastIteration() - config.controller().getFirstIteration();
double avgScore = controler.getScoreStats().getScoreHistory().get( ScoreItem.executed ).get( index ) ;
- Assert.assertEquals("Wrong average executed score. The run output seems to have changed.", -55.215645833333184, avgScore, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(-55.215645833333184, avgScore, MatsimTestUtils.EPSILON, "Wrong average executed score. The run output seems to have changed.");
System.out.println(info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().toString());
- Assert.assertEquals("Wrong toll in time bin 61.", 13., info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(61), MatsimTestUtils.EPSILON);
- Assert.assertEquals("Wrong toll in time bin 73.", 13., info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(73), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(13., info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(61), MatsimTestUtils.EPSILON, "Wrong toll in time bin 61.");
+ Assertions.assertEquals(13., info.getlinkInfos().get(Id.createLinkId("link12")).getTime2toll().get(73), MatsimTestUtils.EPSILON, "Wrong toll in time bin 73.");
}
}
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/SubtourModeChoiceReplacementTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/SubtourModeChoiceReplacementTest.java
index 2abbf28777c..416162e725e 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/SubtourModeChoiceReplacementTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/SubtourModeChoiceReplacementTest.java
@@ -1,7 +1,5 @@
package org.matsim.contrib.discrete_mode_choice;
-import static org.junit.Assert.assertEquals;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -9,7 +7,9 @@
import java.util.Random;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.api.core.v01.population.Plan;
import org.matsim.contrib.discrete_mode_choice.test_utils.PlanBuilder;
import org.matsim.contrib.discrete_mode_choice.test_utils.PlanTester;
@@ -51,7 +51,7 @@
public class SubtourModeChoiceReplacementTest {
@Test
- public void testChoiceSet() throws NoFeasibleChoiceException {
+ void testChoiceSet() throws NoFeasibleChoiceException {
List modes = Arrays.asList("walk", "pt");
List constrainedModes = Arrays.asList();
boolean considerCarAvailability = true;
@@ -140,7 +140,7 @@ public void testChoiceSet() throws NoFeasibleChoiceException {
}
@Test
- public void testConstrainedChoiceSet() throws NoFeasibleChoiceException {
+ void testConstrainedChoiceSet() throws NoFeasibleChoiceException {
List modes = Arrays.asList("walk", "car");
List constrainedModes = Arrays.asList("car");
boolean considerCarAvailability = true;
@@ -229,7 +229,7 @@ public void testConstrainedChoiceSet() throws NoFeasibleChoiceException {
}
@Test
- public void testLargerCase() throws NoFeasibleChoiceException {
+ void testLargerCase() throws NoFeasibleChoiceException {
List modes = Arrays.asList("walk", "car", "pt", "bike");
List constrainedModes = Arrays.asList("car", "bike");
boolean considerCarAvailability = true;
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/constraints/VehicleTourConstraintTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/constraints/VehicleTourConstraintTest.java
index 24bc7e6ceb5..f5c0fd7ce92 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/constraints/VehicleTourConstraintTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/constraints/VehicleTourConstraintTest.java
@@ -1,13 +1,13 @@
package org.matsim.contrib.discrete_mode_choice.components.constraints;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.population.Person;
import org.matsim.contrib.discrete_mode_choice.test_utils.PlanBuilder;
@@ -20,7 +20,7 @@
public class VehicleTourConstraintTest {
@Test
- public void testWithHome() {
+ void testWithHome() {
// PREPARATION
HomeFinder homeFinder = (List trips) -> Id.create("A", ActivityFacility.class);
Collection availableModes = Arrays.asList("car", "walk");
@@ -69,7 +69,7 @@ public void testWithHome() {
}
@Test
- public void testWithoutHome() {
+ void testWithoutHome() {
// PREPARATION
HomeFinder homeFinder = (List trips) -> null;
Collection availableModes = Arrays.asList("car", "walk");
@@ -107,7 +107,7 @@ public void testWithoutHome() {
}
@Test
- public void testTour() {
+ void testTour() {
// PREPARATION
HomeFinder homeFinder = (List trips) -> Id.create("A", ActivityFacility.class);
Collection availableModes = Arrays.asList("car", "walk");
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/readers/ApolloTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/readers/ApolloTest.java
index b58abaf6f80..c588e1864cf 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/readers/ApolloTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/readers/ApolloTest.java
@@ -1,17 +1,17 @@
package org.matsim.contrib.discrete_mode_choice.components.readers;
-import static org.junit.Assert.assertEquals;
-
import java.io.IOException;
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.contribs.discrete_mode_choice.components.readers.ApolloParameterReader;
import org.matsim.contribs.discrete_mode_choice.components.readers.ApolloParameters;
public class ApolloTest {
@Test
- public void testApolloReader() throws IOException {
+ void testApolloReader() throws IOException {
URL fixtureUrl = getClass().getClassLoader().getResource("Model_13_12_Zurich_output.txt");
ApolloParameters parameters = new ApolloParameterReader().read(fixtureUrl);
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/tour_finder/ActivityTourFinderTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/tour_finder/ActivityTourFinderTest.java
index af9610761ca..483cfa96dfb 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/tour_finder/ActivityTourFinderTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/tour_finder/ActivityTourFinderTest.java
@@ -1,12 +1,12 @@
package org.matsim.contrib.discrete_mode_choice.components.tour_finder;
-import static org.junit.Assert.assertEquals;
-
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.api.core.v01.population.Plan;
import org.matsim.contribs.discrete_mode_choice.components.tour_finder.ActivityTourFinder;
import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
@@ -42,7 +42,7 @@ private List createFixture(String... activityTypes) {
}
@Test
- public void testActivityTourFinder() {
+ void testActivityTourFinder() {
ActivityTourFinder finder = new ActivityTourFinder(Arrays.asList("home"));
List trips;
@@ -84,7 +84,7 @@ public void testActivityTourFinder() {
}
@Test
- public void testActivityTourFinderMultiple() {
+ void testActivityTourFinderMultiple() {
ActivityTourFinder finder = new ActivityTourFinder(Arrays.asList("home1", "home2", "home3", "home4"));
List trips;
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/utils/ScheduleWaitingTimeEstimatorTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/utils/ScheduleWaitingTimeEstimatorTest.java
index 4d19508ad24..f9c951bb195 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/utils/ScheduleWaitingTimeEstimatorTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/components/utils/ScheduleWaitingTimeEstimatorTest.java
@@ -1,6 +1,8 @@
package org.matsim.contrib.discrete_mode_choice.components.utils;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.population.Activity;
@@ -25,11 +27,9 @@
import java.util.LinkedList;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-
public class ScheduleWaitingTimeEstimatorTest {
@Test
- public void testValidSingleCase() throws IOException {
+ void testValidSingleCase() throws IOException {
TransitSchedule schedule = createSchedule();
ScheduleWaitingTimeEstimator estimator = new ScheduleWaitingTimeEstimator(schedule);
@@ -53,9 +53,9 @@ public void testValidSingleCase() throws IOException {
waitingTime = estimator.estimateWaitingTime(elements);
assertEquals(995.0, waitingTime, 1e-6);
}
-
+
@Test
- public void testValidMultiCase() throws IOException {
+ void testValidMultiCase() throws IOException {
TransitSchedule schedule = createSchedule();
ScheduleWaitingTimeEstimator estimator = new ScheduleWaitingTimeEstimator(schedule);
@@ -72,10 +72,10 @@ public void testValidMultiCase() throws IOException {
waitingTime = estimator.estimateWaitingTime(elements);
assertEquals(20.0 + 995.0, waitingTime, 1e-6);
}
-
+
@Test
- public void testInvalidCase() throws IOException {
+ void testInvalidCase() throws IOException {
TransitSchedule schedule = createSchedule();
ScheduleWaitingTimeEstimator estimator = new ScheduleWaitingTimeEstimator(schedule);
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/examples/TestSiouxFalls.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/examples/TestSiouxFalls.java
index 1780065a3fe..299d69644dd 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/examples/TestSiouxFalls.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/examples/TestSiouxFalls.java
@@ -1,12 +1,12 @@
package org.matsim.contrib.discrete_mode_choice.examples;
-import static org.junit.Assert.assertEquals;
-
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.events.PersonArrivalEvent;
import org.matsim.api.core.v01.events.handler.PersonArrivalEventHandler;
@@ -24,7 +24,7 @@
public class TestSiouxFalls {
@Test
- public void testSiouxFallsWithSubtourModeChoiceReplacement() {
+ void testSiouxFallsWithSubtourModeChoiceReplacement() {
URL scenarioURL = ExamplesUtils.getTestScenarioURL("siouxfalls-2014");
Config config = ConfigUtils.loadConfig(IOUtils.extendUrl(scenarioURL, "config_default.xml"));
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/MaximumUtilityTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/MaximumUtilityTest.java
index 347139ac155..b186857b40b 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/MaximumUtilityTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/MaximumUtilityTest.java
@@ -1,13 +1,13 @@
package org.matsim.contrib.discrete_mode_choice.models;
-import static org.junit.Assert.assertEquals;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.population.Activity;
import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceModel.FallbackBehaviour;
@@ -31,7 +31,7 @@
public class MaximumUtilityTest {
@Test
- public void testMaximumUtility() throws NoFeasibleChoiceException {
+ void testMaximumUtility() throws NoFeasibleChoiceException {
TripFilter tripFilter = new CompositeTripFilter(Collections.emptySet());
ModeAvailability modeAvailability = new DefaultModeAvailability(Arrays.asList("car", "pt", "walk"));
TripConstraintFactory constraintFactory = new CompositeTripConstraintFactory();
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/MultinomialLogitTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/MultinomialLogitTest.java
index 71bcf10e76b..fcee4f218af 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/MultinomialLogitTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/MultinomialLogitTest.java
@@ -1,7 +1,5 @@
package org.matsim.contrib.discrete_mode_choice.models;
-import static org.junit.Assert.assertEquals;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -9,7 +7,9 @@
import java.util.Map;
import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.population.Activity;
import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceModel.FallbackBehaviour;
@@ -33,7 +33,7 @@
public class MultinomialLogitTest {
@Test
- public void testMultinomialLogit() throws NoFeasibleChoiceException {
+ void testMultinomialLogit() throws NoFeasibleChoiceException {
TripFilter tripFilter = new CompositeTripFilter(Collections.emptySet());
ModeAvailability modeAvailability = new DefaultModeAvailability(Arrays.asList("car", "pt", "walk"));
TripConstraintFactory constraintFactory = new CompositeTripConstraintFactory();
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/NestedLogitTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/NestedLogitTest.java
index 84489c34c7c..b25de2aeb32 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/NestedLogitTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/NestedLogitTest.java
@@ -1,7 +1,5 @@
package org.matsim.contrib.discrete_mode_choice.models;
-import static org.junit.Assert.assertEquals;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -9,7 +7,9 @@
import java.util.Map;
import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.population.Activity;
import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceModel.FallbackBehaviour;
@@ -35,7 +35,7 @@
public class NestedLogitTest {
@Test
- public void testRedBusBlueBus() throws NoFeasibleChoiceException {
+ void testRedBusBlueBus() throws NoFeasibleChoiceException {
TripFilter tripFilter = new CompositeTripFilter(Collections.emptySet());
ModeAvailability modeAvailability = new DefaultModeAvailability(Arrays.asList("car", "redbus", "bluebus"));
TripConstraintFactory constraintFactory = new CompositeTripConstraintFactory();
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/RandomUtilityTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/RandomUtilityTest.java
index e0f3e7dd619..8df0f2cf4ae 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/RandomUtilityTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/RandomUtilityTest.java
@@ -1,7 +1,5 @@
package org.matsim.contrib.discrete_mode_choice.models;
-import static org.junit.Assert.assertEquals;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -9,7 +7,9 @@
import java.util.Map;
import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.population.Activity;
import org.matsim.contribs.discrete_mode_choice.components.estimators.UniformTripEstimator;
@@ -35,7 +35,7 @@
public class RandomUtilityTest {
@Test
- public void testRandomUtility() throws NoFeasibleChoiceException {
+ void testRandomUtility() throws NoFeasibleChoiceException {
TripFilter tripFilter = new CompositeTripFilter(Collections.emptySet());
ModeAvailability modeAvailability = new DefaultModeAvailability(Arrays.asList("car", "pt", "walk"));
TripConstraintFactory constraintFactory = new CompositeTripConstraintFactory();
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/nested/NestCalculatorTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/nested/NestCalculatorTest.java
index 499a955392a..d65e211943b 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/nested/NestCalculatorTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/models/nested/NestCalculatorTest.java
@@ -1,8 +1,8 @@
package org.matsim.contrib.discrete_mode_choice.models.nested;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceModel.NoFeasibleChoiceException;
import org.matsim.contribs.discrete_mode_choice.model.nested.DefaultNest;
import org.matsim.contribs.discrete_mode_choice.model.nested.DefaultNestStructure;
@@ -12,7 +12,7 @@
public class NestCalculatorTest {
@Test
- public void testNoNesting() throws NoFeasibleChoiceException {
+ void testNoNesting() throws NoFeasibleChoiceException {
DefaultNestStructure structure = new DefaultNestStructure();
NestCalculator calculator = new NestCalculator(structure);
@@ -28,7 +28,7 @@ public void testNoNesting() throws NoFeasibleChoiceException {
}
@Test
- public void testNoNestingRedBlue() throws NoFeasibleChoiceException {
+ void testNoNestingRedBlue() throws NoFeasibleChoiceException {
DefaultNestStructure structure = new DefaultNestStructure();
NestCalculator calculator = new NestCalculator(structure);
@@ -49,7 +49,7 @@ public void testNoNestingRedBlue() throws NoFeasibleChoiceException {
}
@Test
- public void testNestedBalancedRedBlue() throws NoFeasibleChoiceException {
+ void testNestedBalancedRedBlue() throws NoFeasibleChoiceException {
DefaultNestStructure structure = new DefaultNestStructure();
DefaultNest busNest = new DefaultNest("bus", 1.0);
structure.addNest(structure.getRoot(), busNest);
@@ -96,7 +96,7 @@ public void testNestedBalancedRedBlue() throws NoFeasibleChoiceException {
}
@Test
- public void testNestedUnbalancedRedBlue() throws NoFeasibleChoiceException {
+ void testNestedUnbalancedRedBlue() throws NoFeasibleChoiceException {
DefaultNestStructure structure = new DefaultNestStructure();
DefaultNest busNest = new DefaultNest("bus", 1.0);
structure.addNest(structure.getRoot(), busNest);
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/modules/config/ConfigTest.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/modules/config/ConfigTest.java
index b212182d3bc..a516cf31ec3 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/modules/config/ConfigTest.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/modules/config/ConfigTest.java
@@ -1,7 +1,7 @@
package org.matsim.contrib.discrete_mode_choice.modules.config;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.BufferedReader;
import java.io.File;
@@ -11,8 +11,8 @@
import java.util.Arrays;
import java.util.HashSet;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.contribs.discrete_mode_choice.modules.config.DiscreteModeChoiceConfigGroup;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigReader;
@@ -21,11 +21,11 @@
import org.matsim.testcases.MatsimTestUtils;
public class ConfigTest {
- @Rule
+ @RegisterExtension
public final MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testReadWriteConfig() {
+ void testReadWriteConfig() {
// Create config
DiscreteModeChoiceConfigGroup dmcConfig = new DiscreteModeChoiceConfigGroup();
Config config = ConfigUtils.createConfig(dmcConfig);
@@ -46,7 +46,7 @@ public void testReadWriteConfig() {
}
@Test
- public void testReadWriteConfigMultipleTimes() throws IOException {
+ void testReadWriteConfigMultipleTimes() throws IOException {
DiscreteModeChoiceConfigGroup dmcConfig = new DiscreteModeChoiceConfigGroup();
Config config1 = ConfigUtils.createConfig(dmcConfig);
@@ -85,7 +85,7 @@ public void testReadWriteConfigMultipleTimes() throws IOException {
}
@Test
- public void testSetTripConstraints() {
+ void testSetTripConstraints() {
DiscreteModeChoiceConfigGroup dmcConfig1 = new DiscreteModeChoiceConfigGroup();
dmcConfig1.setTripConstraints(Arrays.asList("A", "B", "C"));
diff --git a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/replanning/TestDepartureTimes.java b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/replanning/TestDepartureTimes.java
index cfdef620689..69f766da8d4 100644
--- a/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/replanning/TestDepartureTimes.java
+++ b/contribs/discrete_mode_choice/src/test/java/org/matsim/contrib/discrete_mode_choice/replanning/TestDepartureTimes.java
@@ -1,14 +1,14 @@
package org.matsim.contrib.discrete_mode_choice.replanning;
-import static org.junit.Assert.assertEquals;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.api.core.v01.population.Leg;
import org.matsim.api.core.v01.population.Person;
import org.matsim.api.core.v01.population.Plan;
@@ -49,7 +49,7 @@
public class TestDepartureTimes {
@Test
- public void testTripBasedModelDepartureTimes() throws NoFeasibleChoiceException {
+ void testTripBasedModelDepartureTimes() throws NoFeasibleChoiceException {
TripBasedModel model = createTripBasedModel();
// Case 1: Only activity end times, and trips fall well between the end times
@@ -130,7 +130,7 @@ public void testTripBasedModelDepartureTimes() throws NoFeasibleChoiceException
}
@Test
- public void testPushDepartureTimeToNextTour() throws NoFeasibleChoiceException {
+ void testPushDepartureTimeToNextTour() throws NoFeasibleChoiceException {
TourBasedModel model = createTourBasedModel();
Plan plan = new PlanBuilder() //
@@ -150,7 +150,7 @@ public void testPushDepartureTimeToNextTour() throws NoFeasibleChoiceException {
}
@Test
- public void testAccumulateAndPushDepartureTimeToNextTour() throws NoFeasibleChoiceException {
+ void testAccumulateAndPushDepartureTimeToNextTour() throws NoFeasibleChoiceException {
TourBasedModel model = createTourBasedModel();
Plan plan = new PlanBuilder() //
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtTaskFactoryImpl.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtTaskFactoryImpl.java
index 736355552db..4ec83dc7a15 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtTaskFactoryImpl.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/edrt/schedule/EDrtTaskFactoryImpl.java
@@ -23,6 +23,7 @@
import org.matsim.contrib.drt.schedule.DrtTaskType;
import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
import org.matsim.contrib.dvrp.path.VrpPathWithTravelData;
+import org.matsim.contrib.dvrp.schedule.DefaultStayTask;
import org.matsim.contrib.evrp.EvDvrpVehicle;
import org.matsim.contrib.evrp.VrpPathEnergyConsumptions;
import org.matsim.contrib.ev.fleet.ElectricVehicle;
@@ -52,6 +53,11 @@ public EDrtStayTask createStayTask(DvrpVehicle vehicle, double beginTime, double
return new EDrtStayTask(beginTime, endTime, link, 0);// no energy consumption during STAY
}
+ @Override
+ public DefaultStayTask createInitialTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
+ return createStayTask(vehicle, beginTime, endTime, link);
+ }
+
public EDrtChargingTask createChargingTask(DvrpVehicle vehicle, double beginTime, double endTime, Charger charger,
double totalEnergy) {
return new EDrtChargingTask(beginTime, endTime, charger, ((EvDvrpVehicle)vehicle).getElectricVehicle(),
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/run/ShiftEDrtModeOptimizerQSimModule.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/run/ShiftEDrtModeOptimizerQSimModule.java
index ab537fd439d..fdc06e3cb8b 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/run/ShiftEDrtModeOptimizerQSimModule.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/run/ShiftEDrtModeOptimizerQSimModule.java
@@ -1,5 +1,6 @@
package org.matsim.contrib.drt.extension.operations.eshifts.run;
+import com.google.inject.Singleton;
import org.matsim.api.core.v01.network.Network;
import org.matsim.contrib.drt.extension.edrt.EDrtActionCreator;
import org.matsim.contrib.drt.extension.edrt.optimizer.EDrtVehicleDataEntryFactory;
@@ -42,8 +43,6 @@
import org.matsim.core.router.costcalculators.TravelDisutilityFactory;
import org.matsim.core.router.util.TravelTime;
-import com.google.inject.Singleton;
-
/**
* @author nkuehnel / MOIA
*/
@@ -78,26 +77,25 @@ drtShiftParams, new EDrtShiftStartLogic(new DefaultShiftStartLogic()),
bindModal(VehicleEntry.EntryFactory.class).toProvider(modalProvider(getter -> new ShiftVehicleDataEntryFactory(new EDrtVehicleDataEntryFactory(0)))).asEagerSingleton();
- final ShiftEDrtTaskFactoryImpl taskFactory = new ShiftEDrtTaskFactoryImpl(new EDrtTaskFactoryImpl());
- bindModal(DrtTaskFactory.class).toInstance(taskFactory);
- bindModal(ShiftDrtTaskFactory.class).toInstance(taskFactory);
+ bindModal(DrtTaskFactory.class).toProvider(modalProvider(getter -> new ShiftEDrtTaskFactoryImpl(new EDrtTaskFactoryImpl(), getter.getModal(OperationFacilities.class)))).in(Singleton.class);
+ bindModal(ShiftDrtTaskFactory.class).toProvider(modalProvider(getter -> ((ShiftDrtTaskFactory) getter.getModal(DrtTaskFactory.class))));
bindModal(ShiftTaskScheduler.class).toProvider(modalProvider(
getter -> new EShiftTaskScheduler(getter.getModal(Network.class), getter.getModal(TravelTime.class),
getter.getModal(TravelDisutilityFactory.class).createTravelDisutility(getter.getModal(TravelTime.class)),
- getter.get(MobsimTimer.class), taskFactory, drtShiftParams, getter.getModal(ChargingInfrastructure.class),
+ getter.get(MobsimTimer.class), getter.getModal(ShiftDrtTaskFactory.class), drtShiftParams, getter.getModal(ChargingInfrastructure.class),
getter.getModal(OperationFacilities.class), getter.getModal(Fleet.class))
)).asEagerSingleton();
-
+
// See EDrtModeOptimizerQSimModule
bindModal(VrpLegFactory.class).toProvider(modalProvider(getter -> {
DvrpConfigGroup dvrpCfg = getter.get(DvrpConfigGroup.class);
MobsimTimer timer = getter.get(MobsimTimer.class);
-
+
// Makes basic DrtActionCreator create legs with consumption tracker
return v -> EDrtActionCreator.createLeg(dvrpCfg.mobsimMode, v, timer);
})).in(Singleton.class);
-
+
bindModal(ShiftEDrtActionCreator.class).toProvider(modalProvider(getter -> {
VrpAgentLogic.DynActionCreator delegate = drtCfg.getPrebookingParams().isPresent()
? getter.getModal(PrebookingActionCreator.class)
@@ -107,7 +105,7 @@ drtShiftParams, new EDrtShiftStartLogic(new DefaultShiftStartLogic()),
new ShiftDrtActionCreator(getter.getModal(PassengerHandler.class), delegate),
getter.get(MobsimTimer.class), getter.getModal(PassengerHandler.class));
})).asEagerSingleton();
-
+
bindModal(VrpAgentLogic.DynActionCreator.class).to(modalKey(ShiftEDrtActionCreator.class));
}
}
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/schedule/ShiftEDrtTaskFactoryImpl.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/schedule/ShiftEDrtTaskFactoryImpl.java
index 87490980a22..5e0c085c1bb 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/schedule/ShiftEDrtTaskFactoryImpl.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/schedule/ShiftEDrtTaskFactoryImpl.java
@@ -1,8 +1,10 @@
package org.matsim.contrib.drt.extension.operations.eshifts.schedule;
+import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.drt.extension.edrt.schedule.EDrtChargingTask;
import org.matsim.contrib.drt.extension.edrt.schedule.EDrtTaskFactoryImpl;
+import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacilities;
import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacility;
import org.matsim.contrib.drt.extension.operations.shifts.schedule.ShiftBreakTask;
import org.matsim.contrib.drt.extension.operations.shifts.schedule.ShiftChangeOverTask;
@@ -16,10 +18,17 @@
import org.matsim.contrib.drt.schedule.DrtTaskType;
import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
import org.matsim.contrib.dvrp.path.VrpPathWithTravelData;
+import org.matsim.contrib.dvrp.schedule.DefaultStayTask;
import org.matsim.contrib.ev.infrastructure.Charger;
import org.matsim.contrib.evrp.ChargingTask;
import org.matsim.contrib.evrp.ChargingTaskImpl;
import org.matsim.contrib.evrp.EvDvrpVehicle;
+import org.matsim.facilities.Facility;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
/**
* @author nkuehnel / MOIA
@@ -27,10 +36,14 @@
public class ShiftEDrtTaskFactoryImpl implements ShiftDrtTaskFactory {
private final EDrtTaskFactoryImpl delegate;
+ private final OperationFacilities operationFacilities;
+
- public ShiftEDrtTaskFactoryImpl(EDrtTaskFactoryImpl delegate) {
+ public ShiftEDrtTaskFactoryImpl(EDrtTaskFactoryImpl delegate, OperationFacilities operationFacilities) {
this.delegate = delegate;
- }
+ this.operationFacilities = operationFacilities;
+
+ }
@Override
public DrtDriveTask createDriveTask(DvrpVehicle vehicle, VrpPathWithTravelData path, DrtTaskType drtTaskType) {
@@ -47,7 +60,26 @@ public DrtStayTask createStayTask(DvrpVehicle vehicle, double beginTime, double
return delegate.createStayTask(vehicle, beginTime, endTime, link);
}
- @Override
+ @Override
+ public DefaultStayTask createInitialTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
+ final Map, List> facilitiesByLink = operationFacilities.getDrtOperationFacilities().values().stream().collect(Collectors.groupingBy(Facility::getLinkId));
+ final OperationFacility operationFacility;
+ try {
+ operationFacility = facilitiesByLink.get(vehicle.getStartLink().getId()).stream().findFirst().orElseThrow((Supplier) () -> new RuntimeException("Vehicles must start at an operation facility!"));
+ } catch (Throwable e) {
+ throw new RuntimeException(e);
+ }
+ WaitForShiftStayTask waitForShiftStayTask = createWaitForShiftStayTask(vehicle, vehicle.getServiceBeginTime(), vehicle.getServiceEndTime(),
+ vehicle.getStartLink(), operationFacility);
+ boolean success = operationFacility.register(vehicle.getId());
+ if (!success) {
+ throw new RuntimeException(String.format("Cannot register vehicle %s at facility %s at start-up. Please check" +
+ "facility capacity and initial fleet distribution.", vehicle.getId().toString(), operationFacility.getId().toString()));
+ }
+ return waitForShiftStayTask;
+ }
+
+ @Override
public ShiftBreakTask createShiftBreakTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link,
DrtShiftBreak shiftBreak, OperationFacility facility) {
return new EDrtShiftBreakTaskImpl(beginTime, endTime, link, shiftBreak, 0, null, facility);
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/scheduler/EShiftTaskScheduler.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/scheduler/EShiftTaskScheduler.java
index 83f74ad89e0..7352f32c261 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/scheduler/EShiftTaskScheduler.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/eshifts/scheduler/EShiftTaskScheduler.java
@@ -74,7 +74,6 @@ public EShiftTaskScheduler(Network network, TravelTime travelTime, TravelDisutil
this.shiftsParams = shiftsParams;
this.router = new SpeedyALTFactory().createPathCalculator(network, travelDisutility, travelTime);
this.chargingInfrastructure = chargingInfrastructure;
- ShiftSchedules.initSchedules(operationFacilities, fleet, taskFactory);
}
public void relocateForBreak(ShiftDvrpVehicle vehicle, OperationFacility breakFacility, DrtShift shift) {
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/ShiftAnalysisControlerListener.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/ShiftAnalysisControlerListener.java
index de7026de9e2..60c9c9e1cb0 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/ShiftAnalysisControlerListener.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/ShiftAnalysisControlerListener.java
@@ -52,9 +52,10 @@ public ShiftAnalysisControlerListener(Config config, DrtConfigGroup drtConfigGro
@Override
public void notifyIterationEnds(IterationEndsEvent event) {
- boolean createGraphs = event.getServices().getConfig().controller().isCreateGraphs();
+ int createGraphsInterval = event.getServices().getConfig().controller().getCreateGraphsInterval();
+ boolean createGraphs = createGraphsInterval >0 && event.getIteration() % createGraphsInterval == 0;
- writeAndPlotShiftDurationComparison(shiftDurationXY.getShift2plannedVsActualDuration(),
+ writeAndPlotShiftDurationComparison(shiftDurationXY.getShift2plannedVsActualDuration(),
filename(event, "shiftDurationComparison", ".png"),
filename(event, "shiftDurationComparison", ".csv"),
createGraphs);
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/ShiftHistogramListener.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/ShiftHistogramListener.java
index 15aef81a055..aceaa023f7d 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/ShiftHistogramListener.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/ShiftHistogramListener.java
@@ -35,7 +35,9 @@ public void notifyIterationStarts(final IterationStartsEvent event) {
public void notifyIterationEnds(final IterationEndsEvent event) {
this.shiftHistogram.write(matsimServices.getControlerIO().getIterationFilename(event.getIteration(), drtConfigGroup.getMode() + "_" + "shiftHistogram.txt"));
this.printStats();
- boolean createGraphs = event.getServices().getConfig().controller().isCreateGraphs();
+ int createGraphsInterval = event.getServices().getConfig().controller().getCreateGraphsInterval();
+ boolean createGraphs = createGraphsInterval >0 && event.getIteration() % createGraphsInterval == 0;
+
if (createGraphs) {
ShiftHistogramChart.writeGraphic(this.shiftHistogram, matsimServices.getControlerIO().getIterationFilename(event.getIteration(),drtConfigGroup.getMode() + "_" + "shiftHistogram.png"));
}
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/efficiency/ShiftEfficiencyAnalysisControlerListener.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/efficiency/ShiftEfficiencyAnalysisControlerListener.java
index f75637f76d7..57e451f31b0 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/efficiency/ShiftEfficiencyAnalysisControlerListener.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/efficiency/ShiftEfficiencyAnalysisControlerListener.java
@@ -56,9 +56,10 @@ public ShiftEfficiencyAnalysisControlerListener(DrtConfigGroup drtConfigGroup,
@Override
public void notifyIterationEnds(IterationEndsEvent event) {
- boolean createGraphs = event.getServices().getConfig().controller().isCreateGraphs();
+ int createGraphsInterval = event.getServices().getConfig().controller().getCreateGraphsInterval();
+ boolean createGraphs = createGraphsInterval >0 && event.getIteration() % createGraphsInterval == 0;
- writeAndPlotShiftEfficiency(
+ writeAndPlotShiftEfficiency(
shiftEfficiencyTracker.getCurrentRecord().getRevenueByShift(),
shiftEfficiencyTracker.getCurrentRecord().getRequestsByShift(),
shiftEfficiencyTracker.getCurrentRecord().getFinishedShifts(),
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/optimizer/ShiftRequestInsertionScheduler.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/optimizer/ShiftRequestInsertionScheduler.java
deleted file mode 100644
index a4feba591cf..00000000000
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/optimizer/ShiftRequestInsertionScheduler.java
+++ /dev/null
@@ -1,375 +0,0 @@
-package org.matsim.contrib.drt.extension.operations.shifts.optimizer;
-
-import static org.matsim.contrib.drt.schedule.DrtTaskBaseType.DRIVE;
-import static org.matsim.contrib.drt.schedule.DrtTaskBaseType.STAY;
-
-import java.util.List;
-
-import org.matsim.api.core.v01.network.Link;
-import org.matsim.contrib.drt.extension.operations.shifts.fleet.ShiftDvrpVehicle;
-import org.matsim.contrib.drt.extension.operations.shifts.schedule.OperationalStop;
-import org.matsim.contrib.drt.extension.operations.shifts.schedule.ShiftChangeOverTask;
-import org.matsim.contrib.drt.extension.operations.shifts.schedule.ShiftDrtTaskFactory;
-import org.matsim.contrib.drt.extension.operations.shifts.scheduler.ShiftTaskScheduler;
-import org.matsim.contrib.drt.optimizer.VehicleEntry;
-import org.matsim.contrib.drt.optimizer.Waypoint;
-import org.matsim.contrib.drt.optimizer.insertion.InsertionWithDetourData;
-import org.matsim.contrib.drt.passenger.AcceptedDrtRequest;
-import org.matsim.contrib.drt.schedule.DrtDriveTask;
-import org.matsim.contrib.drt.schedule.DrtStayTask;
-import org.matsim.contrib.drt.schedule.DrtStopTask;
-import org.matsim.contrib.drt.scheduler.RequestInsertionScheduler;
-import org.matsim.contrib.drt.stops.StopTimeCalculator;
-import org.matsim.contrib.dvrp.path.VrpPathWithTravelData;
-import org.matsim.contrib.dvrp.path.VrpPaths;
-import org.matsim.contrib.dvrp.schedule.Schedule;
-import org.matsim.contrib.dvrp.schedule.ScheduleTimingUpdater;
-import org.matsim.contrib.dvrp.schedule.StayTask;
-import org.matsim.contrib.dvrp.schedule.Task;
-import org.matsim.contrib.dvrp.tracker.OnlineDriveTaskTracker;
-import org.matsim.contrib.dvrp.util.LinkTimePair;
-import org.matsim.core.mobsim.framework.MobsimTimer;
-import org.matsim.core.router.util.TravelTime;
-
-/**
- * @author nkuehnel / MOIA
- */
-public class ShiftRequestInsertionScheduler implements RequestInsertionScheduler {
-
- private final MobsimTimer timer;
- private final TravelTime travelTime;
- private final ScheduleTimingUpdater scheduleTimingUpdater;
- private final ShiftDrtTaskFactory taskFactory;
- private StopTimeCalculator stopTimeCalculator;
-
-
- public ShiftRequestInsertionScheduler(MobsimTimer timer, TravelTime travelTime,
- ScheduleTimingUpdater scheduleTimingUpdater, ShiftDrtTaskFactory taskFactory,
- StopTimeCalculator stopTimeCalculator) {
- this.timer = timer;
- this.travelTime = travelTime;
- this.scheduleTimingUpdater = scheduleTimingUpdater;
- this.taskFactory = taskFactory;
- this.stopTimeCalculator = stopTimeCalculator;
- }
-
-
- @Override
- public PickupDropoffTaskPair scheduleRequest(AcceptedDrtRequest request, InsertionWithDetourData insertion) {
- var pickupTask = insertPickup(request, insertion);
- var dropoffTask = insertDropoff(request, insertion, pickupTask);
- return new PickupDropoffTaskPair(pickupTask, dropoffTask);
- }
-
- private DrtStopTask insertPickup(AcceptedDrtRequest request, InsertionWithDetourData insertionWithDetourData) {
- var insertion = insertionWithDetourData.insertion;
- VehicleEntry vehicleEntry = insertion.vehicleEntry;
- Schedule schedule = vehicleEntry.vehicle.getSchedule();
- List stops = vehicleEntry.stops;
- int pickupIdx = insertion.pickup.index;
- int dropoffIdx = insertion.dropoff.index;
- var detourData = insertionWithDetourData.detourData;
-
- Schedule.ScheduleStatus scheduleStatus = schedule.getStatus();
- Task currentTask = scheduleStatus == Schedule.ScheduleStatus.PLANNED ? null : schedule.getCurrentTask();
- Task beforePickupTask;
-
- if (pickupIdx == 0 && scheduleStatus != Schedule.ScheduleStatus.PLANNED && DRIVE.isBaseTypeOf(currentTask)) {
- LinkTimePair diversion = ((OnlineDriveTaskTracker) currentTask.getTaskTracker()).getDiversionPoint();
- if (diversion != null) { // divert vehicle
- beforePickupTask = currentTask;
- VrpPathWithTravelData vrpPath = VrpPaths.createPath(vehicleEntry.start.link, request.getFromLink(),
- vehicleEntry.start.time, detourData.detourToPickup, travelTime);
- ((OnlineDriveTaskTracker) beforePickupTask.getTaskTracker()).divertPath(vrpPath);
- } else { // too late for diversion
- if (request.getFromLink() != vehicleEntry.start.link) { // add a new drive task
- VrpPathWithTravelData vrpPath = VrpPaths.createPath(vehicleEntry.start.link, request.getFromLink(),
- vehicleEntry.start.time, detourData.detourToPickup, travelTime);
- beforePickupTask = taskFactory.createDriveTask(vehicleEntry.vehicle, vrpPath, DrtDriveTask.TYPE);
- schedule.addTask(currentTask.getTaskIdx() + 1, beforePickupTask);
- } else { // no need for a new drive task
- beforePickupTask = currentTask;
- }
- }
- } else { // insert pickup after an existing stop/stay task
- DrtStayTask stayTask = null;
- DrtStopTask stopTask = null;
- if (pickupIdx == 0) {
- if (scheduleStatus == Schedule.ScheduleStatus.PLANNED) {// PLANNED schedule
- stayTask = (DrtStayTask) schedule.getTasks().get(0);
- stayTask.setEndTime(stayTask.getBeginTime());// could get later removed with ScheduleTimingUpdater
- } else if (STAY.isBaseTypeOf(currentTask)) {
- stayTask = (DrtStayTask) currentTask; // ongoing stay task
- double now = timer.getTimeOfDay();
- if (stayTask.getEndTime() > now) { // stop stay task; a new stop/drive task can be inserted now
- stayTask.setEndTime(now);
- }
- } else {
- stopTask = (DrtStopTask) currentTask; // ongoing stop task
- }
- } else {
- stopTask = stops.get(pickupIdx - 1).task; // future stop task
- }
-
- if (stopTask != null && request.getFromLink() == stopTask.getLink()) { // no detour; no new stop task
- // add pickup request to stop task
- stopTask.addPickupRequest(request);
- if (stopTask instanceof OperationalStop) {
- if (request.getEarliestStartTime() > stopTask.getEndTime()) {
- throw new RuntimeException("Cannot serve request!");
- }
- } else {
- /*
- * TODO: insertionTime should be set to "now" here to avoid adding pickups to
- * ongoing tasks "for free" and generating requests with zero wait time. See
- * InsertionDetourTimeCalculator.calculatePickupIfSameLink for more details.
- */
-
- double insertionTime = stopTask.getBeginTime();
- stopTask.setEndTime(stopTimeCalculator.updateEndTimeForPickup(vehicleEntry.vehicle, stopTask,
- insertionTime, request.getRequest()));
- }
-
- /// ADDED
- //// TODO this is copied, but has not been updated !!!!!!!!!!!!!!!
- // add drive from pickup
- if (pickupIdx == dropoffIdx) {
- // remove drive i->i+1 (if there is one)
- if (pickupIdx < stops.size()) {// there is at least one following stop
- DrtStopTask nextStopTask = stops.get(pickupIdx).task;
- if (nextStopTask instanceof ShiftChangeOverTask) {
- if (stopTask.getTaskIdx() + 3 != nextStopTask.getTaskIdx()) {// there must a drive and stay task in
- // between
- throw new RuntimeException();
- }
- } else if (stopTask.getTaskIdx() + 2 != nextStopTask.getTaskIdx()) {// there must a drive task in
- // between
- throw new RuntimeException();
- }
- if (nextStopTask instanceof ShiftChangeOverTask) {
- if (stopTask.getTaskIdx() + 3 == nextStopTask.getTaskIdx()) {// there must a drive task and stay in
- // between
- int driveTaskIdx = stopTask.getTaskIdx() + 1;
- final Task task = schedule.getTasks().get(driveTaskIdx);
- schedule.removeTask(task);
- }
- } else {
- if (stopTask.getTaskIdx() + 2 == nextStopTask.getTaskIdx()) {// there must a drive task in
- // between
- int driveTaskIdx = stopTask.getTaskIdx() + 1;
- final Task task = schedule.getTasks().get(driveTaskIdx);
- schedule.removeTask(task);
- }
- }
- }
-
- Link toLink = request.getToLink(); // pickup->dropoff
-
- VrpPathWithTravelData vrpPath = VrpPaths.createPath(request.getFromLink(), toLink,
- stopTask.getEndTime(), detourData.detourFromPickup, travelTime);
- Task driveFromPickupTask = taskFactory.createDriveTask(vehicleEntry.vehicle, vrpPath,
- DrtDriveTask.TYPE);
- schedule.addTask(stopTask.getTaskIdx() + 1, driveFromPickupTask);
-
- // update timings
- // TODO should be enough to update the timeline only till dropoffIdx...
- scheduleTimingUpdater.updateTimingsStartingFromTaskIdx(vehicleEntry.vehicle,
- stopTask.getTaskIdx() + 2, driveFromPickupTask.getEndTime());
- ///////
- }
-
- return stopTask;
- } else {
- StayTask stayOrStopTask = stayTask != null ? stayTask : stopTask;
-
- // remove drive i->i+1 (if there is one)
- if (pickupIdx < stops.size()) {// there is at least one following stop
-
- DrtStopTask nextStopTask = stops.get(pickupIdx).task;
-
- if (nextStopTask instanceof ShiftChangeOverTask) {
- if (stayOrStopTask.getTaskIdx() + 3 == nextStopTask.getTaskIdx()) {
- // removing the drive task that is in between
- int driveTaskIdx = stayOrStopTask.getTaskIdx() + 1;
- final Task task = schedule.getTasks().get(driveTaskIdx);
- schedule.removeTask(task);
- }
- } else {
- // check: if there is at most one drive task in between
- if (stayOrStopTask.getTaskIdx() + 2 != nextStopTask.getTaskIdx() //
- && stayTask != null && stayTask.getTaskIdx() + 1 != nextStopTask.getTaskIdx()) {
- throw new RuntimeException();
- }
- if (stayOrStopTask.getTaskIdx() + 2 == nextStopTask.getTaskIdx()) {
- // removing the drive task that is in between
- int driveTaskIdx = stayOrStopTask.getTaskIdx() + 1;
- final Task task = schedule.getTasks().get(driveTaskIdx);
- schedule.removeTask(task);
- }
- }
- }
-
- if (stayTask != null && request.getFromLink() == stayTask.getLink()) {
- // the bus stays where it is
- beforePickupTask = stayTask;
- } else {// add drive task to pickup location
- // insert drive i->pickup
- VrpPathWithTravelData vrpPath = VrpPaths.createPath(stayOrStopTask.getLink(), request.getFromLink(),
- stayOrStopTask.getEndTime(), detourData.detourToPickup, travelTime);
- beforePickupTask = taskFactory.createDriveTask(vehicleEntry.vehicle, vrpPath, DrtDriveTask.TYPE);
- schedule.addTask(stayOrStopTask.getTaskIdx() + 1, beforePickupTask);
- }
- }
- }
-
- // insert pickup stop task
- double startTime = beforePickupTask.getEndTime();
- int taskIdx = beforePickupTask.getTaskIdx() + 1;
- double stopEndTime = stopTimeCalculator.initEndTimeForPickup(vehicleEntry.vehicle, startTime, request.getRequest());
- DrtStopTask pickupStopTask = taskFactory.createStopTask(vehicleEntry.vehicle, startTime,
- stopEndTime, request.getFromLink());
- schedule.addTask(taskIdx, pickupStopTask);
- pickupStopTask.addPickupRequest(request);
-
- // add drive from pickup
- Link toLink = pickupIdx == dropoffIdx ? request.getToLink() // pickup->dropoff
- : stops.get(pickupIdx).task.getLink(); // pickup->i+1
-
- VrpPathWithTravelData vrpPath = VrpPaths.createPath(request.getFromLink(), toLink, pickupStopTask.getEndTime(),
- detourData.detourFromPickup, travelTime);
- Task driveFromPickupTask = taskFactory.createDriveTask(vehicleEntry.vehicle, vrpPath, DrtDriveTask.TYPE);
- schedule.addTask(taskIdx + 1, driveFromPickupTask);
-
- // update timings
- // TODO should be enough to update the timeline only till dropoffIdx...
- scheduleTimingUpdater.updateTimingsStartingFromTaskIdx(vehicleEntry.vehicle, taskIdx + 2,
- driveFromPickupTask.getEndTime());
- return pickupStopTask;
- }
-
- private DrtStopTask insertDropoff(AcceptedDrtRequest request, InsertionWithDetourData insertionWithDetourData,
- DrtStopTask pickupTask) {
- var insertion = insertionWithDetourData.insertion;
- VehicleEntry vehicleEntry = insertion.vehicleEntry;
- Schedule schedule = vehicleEntry.vehicle.getSchedule();
- List stops = vehicleEntry.stops;
- int pickupIdx = insertion.pickup.index;
- int dropoffIdx = insertion.dropoff.index;
- var detourData = insertionWithDetourData.detourData;
-
- Task driveToDropoffTask;
- if (pickupIdx == dropoffIdx) { // no drive to dropoff
- int pickupTaskIdx = pickupTask.getTaskIdx();
- driveToDropoffTask = schedule.getTasks().get(pickupTaskIdx + 1);
- } else {
- DrtStopTask stopTask = stops.get(dropoffIdx - 1).task;
- if (request.getToLink() == stopTask.getLink()) { // no detour; no new stop task
- // add dropoff request to stop task, and extend the stop task (when incremental stop task duration is used)
- stopTask.addDropoffRequest(request);
-
- /*
- * TODO: insertionTime should be set to "now" here to avoid adding pickups to
- * ongoing tasks "for free" and generating requests with zero wait time. See
- * InsertionDetourTimeCalculator.calculatePickupIfSameLink for more details.
- */
-
- double insertionTime = stopTask.getBeginTime();
- stopTask.setEndTime(stopTimeCalculator.updateEndTimeForDropoff(vehicleEntry.vehicle, stopTask,
- insertionTime, request.getRequest()));
-
- return stopTask;
- } else { // add drive task to dropoff location
-
- // remove drive j->j+1 (if j is not the last stop)
- if (dropoffIdx < stops.size()) {
- DrtStopTask nextStopTask = stops.get(dropoffIdx).task;
-
- // this is new
- if ((nextStopTask instanceof ShiftChangeOverTask)) {
- if (stopTask.getTaskIdx() + 3 != nextStopTask.getTaskIdx()
- && !stopTask.getLink().getId().equals(nextStopTask.getLink().getId())) {
- //include stay task before shift changeover
- throw new IllegalStateException();
- }
- }
- //end of new
-
- else {
- if (stopTask.getTaskIdx() + 2 != nextStopTask.getTaskIdx()) {
- throw new IllegalStateException();
- }
- }
- int driveTaskIdx = stopTask.getTaskIdx() + 1;
-
- final Task task = schedule.getTasks().get(driveTaskIdx);
- schedule.removeTask(task);
- }
-
- // insert drive i->dropoff
- VrpPathWithTravelData vrpPath = VrpPaths.createPath(stopTask.getLink(), request.getToLink(),
- stopTask.getEndTime(), detourData.detourToDropoff, travelTime);
- driveToDropoffTask = taskFactory.createDriveTask(vehicleEntry.vehicle, vrpPath, DrtDriveTask.TYPE);
- schedule.addTask(stopTask.getTaskIdx() + 1, driveToDropoffTask);
- }
- }
-
- // insert dropoff stop task
- double startTime = driveToDropoffTask.getEndTime();
- int taskIdx = driveToDropoffTask.getTaskIdx() + 1;
- double stopEndTime = stopTimeCalculator.initEndTimeForDropoff(vehicleEntry.vehicle, startTime, request.getRequest());
- DrtStopTask dropoffStopTask = taskFactory.createStopTask(vehicleEntry.vehicle, startTime,
- stopEndTime, request.getToLink());
- schedule.addTask(taskIdx, dropoffStopTask);
- dropoffStopTask.addDropoffRequest(request);
-
- // add drive from dropoff
- if (dropoffIdx == stops.size()) {// bus stays at dropoff
- if (taskIdx + 2 == schedule.getTaskCount()) {// remove stay task from the end of schedule,
- DrtStayTask oldStayTask = (DrtStayTask) schedule.getTasks().get(taskIdx + 1);
- schedule.removeTask(oldStayTask);
- }
- if (taskIdx + 1 == schedule.getTaskCount()) {
- // no stay task at the end if the pickup follows the existing stay task
- double beginTime = dropoffStopTask.getEndTime();
- double endTime = Math.max(beginTime, ((ShiftDvrpVehicle) vehicleEntry.vehicle).getShifts().peek().getEndTime());
- schedule.addTask(taskFactory.createStayTask(vehicleEntry.vehicle, beginTime,
- endTime, dropoffStopTask.getLink()));
- } else {
- throw new RuntimeException();
- }
- } else {
- final DrtStopTask nextStopTask = stops.get(dropoffIdx).task;
- Link toLink = nextStopTask.getLink(); // dropoff->j+1
-
- VrpPathWithTravelData vrpPath = VrpPaths.createPath(request.getToLink(), toLink, dropoffStopTask.getEndTime(),
- detourData.detourFromDropoff, travelTime);
-
-
- Task driveFromDropoffTask;
- if (nextStopTask instanceof ShiftChangeOverTask) {
- driveFromDropoffTask = taskFactory.createDriveTask(vehicleEntry.vehicle, vrpPath, ShiftTaskScheduler.RELOCATE_VEHICLE_SHIFT_CHANGEOVER_TASK_TYPE);
- schedule.addTask(taskIdx + 1, driveFromDropoffTask);
- final List tasks = vehicleEntry.vehicle.getSchedule().getTasks();
- final Task task = tasks.get(tasks.indexOf(nextStopTask) - 1);
- if (task instanceof DrtStayTask) {
- schedule.removeTask(task);
- }
- final double arrivalTime = vrpPath.getArrivalTime();
- final double shiftEndTime = ((ShiftChangeOverTask) nextStopTask).getShift().getEndTime();
- if (arrivalTime <= shiftEndTime) {
- DrtStayTask stayWaitShiftEndTask = taskFactory.createStayTask(vehicleEntry.vehicle, arrivalTime,
- shiftEndTime, nextStopTask.getLink());
- schedule.addTask(tasks.indexOf(nextStopTask), stayWaitShiftEndTask);
- }
- } else {
- driveFromDropoffTask = taskFactory.createDriveTask(vehicleEntry.vehicle, vrpPath, DrtDriveTask.TYPE);
- schedule.addTask(taskIdx + 1, driveFromDropoffTask);
- }
-
- // update timings
- scheduleTimingUpdater.updateTimingsStartingFromTaskIdx(vehicleEntry.vehicle, taskIdx + 2,
- driveFromDropoffTask.getEndTime());
- }
- return dropoffStopTask;
- }
-}
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/run/ShiftDrtModeOptimizerQSimModule.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/run/ShiftDrtModeOptimizerQSimModule.java
index eced5b90a1d..e7f4f58b391 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/run/ShiftDrtModeOptimizerQSimModule.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/run/ShiftDrtModeOptimizerQSimModule.java
@@ -1,5 +1,7 @@
package org.matsim.contrib.drt.extension.operations.shifts.run;
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Singleton;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Network;
import org.matsim.contrib.drt.extension.operations.DrtOperationsParams;
@@ -13,7 +15,6 @@
import org.matsim.contrib.drt.extension.operations.shifts.dispatcher.DrtShiftDispatcherImpl;
import org.matsim.contrib.drt.extension.operations.shifts.fleet.DefaultShiftDvrpVehicle;
import org.matsim.contrib.drt.extension.operations.shifts.optimizer.ShiftDrtOptimizer;
-import org.matsim.contrib.drt.extension.operations.shifts.optimizer.ShiftRequestInsertionScheduler;
import org.matsim.contrib.drt.extension.operations.shifts.optimizer.ShiftVehicleDataEntryFactory;
import org.matsim.contrib.drt.extension.operations.shifts.optimizer.insertion.ShiftInsertionCostCalculator;
import org.matsim.contrib.drt.extension.operations.shifts.schedule.ShiftDrtActionCreator;
@@ -23,17 +24,8 @@
import org.matsim.contrib.drt.extension.operations.shifts.scheduler.ShiftDrtScheduleInquiry;
import org.matsim.contrib.drt.extension.operations.shifts.scheduler.ShiftTaskScheduler;
import org.matsim.contrib.drt.extension.operations.shifts.scheduler.ShiftTaskSchedulerImpl;
-import org.matsim.contrib.drt.extension.operations.shifts.shift.DefaultShiftBreakImpl;
-import org.matsim.contrib.drt.extension.operations.shifts.shift.DrtShift;
-import org.matsim.contrib.drt.extension.operations.shifts.shift.DrtShiftBreakSpecification;
-import org.matsim.contrib.drt.extension.operations.shifts.shift.DrtShiftImpl;
-import org.matsim.contrib.drt.extension.operations.shifts.shift.DrtShifts;
-import org.matsim.contrib.drt.extension.operations.shifts.shift.DrtShiftsSpecification;
-import org.matsim.contrib.drt.optimizer.DefaultDrtOptimizer;
-import org.matsim.contrib.drt.optimizer.DrtOptimizer;
-import org.matsim.contrib.drt.optimizer.DrtRequestInsertionRetryQueue;
-import org.matsim.contrib.drt.optimizer.VehicleDataEntryFactoryImpl;
-import org.matsim.contrib.drt.optimizer.VehicleEntry;
+import org.matsim.contrib.drt.extension.operations.shifts.shift.*;
+import org.matsim.contrib.drt.optimizer.*;
import org.matsim.contrib.drt.optimizer.depot.DepotFinder;
import org.matsim.contrib.drt.optimizer.insertion.CostCalculationStrategy;
import org.matsim.contrib.drt.optimizer.insertion.DefaultInsertionCostCalculator;
@@ -47,7 +39,6 @@
import org.matsim.contrib.drt.schedule.DrtTaskFactoryImpl;
import org.matsim.contrib.drt.scheduler.DrtScheduleInquiry;
import org.matsim.contrib.drt.scheduler.EmptyVehicleRelocator;
-import org.matsim.contrib.drt.scheduler.RequestInsertionScheduler;
import org.matsim.contrib.drt.stops.StopTimeCalculator;
import org.matsim.contrib.drt.vrpagent.DrtActionCreator;
import org.matsim.contrib.dvrp.fleet.DvrpVehicleImpl;
@@ -68,9 +59,6 @@
import org.matsim.core.router.costcalculators.TravelDisutilityFactory;
import org.matsim.core.router.util.TravelTime;
-import com.google.common.collect.ImmutableMap;
-import com.google.inject.Singleton;
-
/**
* @author nkuehnel, fzwick / MOIA
*/
@@ -112,7 +100,7 @@ public DrtShifts get() {
}).asEagerSingleton();
addModalComponent(DrtOptimizer.class, modalProvider(
- getter -> {
+ getter -> {
return new ShiftDrtOptimizer(
new DefaultDrtOptimizer(drtCfg, getter.getModal(Fleet.class), getter.get(MobsimTimer.class),
getter.getModal(DepotFinder.class), getter.getModal(RebalancingStrategy.class),
@@ -137,32 +125,25 @@ shiftsParams, new DefaultShiftStartLogic(), new DefaultAssignShiftToVehicleLogic
bindModal(VehicleEntry.EntryFactory.class).toInstance(new ShiftVehicleDataEntryFactory(new VehicleDataEntryFactoryImpl()));
- final ShiftDrtTaskFactoryImpl taskFactory = new ShiftDrtTaskFactoryImpl(new DrtTaskFactoryImpl());
- bindModal(DrtTaskFactory.class).toInstance(taskFactory);
- bindModal(ShiftDrtTaskFactory.class).toInstance(taskFactory);
+ bindModal(DrtTaskFactory.class).toProvider(modalProvider(getter -> new ShiftDrtTaskFactoryImpl(new DrtTaskFactoryImpl(), getter.getModal(OperationFacilities.class))));
+ bindModal(ShiftDrtTaskFactory.class).toProvider(modalProvider(getter -> ((ShiftDrtTaskFactory) getter.getModal(DrtTaskFactory.class))));
bindModal(ShiftTaskScheduler.class).toProvider(modalProvider(
getter -> new ShiftTaskSchedulerImpl(getter.getModal(Network.class),
getter.getModal(TravelTime.class),
getter.getModal(TravelDisutilityFactory.class).createTravelDisutility(getter.getModal(TravelTime.class)),
- getter.get(MobsimTimer.class), taskFactory, shiftsParams,
+ getter.get(MobsimTimer.class), getter.getModal(ShiftDrtTaskFactory.class), shiftsParams,
getter.getModal(OperationFacilities.class), getter.getModal(Fleet.class)))
).asEagerSingleton();
bindModal(DrtScheduleInquiry.class).to(ShiftDrtScheduleInquiry.class).asEagerSingleton();
- bindModal(RequestInsertionScheduler.class).toProvider(modalProvider(
- getter -> new ShiftRequestInsertionScheduler(
- getter.get(MobsimTimer.class), getter.getModal(TravelTime.class),
- getter.getModal(ScheduleTimingUpdater.class), getter.getModal(ShiftDrtTaskFactory.class),
- getter.getModal(StopTimeCalculator.class)))
- ).asEagerSingleton();
bindModal(ScheduleTimingUpdater.class).toProvider(modalProvider(
getter -> new ScheduleTimingUpdater(getter.get(MobsimTimer.class),
new ShiftDrtStayTaskEndTimeCalculator(shiftsParams,
new DrtStayTaskEndTimeCalculator(getter.getModal(StopTimeCalculator.class)))))
).asEagerSingleton();
-
+
// see DrtModeOptimizerQSimModule
bindModal(VrpLegFactory.class).toProvider(modalProvider(getter -> {
DvrpConfigGroup dvrpCfg = getter.get(DvrpConfigGroup.class);
@@ -176,11 +157,11 @@ shiftsParams, new DefaultShiftStartLogic(), new DefaultAssignShiftToVehicleLogic
VrpAgentLogic.DynActionCreator delegate = drtCfg.getPrebookingParams().isPresent()
? getter.getModal(PrebookingActionCreator.class)
: getter.getModal(DrtActionCreator.class);
-
+
// adds shift tasks
return new ShiftDrtActionCreator(getter.getModal(PassengerHandler.class), delegate);
})).asEagerSingleton();
-
+
bindModal(VrpAgentLogic.DynActionCreator.class).to(modalKey(ShiftDrtActionCreator.class));
bindModal(Fleet.class).toProvider(new ModalProviders.AbstractProvider<>(getMode(), DvrpModes::mode) {
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftDrtTaskFactoryImpl.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftDrtTaskFactoryImpl.java
index bb2b56e7aec..57460d2bee6 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftDrtTaskFactoryImpl.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftDrtTaskFactoryImpl.java
@@ -1,54 +1,84 @@
package org.matsim.contrib.drt.extension.operations.shifts.schedule;
+import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
+import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacilities;
import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacility;
import org.matsim.contrib.drt.extension.operations.shifts.shift.DrtShift;
import org.matsim.contrib.drt.extension.operations.shifts.shift.DrtShiftBreak;
import org.matsim.contrib.drt.schedule.*;
import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
import org.matsim.contrib.dvrp.path.VrpPathWithTravelData;
+import org.matsim.contrib.dvrp.schedule.DefaultStayTask;
+import org.matsim.facilities.Facility;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
/**
* @author nkuehnel, fzwick / MOIA
*/
public class ShiftDrtTaskFactoryImpl implements ShiftDrtTaskFactory {
- private final DrtTaskFactory delegate;
-
- public ShiftDrtTaskFactoryImpl(DrtTaskFactory delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public DrtDriveTask createDriveTask(DvrpVehicle vehicle, VrpPathWithTravelData path, DrtTaskType drtTaskType) {
- return delegate.createDriveTask(vehicle, path, drtTaskType);
- }
-
- @Override
- public DrtStopTask createStopTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
- return delegate.createStopTask(vehicle, beginTime, endTime, link);
- }
-
- @Override
- public DrtStayTask createStayTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
- return delegate.createStayTask(vehicle, beginTime, endTime, link);
- }
-
- @Override
- public ShiftBreakTask createShiftBreakTask(DvrpVehicle vehicle, double beginTime, double endTime,
- Link link, DrtShiftBreak shiftBreak, OperationFacility facility) {
- return new ShiftBreakTaskImpl(beginTime, endTime, link, shiftBreak, facility);
- }
-
- @Override
- public ShiftChangeOverTask createShiftChangeoverTask(DvrpVehicle vehicle, double beginTime, double endTime,
- Link link, DrtShift shift, OperationFacility facility) {
- return new ShiftChangeoverTaskImpl(beginTime, endTime, link, shift, facility);
- }
-
- @Override
- public WaitForShiftStayTask createWaitForShiftStayTask(DvrpVehicle vehicle, double beginTime, double endTime,
- Link link, OperationFacility facility) {
- return new WaitForShiftStayTask(beginTime, endTime, link, facility);
- }
+ private final DrtTaskFactory delegate;
+ private final OperationFacilities operationFacilities;
+
+ public ShiftDrtTaskFactoryImpl(DrtTaskFactory delegate, OperationFacilities operationFacilities) {
+ this.delegate = delegate;
+ this.operationFacilities = operationFacilities;
+ }
+
+ @Override
+ public DrtDriveTask createDriveTask(DvrpVehicle vehicle, VrpPathWithTravelData path, DrtTaskType drtTaskType) {
+ return delegate.createDriveTask(vehicle, path, drtTaskType);
+ }
+
+ @Override
+ public DrtStopTask createStopTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
+ return delegate.createStopTask(vehicle, beginTime, endTime, link);
+ }
+
+ @Override
+ public DrtStayTask createStayTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
+ return delegate.createStayTask(vehicle, beginTime, endTime, link);
+ }
+
+ @Override
+ public ShiftBreakTask createShiftBreakTask(DvrpVehicle vehicle, double beginTime, double endTime,
+ Link link, DrtShiftBreak shiftBreak, OperationFacility facility) {
+ return new ShiftBreakTaskImpl(beginTime, endTime, link, shiftBreak, facility);
+ }
+
+ @Override
+ public ShiftChangeOverTask createShiftChangeoverTask(DvrpVehicle vehicle, double beginTime, double endTime,
+ Link link, DrtShift shift, OperationFacility facility) {
+ return new ShiftChangeoverTaskImpl(beginTime, endTime, link, shift, facility);
+ }
+
+ @Override
+ public WaitForShiftStayTask createWaitForShiftStayTask(DvrpVehicle vehicle, double beginTime, double endTime,
+ Link link, OperationFacility facility) {
+ return new WaitForShiftStayTask(beginTime, endTime, link, facility);
+ }
+
+ public DefaultStayTask createInitialTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
+ final Map, List> facilitiesByLink = operationFacilities.getDrtOperationFacilities().values().stream().collect(Collectors.groupingBy(Facility::getLinkId));
+ final OperationFacility operationFacility;
+ try {
+ operationFacility = facilitiesByLink.get(vehicle.getStartLink().getId()).stream().findFirst().orElseThrow((Supplier) () -> new RuntimeException("Vehicles must start at an operation facility!"));
+ } catch (Throwable e) {
+ throw new RuntimeException(e);
+ }
+ WaitForShiftStayTask waitForShiftStayTask = createWaitForShiftStayTask(vehicle, vehicle.getServiceBeginTime(), vehicle.getServiceEndTime(),
+ vehicle.getStartLink(), operationFacility);
+ boolean success = operationFacility.register(vehicle.getId());
+ if (!success) {
+ throw new RuntimeException(String.format("Cannot register vehicle %s at facility %s at start-up. Please check" +
+ "facility capacity and initial fleet distribution.", vehicle.getId().toString(), operationFacility.getId().toString()));
+ }
+ return waitForShiftStayTask;
+ }
+
}
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftSchedules.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftSchedules.java
index 95fb45131e5..045a312c38f 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftSchedules.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftSchedules.java
@@ -1,21 +1,10 @@
package org.matsim.contrib.drt.extension.operations.shifts.schedule;
-import org.matsim.api.core.v01.Id;
-import org.matsim.api.core.v01.network.Link;
-import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacilities;
-import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacility;
-import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
-import org.matsim.contrib.dvrp.fleet.Fleet;
import org.matsim.contrib.dvrp.schedule.Schedule;
import org.matsim.contrib.dvrp.schedule.Task;
-import org.matsim.facilities.Facility;
import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
@@ -31,22 +20,4 @@ public static Optional getNextShiftChangeover (Schedule sch
.filter(t -> t.getTaskIdx() > taskIdx)
.min(Comparator.comparingDouble(Task::getBeginTime));
}
-
- public static void initSchedules(OperationFacilities operationFacilities, Fleet fleet, ShiftDrtTaskFactory taskFactory) {
- final Map, List> facilitiesByLink = operationFacilities.getDrtOperationFacilities().values().stream().collect(Collectors.groupingBy(Facility::getLinkId));
- for (DvrpVehicle veh : fleet.getVehicles().values()) {
- try {
- final OperationFacility operationFacility = facilitiesByLink.get(veh.getStartLink().getId()).stream().findFirst().orElseThrow((Supplier) () -> new RuntimeException("Vehicles must start at an operation facility!"));
- veh.getSchedule()
- .addTask(taskFactory.createWaitForShiftStayTask(veh, veh.getServiceBeginTime(), veh.getServiceEndTime(),
- veh.getStartLink(), operationFacility));
- boolean success = operationFacility.register(veh.getId());
- if(!success) {
- throw new RuntimeException(String.format("Cannot register vehicle %s at facility %s at start-up. Please check" +
- "facility capacity and initial fleet distribution.", veh.getId().toString(), operationFacility.getId().toString()));
- } } catch (Throwable throwable) {
- throwable.printStackTrace();
- }
- }
- }
}
diff --git a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/scheduler/ShiftTaskSchedulerImpl.java b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/scheduler/ShiftTaskSchedulerImpl.java
index f5101d68987..d6d272371e9 100644
--- a/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/scheduler/ShiftTaskSchedulerImpl.java
+++ b/contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/shifts/scheduler/ShiftTaskSchedulerImpl.java
@@ -60,8 +60,6 @@ public ShiftTaskSchedulerImpl(Network network, TravelTime travelTime, TravelDisu
this.network = network;
this.drtShiftParams = drtShiftParams;
this.router = new SpeedyALTFactory().createPathCalculator(network, travelDisutility, travelTime);
-
- ShiftSchedules.initSchedules(operationFacilities, fleet, taskFactory);
}
@Override
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/DrtWithExtensionsConfigGroupTest.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/DrtWithExtensionsConfigGroupTest.java
index bc0f9e22ba3..a169febcd9e 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/DrtWithExtensionsConfigGroupTest.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/DrtWithExtensionsConfigGroupTest.java
@@ -19,14 +19,15 @@
package org.matsim.contrib.drt.extension;
+import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.io.TempDir;
import org.matsim.contrib.drt.extension.DrtWithExtensionsConfigGroup;
import org.matsim.contrib.drt.extension.companions.DrtCompanionParams;
import org.matsim.contrib.drt.extension.operations.DrtOperationsParams;
@@ -45,10 +46,8 @@ public class DrtWithExtensionsConfigGroupTest {
private final static double WEIGHT_2 = 1337.;
private final static double WEIGHT_3 = 911.;
-
- @Rule
- public TemporaryFolder tempFolder = new TemporaryFolder();
-
+ @TempDir
+ public File tempFolder;
private static Config createConfig(List values) {
Config config = ConfigUtils.createConfig();
@@ -70,25 +69,25 @@ private static Config createConfig(List values) {
return config;
}
- private static Path writeConfig(final TemporaryFolder tempFolder, List weights) throws IOException {
+ private static Path writeConfig(final File tempFolder, List weights) throws IOException {
Config config = createConfig(weights);
- Path configFile = tempFolder.newFile("config.xml").toPath();
+ Path configFile = new File(tempFolder, "config.xml").toPath();
ConfigUtils.writeConfig(config, configFile.toString());
return configFile;
}
- @Test
- public void loadConfigGroupTest() throws IOException {
+ @Test
+ void loadConfigGroupTest() throws IOException {
/* Test that exported values are correct imported again */
Path configFile = writeConfig(tempFolder, List.of(WEIGHT_1,WEIGHT_2,WEIGHT_3));
Config config = ConfigUtils.createConfig();
ConfigUtils.loadConfig(config, configFile.toString());
DrtWithExtensionsConfigGroup loadedCfg = ConfigUtils.addOrGetModule(config, DrtWithExtensionsConfigGroup.class);
- Assert.assertTrue(loadedCfg.getDrtCompanionParams().isPresent());
- Assert.assertTrue(loadedCfg.getDrtCompanionParams().get().getDrtCompanionSamplingWeights().get(0).equals(WEIGHT_1));
- Assert.assertTrue(loadedCfg.getDrtCompanionParams().get().getDrtCompanionSamplingWeights().get(1).equals(WEIGHT_2));
- Assert.assertTrue(loadedCfg.getDrtCompanionParams().get().getDrtCompanionSamplingWeights().get(2).equals(WEIGHT_3));
+ Assertions.assertTrue(loadedCfg.getDrtCompanionParams().isPresent());
+ Assertions.assertTrue(loadedCfg.getDrtCompanionParams().get().getDrtCompanionSamplingWeights().get(0).equals(WEIGHT_1));
+ Assertions.assertTrue(loadedCfg.getDrtCompanionParams().get().getDrtCompanionSamplingWeights().get(1).equals(WEIGHT_2));
+ Assertions.assertTrue(loadedCfg.getDrtCompanionParams().get().getDrtCompanionSamplingWeights().get(2).equals(WEIGHT_3));
}
}
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/companions/RunDrtWithCompanionExampleIT.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/companions/RunDrtWithCompanionExampleIT.java
index 9ac24985fe4..3529d2fcd04 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/companions/RunDrtWithCompanionExampleIT.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/companions/RunDrtWithCompanionExampleIT.java
@@ -28,8 +28,8 @@
import java.util.stream.Collectors;
import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.drt.extension.DrtWithExtensionsConfigGroup;
import org.matsim.contrib.drt.run.MultiModeDrtConfigGroup;
@@ -48,11 +48,11 @@
*/
public class RunDrtWithCompanionExampleIT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testRunDrtWithCompanions() {
+ void testRunDrtWithCompanions() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_drt_config.xml");
Config config = ConfigUtils.loadConfig(configUrl, new OTFVisConfigGroup(), new MultiModeDrtConfigGroup(DrtWithExtensionsConfigGroup::new), new DvrpConfigGroup());
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/dashboards/DashboardTests.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/dashboards/DashboardTests.java
index c26a623fec8..78e7ccbeb5e 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/dashboards/DashboardTests.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/dashboards/DashboardTests.java
@@ -1,8 +1,8 @@
package org.matsim.contrib.drt.extension.dashboards;
import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.application.MATSimApplication;
import org.matsim.contrib.drt.extension.DrtTestScenario;
import org.matsim.contrib.drt.run.DrtConfigGroup;
@@ -17,8 +17,8 @@
public class DashboardTests {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
private void run() {
@@ -45,7 +45,7 @@ private void run() {
}
@Test
- public void drtDefaults() {
+ void drtDefaults() {
run();
// TODO: add test headers!?
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/edrt/run/RunEDrtScenarioIT.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/edrt/run/RunEDrtScenarioIT.java
index 3a3471007fd..051867cb5f8 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/edrt/run/RunEDrtScenarioIT.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/edrt/run/RunEDrtScenarioIT.java
@@ -18,11 +18,11 @@
package org.matsim.contrib.drt.extension.edrt.run;
-import static org.junit.Assert.assertEquals;
-
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import org.matsim.contrib.drt.prebooking.PrebookingParams;
import org.matsim.contrib.drt.prebooking.logic.ProbabilityBasedPrebookingLogic;
import org.matsim.contrib.drt.run.DrtConfigGroup;
@@ -46,13 +46,13 @@
*/
public class RunEDrtScenarioIT {
@Test
- public void test() {
+ void test() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_edrt_config.xml");
RunEDrtScenario.run(configUrl, false);
}
-
+
@Test
- public void testWithPrebooking() {
+ void testWithPrebooking() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_edrt_config.xml");
Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/estimator/MultiModaFixedDrtLegEstimatorTest.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/estimator/MultiModaFixedDrtLegEstimatorTest.java
index de1c98e62d1..5d4a8a1d5b6 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/estimator/MultiModaFixedDrtLegEstimatorTest.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/estimator/MultiModaFixedDrtLegEstimatorTest.java
@@ -1,8 +1,8 @@
package org.matsim.contrib.drt.extension.estimator;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.application.MATSimApplication;
import org.matsim.contrib.drt.extension.DrtTestScenario;
import org.matsim.contrib.drt.extension.estimator.impl.ConstantDrtEstimator;
@@ -27,8 +27,8 @@
public class MultiModaFixedDrtLegEstimatorTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
private Controler controler;
@@ -67,7 +67,7 @@ private static void prepare(Config config) {
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Config config = DrtTestScenario.loadConfig(utils);
@@ -78,7 +78,7 @@ public void setUp() throws Exception {
}
@Test
- public void run() {
+ void run() {
String out = utils.getOutputDirectory();
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/estimator/MultiModalDrtLegEstimatorTest.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/estimator/MultiModalDrtLegEstimatorTest.java
index 8d61ef68123..90601b72b29 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/estimator/MultiModalDrtLegEstimatorTest.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/estimator/MultiModalDrtLegEstimatorTest.java
@@ -1,8 +1,8 @@
package org.matsim.contrib.drt.extension.estimator;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.application.MATSimApplication;
import org.matsim.contrib.drt.extension.DrtTestScenario;
import org.matsim.contrib.drt.extension.estimator.run.DrtEstimatorConfigGroup;
@@ -26,12 +26,12 @@
public class MultiModalDrtLegEstimatorTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
private Controler controler;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
Config config = DrtTestScenario.loadConfig(utils);
@@ -75,7 +75,7 @@ private static void prepare(Config config) {
}
@Test
- public void run() {
+ void run() {
String out = utils.getOutputDirectory();
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/fiss/RunFissDrtScenarioIT.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/fiss/RunFissDrtScenarioIT.java
index c5ea83cbce9..6034419d22e 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/fiss/RunFissDrtScenarioIT.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/fiss/RunFissDrtScenarioIT.java
@@ -1,7 +1,7 @@
package org.matsim.contrib.drt.extension.fiss;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.TransportMode;
import org.matsim.api.core.v01.events.LinkLeaveEvent;
import org.matsim.api.core.v01.events.handler.LinkLeaveEventHandler;
@@ -37,7 +37,7 @@
public class RunFissDrtScenarioIT {
@Test
- public void test() {
+ void test() {
MultiModeDrtConfigGroup multiModeDrtConfigGroup = new MultiModeDrtConfigGroup(DrtWithOperationsConfigGroup::new);
@@ -173,7 +173,7 @@ public void install() {
}
run.run();
- Assert.assertEquals(23817, linkCounter.getLinkLeaveCount());
+ Assertions.assertEquals(23817, linkCounter.getLinkLeaveCount());
}
static class LinkCounter implements LinkLeaveEventHandler {
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/insertion/DrtInsertionExtensionIT.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/insertion/DrtInsertionExtensionIT.java
index 001bae2a1e7..69febd3aab0 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/insertion/DrtInsertionExtensionIT.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/insertion/DrtInsertionExtensionIT.java
@@ -1,7 +1,7 @@
package org.matsim.contrib.drt.extension.insertion;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.net.URL;
import java.util.ArrayList;
@@ -9,8 +9,8 @@
import java.util.List;
import java.util.Set;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.IdMap;
import org.matsim.api.core.v01.IdSet;
@@ -52,8 +52,8 @@
import org.matsim.vis.otfvis.OTFVisConfigGroup;
public class DrtInsertionExtensionIT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
private Controler createController() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_drt_config.xml");
@@ -68,7 +68,7 @@ private Controler createController() {
}
@Test
- public void testExclusivityContraint() {
+ void testExclusivityContraint() {
IdSet exclusiveRequestIds = new IdSet<>(Request.class);
for (int i = 100; i <= 200; i++) {
@@ -173,7 +173,7 @@ public void install() {
}
@Test
- public void testSkillsConstraint() {
+ void testSkillsConstraint() {
IdSet restrictedRequestIds = new IdSet<>(Request.class);
for (int i = 100; i <= 200; i++) {
restrictedRequestIds.add(Id.create("drt_" + i, Request.class));
@@ -239,7 +239,7 @@ public void install() {
}
@Test
- public void testRangeConstraint() {
+ void testRangeConstraint() {
Controler controller = createController();
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
@@ -259,7 +259,7 @@ public void testRangeConstraint() {
}
@Test
- public void testRangeConstraintWithCustomInstances() {
+ void testRangeConstraintWithCustomInstances() {
Controler controller = createController();
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
@@ -287,7 +287,7 @@ public void testRangeConstraintWithCustomInstances() {
}
@Test
- public void testRangeConstraintWithCustomInjection() {
+ void testRangeConstraintWithCustomInjection() {
Controler controller = createController();
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
@@ -365,7 +365,7 @@ public void install() {
}
@Test
- public void testCustomConstraint() {
+ void testCustomConstraint() {
Controler controller = createController();
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
@@ -409,7 +409,7 @@ public void install() {
}
@Test
- public void testDefaults() {
+ void testDefaults() {
Controler controller = createController();
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
@@ -428,7 +428,7 @@ public void testDefaults() {
}
@Test
- public void testVehicleActiveTimeObjective() {
+ void testVehicleActiveTimeObjective() {
Controler controller = createController();
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
@@ -449,7 +449,7 @@ public void testVehicleActiveTimeObjective() {
}
@Test
- public void testVehicleDistanceObjective() {
+ void testVehicleDistanceObjective() {
Controler controller = createController();
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
@@ -470,7 +470,7 @@ public void testVehicleDistanceObjective() {
}
@Test
- public void testPassengerPassengerDelayObjective() {
+ void testPassengerPassengerDelayObjective() {
Controler controller = createController();
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/eshifts/run/RunEShiftDrtScenarioIT.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/eshifts/run/RunEShiftDrtScenarioIT.java
index 4abe57ba415..05e08557722 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/eshifts/run/RunEShiftDrtScenarioIT.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/eshifts/run/RunEShiftDrtScenarioIT.java
@@ -1,6 +1,6 @@
package org.matsim.contrib.drt.extension.operations.eshifts.run;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.TransportMode;
import org.matsim.contrib.drt.analysis.zonal.DrtZonalSystemParams;
import org.matsim.contrib.drt.extension.operations.DrtOperationsParams;
@@ -38,7 +38,7 @@ public class RunEShiftDrtScenarioIT {
private static final double TEMPERATURE = 20;// oC
@Test
- public void test() {
+ void test() {
MultiModeDrtConfigGroup multiModeDrtConfigGroup = new MultiModeDrtConfigGroup(DrtWithOperationsConfigGroup::new);
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/operationFacilities/OperationFacilitiesIOTest.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/operationFacilities/OperationFacilitiesIOTest.java
index d1e2e231a43..06bcd185b89 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/operationFacilities/OperationFacilitiesIOTest.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/operationFacilities/OperationFacilitiesIOTest.java
@@ -1,8 +1,8 @@
package org.matsim.contrib.drt.extension.operations.operationFacilities;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
@@ -13,11 +13,11 @@
public class OperationFacilitiesIOTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ public MatsimTestUtils utils = new MatsimTestUtils();
- @Test
- public void test() {
+ @Test
+ void test() {
OperationFacilitiesSpecification operationFacilities = new OperationFacilitiesSpecificationImpl();
@@ -58,12 +58,12 @@ public void test() {
Id charger = Id.create(i, Charger.class);
Id charger2 = Id.create(i+"_2", Charger.class);
final OperationFacilitySpecification facility = copy.getOperationFacilitySpecifications().get(id);
- Assert.assertEquals(linkId.toString(), facility.getLinkId().toString());
- Assert.assertEquals(coord.getX(), facility.getCoord().getX(), 0);
- Assert.assertEquals(coord.getY(), facility.getCoord().getY(), 0);
- Assert.assertEquals(capacity, facility.getCapacity());
- Assert.assertEquals(charger.toString(), facility.getChargers().get(0).toString());
- Assert.assertEquals(charger2.toString(), facility.getChargers().get(1).toString());
+ Assertions.assertEquals(linkId.toString(), facility.getLinkId().toString());
+ Assertions.assertEquals(coord.getX(), facility.getCoord().getX(), 0);
+ Assertions.assertEquals(coord.getY(), facility.getCoord().getY(), 0);
+ Assertions.assertEquals(capacity, facility.getCapacity());
+ Assertions.assertEquals(charger.toString(), facility.getChargers().get(0).toString());
+ Assertions.assertEquals(charger2.toString(), facility.getChargers().get(1).toString());
}
for (int i = 10; i < 20; i++) {
@@ -73,11 +73,11 @@ public void test() {
int capacity = i;
Id charger = Id.create(i, Charger.class);
final OperationFacilitySpecification facility = copy.getOperationFacilitySpecifications().get(id);
- Assert.assertEquals(linkId.toString(), facility.getLinkId().toString());
- Assert.assertEquals(coord.getX(), facility.getCoord().getX(), 0);
- Assert.assertEquals(coord.getY(), facility.getCoord().getY(), 0);
- Assert.assertEquals(capacity, facility.getCapacity());
- Assert.assertEquals(charger.toString(), facility.getChargers().get(0).toString());
+ Assertions.assertEquals(linkId.toString(), facility.getLinkId().toString());
+ Assertions.assertEquals(coord.getX(), facility.getCoord().getX(), 0);
+ Assertions.assertEquals(coord.getY(), facility.getCoord().getY(), 0);
+ Assertions.assertEquals(capacity, facility.getCapacity());
+ Assertions.assertEquals(charger.toString(), facility.getChargers().get(0).toString());
}
}
}
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/ShiftsIOTest.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/ShiftsIOTest.java
index 37a86a85098..ff5eb57ecdc 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/ShiftsIOTest.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/ShiftsIOTest.java
@@ -1,12 +1,12 @@
package org.matsim.contrib.drt.extension.operations.shifts;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.io.File;
import java.util.Optional;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacility;
import org.matsim.contrib.drt.extension.operations.shifts.io.DrtShiftsReader;
@@ -22,8 +22,8 @@
*/
public class ShiftsIOTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
private static final String TESTSHIFTSINPUT = "testShifts.xml";
@@ -36,7 +36,8 @@ public class ShiftsIOTest {
private final Id oid2 = Id.create("op2", OperationFacility.class);
- @Test public void testBasicReaderWriter() {
+ @Test
+ void testBasicReaderWriter() {
DrtShiftsSpecification shiftsSpecification = new DrtShiftsSpecificationImpl();
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/efficiency/ShiftEfficiencyTest.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/efficiency/ShiftEfficiencyTest.java
index e40e1331388..b3e8db5e38d 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/efficiency/ShiftEfficiencyTest.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/analysis/efficiency/ShiftEfficiencyTest.java
@@ -9,8 +9,8 @@
package org.matsim.contrib.drt.extension.operations.shifts.analysis.efficiency;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.events.PersonMoneyEvent;
import org.matsim.api.core.v01.network.Link;
@@ -38,7 +38,7 @@ public class ShiftEfficiencyTest {
* Test method for {@link ShiftEfficiencyTracker}.
*/
@Test
- public void testDrtShiftEfficiency() {
+ void testDrtShiftEfficiency() {
EventsManager events = new EventsManagerImpl();
ShiftEfficiencyTracker shiftEfficiencyTracker = new ShiftEfficiencyTracker();
@@ -53,7 +53,7 @@ public void testDrtShiftEfficiency() {
events.processEvent(new DrtShiftStartedEvent(10 * 3600, shift1, vehicle1, link1)
);
// should throw because vehicle is already registered with another shift
- Assert.assertThrows(RuntimeException.class, () -> {
+ Assertions.assertThrows(RuntimeException.class, () -> {
events.processEvent(new DrtShiftStartedEvent(10 * 3600, shift1, vehicle1, link1));
});
@@ -62,14 +62,14 @@ public void testDrtShiftEfficiency() {
events.processEvent(new PassengerDroppedOffEvent(11 * 3600, "drt",
request1, person1, vehicle1));
- Assert.assertTrue(shiftEfficiencyTracker.getCurrentRecord().getRequestsByShift().get(shift1).contains(request1));
+ Assertions.assertTrue(shiftEfficiencyTracker.getCurrentRecord().getRequestsByShift().get(shift1).contains(request1));
events.processEvent(new PersonMoneyEvent(11 * 3600, person1, -FARE,
DrtFareHandler.PERSON_MONEY_EVENT_PURPOSE_DRT_FARE, "drt", request1.toString()));
- Assert.assertEquals(FARE, shiftEfficiencyTracker.getCurrentRecord().getRevenueByShift().get(shift1), MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(FARE, shiftEfficiencyTracker.getCurrentRecord().getRevenueByShift().get(shift1), MatsimTestUtils.EPSILON);
- Assert.assertFalse(shiftEfficiencyTracker.getCurrentRecord().getFinishedShifts().containsKey(shift1));
+ Assertions.assertFalse(shiftEfficiencyTracker.getCurrentRecord().getFinishedShifts().containsKey(shift1));
events.processEvent(new DrtShiftEndedEvent(20 * 3600, shift1, vehicle1, link1, operationFacility1));
- Assert.assertTrue(shiftEfficiencyTracker.getCurrentRecord().getFinishedShifts().containsKey(shift1));
+ Assertions.assertTrue(shiftEfficiencyTracker.getCurrentRecord().getFinishedShifts().containsKey(shift1));
}
}
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunMultiHubShiftDrtScenarioIT.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunMultiHubShiftDrtScenarioIT.java
index 91c2dd16be9..5b3f79ea7dd 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunMultiHubShiftDrtScenarioIT.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunMultiHubShiftDrtScenarioIT.java
@@ -1,6 +1,6 @@
package org.matsim.contrib.drt.extension.operations.shifts.run;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.TransportMode;
import org.matsim.contrib.drt.analysis.zonal.DrtZonalSystemParams;
import org.matsim.contrib.drt.extension.operations.DrtOperationsControlerCreator;
@@ -29,7 +29,7 @@
public class RunMultiHubShiftDrtScenarioIT {
@Test
- public void test() {
+ void test() {
MultiModeDrtConfigGroup multiModeDrtConfigGroup = new MultiModeDrtConfigGroup(DrtWithOperationsConfigGroup::new);
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunShiftDrtScenarioIT.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunShiftDrtScenarioIT.java
index e6b9caf51af..28034b937c6 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunShiftDrtScenarioIT.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/operations/shifts/run/RunShiftDrtScenarioIT.java
@@ -1,6 +1,6 @@
package org.matsim.contrib.drt.extension.operations.shifts.run;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.TransportMode;
import org.matsim.contrib.drt.analysis.zonal.DrtZonalSystemParams;
import org.matsim.contrib.drt.extension.operations.DrtOperationsControlerCreator;
@@ -30,7 +30,7 @@
public class RunShiftDrtScenarioIT {
@Test
- public void test() {
+ void test() {
MultiModeDrtConfigGroup multiModeDrtConfigGroup = new MultiModeDrtConfigGroup(DrtWithOperationsConfigGroup::new);
diff --git a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/preplanned/optimizer/RunPreplannedDrtExampleIT.java b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/preplanned/optimizer/RunPreplannedDrtExampleIT.java
index cd0b743f9f2..e5477142a92 100644
--- a/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/preplanned/optimizer/RunPreplannedDrtExampleIT.java
+++ b/contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/preplanned/optimizer/RunPreplannedDrtExampleIT.java
@@ -29,7 +29,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.drt.extension.preplanned.optimizer.PreplannedDrtOptimizer.PreplannedRequestKey;
import org.matsim.contrib.drt.extension.preplanned.optimizer.PreplannedDrtOptimizer.PreplannedSchedules;
@@ -43,7 +43,7 @@
*/
public class RunPreplannedDrtExampleIT {
@Test
- public void testRun() {
+ void testRun() {
// scenario with 1 shared taxi (max 2 pax) and 10 requests
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"), "one_shared_taxi_config.xml");
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtAnalysisControlerListener.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtAnalysisControlerListener.java
index 1f33b8cf008..399804f9aee 100644
--- a/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtAnalysisControlerListener.java
+++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtAnalysisControlerListener.java
@@ -160,7 +160,8 @@ private static List newDrtLegs(EventSequence sequence, Function
@Override
public void notifyIterationEnds(IterationEndsEvent event) {
- boolean createGraphs = event.getServices().getConfig().controller().isCreateGraphs();
+ int createGraphsInterval = event.getServices().getConfig().controller().getCreateGraphsInterval();
+ boolean createGraphs = createGraphsInterval >0 && event.getIteration() % createGraphsInterval == 0;
writeAndPlotWaitTimeEstimateComparison(drtEventSequenceCollector.getPerformedRequestSequences().values(),
filename(event, "waitTimeComparison", ".png"), filename(event, "waitTimeComparison", ".csv"), createGraphs);
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java
index e362e4d4935..67d38dad708 100644
--- a/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java
+++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java
@@ -34,6 +34,7 @@
import org.matsim.contrib.drt.schedule.DrtDriveTask;
import org.matsim.contrib.drt.schedule.DrtStayTask;
import org.matsim.contrib.drt.scheduler.EmptyVehicleRelocator;
+import org.matsim.contrib.drt.sharingmetrics.SharingMetricsModule;
import org.matsim.contrib.dvrp.analysis.ExecutedScheduleCollector;
import org.matsim.contrib.dvrp.fleet.FleetSpecification;
import org.matsim.contrib.dvrp.run.AbstractDvrpModeModule;
@@ -136,5 +137,7 @@ public void install() {
getter.getModal(DrtVehicleDistanceStats.class), getter.get(MatsimServices.class), getter.get(Network.class),
getter.getModal(DrtEventSequenceCollector.class), getter.getModal(VehicleOccupancyProfileCalculator.class))))
.asEagerSingleton();
+
+ install(new SharingMetricsModule(drtCfg));
}
}
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactory.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactory.java
index b7ee95be265..389094b222a 100644
--- a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactory.java
+++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactory.java
@@ -21,6 +21,7 @@
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
import org.matsim.contrib.dvrp.path.VrpPathWithTravelData;
+import org.matsim.contrib.dvrp.schedule.DefaultStayTask;
/**
* @author michalm
@@ -31,4 +32,6 @@ public interface DrtTaskFactory {
DrtStopTask createStopTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link);
DrtStayTask createStayTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link);
+
+ DefaultStayTask createInitialTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link);
}
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactoryImpl.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactoryImpl.java
index adb65f2d780..de227a74da4 100644
--- a/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactoryImpl.java
+++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/schedule/DrtTaskFactoryImpl.java
@@ -21,6 +21,7 @@
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
import org.matsim.contrib.dvrp.path.VrpPathWithTravelData;
+import org.matsim.contrib.dvrp.schedule.DefaultStayTask;
/**
* @author michalm
@@ -40,4 +41,9 @@ public DrtStopTask createStopTask(DvrpVehicle vehicle, double beginTime, double
public DrtStayTask createStayTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
return new DrtStayTask(beginTime, endTime, link);
}
+
+ @Override
+ public DefaultStayTask createInitialTask(DvrpVehicle vehicle, double beginTime, double endTime, Link link) {
+ return createStayTask(vehicle, beginTime, endTime ,link);
+ }
}
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/scheduler/DefaultRequestInsertionScheduler.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/scheduler/DefaultRequestInsertionScheduler.java
index 32929a39984..a8551b6ab9b 100644
--- a/contribs/drt/src/main/java/org/matsim/contrib/drt/scheduler/DefaultRequestInsertionScheduler.java
+++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/scheduler/DefaultRequestInsertionScheduler.java
@@ -80,7 +80,7 @@ public DefaultRequestInsertionScheduler(Fleet fleet, MobsimTimer timer,
private void initSchedules(Fleet fleet) {
for (DvrpVehicle veh : fleet.getVehicles().values()) {
veh.getSchedule()
- .addTask(taskFactory.createStayTask(veh, veh.getServiceBeginTime(), veh.getServiceEndTime(),
+ .addTask(taskFactory.createInitialTask(veh, veh.getServiceBeginTime(), veh.getServiceEndTime(),
veh.getStartLink()));
}
}
@@ -94,21 +94,21 @@ public PickupDropoffTaskPair scheduleRequest(AcceptedDrtRequest request, Inserti
var dropoffTask = insertDropoff(request, insertion, pickupTask);
verifyTimes("Inconsistent dropoff arrival time", insertion.detourTimeInfo.dropoffDetourInfo.arrivalTime,
dropoffTask.getBeginTime());
-
+
verifyTaskContinuity(insertion);
verifyConstraints(insertion);
verifyStructure(insertion.insertion.vehicleEntry.vehicle.getSchedule());
-
+
return new PickupDropoffTaskPair(pickupTask, dropoffTask);
}
-
+
private void verifyTaskContinuity(InsertionWithDetourData insertion) {
/*
* During insertion of tasks the common sanity checks that happen when appending
* to the schedule (next start time = previous end time) are not evaluated. This
* method verifies that the timing remains intact after insertion.
*/
-
+
Schedule schedule = insertion.insertion.vehicleEntry.vehicle.getSchedule();
for (int i = 1; i < schedule.getTaskCount(); i++) {
Task first = schedule.getTasks().get(i - 1);
@@ -116,9 +116,9 @@ private void verifyTaskContinuity(InsertionWithDetourData insertion) {
Verify.verify(first.getEndTime() == second.getBeginTime());
}
}
-
+
private final boolean verifyConstraints = false;
-
+
private void verifyConstraints(InsertionWithDetourData insertion) {
/*
* Verifies that no request constraints are violated after scheduling. This
@@ -142,7 +142,7 @@ private void verifyConstraints(InsertionWithDetourData insertion) {
}
}
}
-
+
private void verifyStructure(Schedule schedule) {
boolean previousDrive = false;
@@ -191,7 +191,7 @@ private DrtStopTask insertPickup(AcceptedDrtRequest request, InsertionWithDetour
beforePickupTask = currentTask;
VrpPathWithTravelData vrpPath = VrpPaths.createPath(vehicleEntry.start.link, request.getFromLink(),
vehicleEntry.start.time, detourData.detourToPickup, travelTime);
-
+
if (vrpPath.getArrivalTime() < request.getEarliestStartTime() && scheduleWaitBeforeDrive) {
// prebooking case: we need to wait right now
((OnlineDriveTaskTracker)beforePickupTask.getTaskTracker()).divertPath(VrpPaths.createZeroLengthPathForDiversion(diversion));
@@ -229,14 +229,14 @@ private DrtStopTask insertPickup(AcceptedDrtRequest request, InsertionWithDetour
} else {
stopTask = stops.get(pickupIdx - 1).task; // future stop task
}
-
+
boolean canMergePickup = stopTask != null && request.getFromLink() == stopTask.getLink()
&& stopTask.getEndTime() >= request.getEarliestStartTime();
-
+
if (canMergePickup) { // no detour; no new stop task
// add pickup request to stop task
stopTask.addPickupRequest(request);
-
+
// potentially extend task
stopTask.setEndTime(stopTimeCalculator.updateEndTimeForPickup(vehicleEntry.vehicle, stopTask,
now, request.getRequest()));
@@ -280,7 +280,7 @@ private DrtStopTask insertPickup(AcceptedDrtRequest request, InsertionWithDetour
if (request.getFromLink() == stayOrStopTask.getLink()) {
// the bus stays where it is
beforePickupTask = stayOrStopTask;
-
+
// prebooking: but we may want to wait a bit if next stop is in a while
beforePickupTask = insertWait(vehicleEntry.vehicle, beforePickupTask, request.getEarliestStartTime());
} else {// add drive task to pickup location
@@ -304,7 +304,7 @@ private DrtStopTask insertPickup(AcceptedDrtRequest request, InsertionWithDetour
// add drive from pickup
Link toLink = pickupIdx == dropoffIdx ? request.getToLink() // pickup->dropoff
: stops.get(pickupIdx).task.getLink(); // pickup->i+1
-
+
double nextBeginTime = pickupIdx == dropoffIdx ? //
pickupStopTask.getEndTime() : // asap
stops.get(pickupIdx).task.getBeginTime(); // as planned
@@ -312,13 +312,13 @@ private DrtStopTask insertPickup(AcceptedDrtRequest request, InsertionWithDetour
if (request.getFromLink() == toLink) {
// prebooking case when we are already at the stop location, but next stop task happens in the future
Task afterPickupTask = insertWait(vehicleEntry.vehicle, pickupStopTask, nextBeginTime);
-
+
scheduleTimingUpdater.updateTimingsStartingFromTaskIdx(vehicleEntry.vehicle, afterPickupTask.getTaskIdx() + 1,
afterPickupTask.getEndTime());
} else {
VrpPathWithTravelData vrpPath = VrpPaths.createPath(request.getFromLink(), toLink, pickupStopTask.getEndTime(),
detourData.detourFromPickup, travelTime);
-
+
// may want to wait now or before next stop task
Task afterPickupTask = insertDriveWithWait(vehicleEntry.vehicle, pickupStopTask, vrpPath, nextBeginTime);
@@ -327,7 +327,7 @@ private DrtStopTask insertPickup(AcceptedDrtRequest request, InsertionWithDetour
scheduleTimingUpdater.updateTimingsStartingFromTaskIdx(vehicleEntry.vehicle, afterPickupTask.getTaskIdx() + 1,
afterPickupTask.getEndTime());
}
-
+
return pickupStopTask;
}
@@ -404,7 +404,7 @@ private DrtStopTask insertDropoff(AcceptedDrtRequest request, InsertionWithDetou
VrpPathWithTravelData vrpPath = VrpPaths.createPath(request.getToLink(), toLink, dropoffStopTask.getEndTime(),
detourData.detourFromDropoff, travelTime);
-
+
if (toLink == request.getToLink()) {
// prebooking case: we stay, but may add some wait time until the next stop
Task afterDropoffTask = insertWait(vehicleEntry.vehicle, dropoffStopTask,
@@ -423,22 +423,22 @@ private DrtStopTask insertDropoff(AcceptedDrtRequest request, InsertionWithDetou
}
return dropoffStopTask;
}
-
+
/**
* Removes drive and wait tasks between the startTask and the endTask
*/
private void removeBetween(Schedule schedule, Task startTask, Task endTask) {
Verify.verify(endTask.getTaskIdx() >= startTask.getTaskIdx());
Verify.verify(endTask.getTaskIdx() <= startTask.getTaskIdx() + 3);
-
+
int waitCount = 0;
int driveCount = 0;
-
+
int removeCount = endTask.getTaskIdx() - startTask.getTaskIdx() - 1;
for (int k = 0; k < removeCount; k++) {
Task task = schedule.getTasks().get(startTask.getTaskIdx() + 1);
-
+
if (DrtTaskBaseType.DRIVE.isBaseTypeOf(task.getTaskType())) {
driveCount++;
} else if (DrtStayTask.TYPE.equals(task.getTaskType())) {
@@ -446,17 +446,17 @@ private void removeBetween(Schedule schedule, Task startTask, Task endTask) {
} else {
throw new IllegalStateException("Invalid schedule structure: expected WAIT or DRIVE task");
}
-
+
schedule.removeTask(task);
}
-
+
Verify.verify(waitCount <= 1);
Verify.verify(driveCount <= 1);
}
-
+
private Task insertWait(DvrpVehicle vehicle, Task departureTask, double earliestNextStartTime) {
Schedule schedule = vehicle.getSchedule();
-
+
final Link waitLink;
if (departureTask instanceof StayTask) {
waitLink = ((StayTask) departureTask).getLink();
@@ -465,39 +465,39 @@ private Task insertWait(DvrpVehicle vehicle, Task departureTask, double earliest
} else {
throw new IllegalStateException();
}
-
+
if (departureTask.getEndTime() < earliestNextStartTime) {
DrtStayTask waitTask = taskFactory.createStayTask(vehicle, departureTask.getEndTime(),
earliestNextStartTime, waitLink);
schedule.addTask(departureTask.getTaskIdx() + 1, waitTask);
return waitTask;
}
-
+
return departureTask;
}
-
+
private Task insertDriveWithWait(DvrpVehicle vehicle, Task departureTask, VrpPathWithTravelData path, double latestArrivalTime) {
Schedule schedule = vehicle.getSchedule();
-
+
Task leadingTask = departureTask;
-
+
if (scheduleWaitBeforeDrive) {
double driveDepartureTime = latestArrivalTime - path.getTravelTime();
-
+
if (driveDepartureTime > departureTask.getEndTime()) {
// makes sense to insert a wait task before departure
DrtStayTask waitTask = taskFactory.createStayTask(vehicle, departureTask.getEndTime(),
driveDepartureTime, path.getFromLink());
schedule.addTask(departureTask.getTaskIdx() + 1, waitTask);
-
+
path = path.withDepartureTime(driveDepartureTime);
leadingTask = waitTask;
}
}
-
+
Task driveTask = taskFactory.createDriveTask(vehicle, path, DrtDriveTask.TYPE);
schedule.addTask(leadingTask.getTaskIdx() + 1, driveTask);
-
+
if (driveTask.getEndTime() < latestArrivalTime) {
DrtStayTask waitTask = taskFactory.createStayTask(vehicle, driveTask.getEndTime(), latestArrivalTime,
path.getToLink());
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsControlerListener.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsControlerListener.java
new file mode 100644
index 00000000000..9884fce28cc
--- /dev/null
+++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsControlerListener.java
@@ -0,0 +1,145 @@
+package org.matsim.contrib.drt.sharingmetrics;
+
+import com.google.inject.Inject;
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartUtils;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.renderer.category.BoxAndWhiskerRenderer;
+import org.jfree.data.statistics.DefaultBoxAndWhiskerCategoryDataset;
+import org.matsim.api.core.v01.Id;
+import org.matsim.contrib.drt.run.DrtConfigGroup;
+import org.matsim.contrib.dvrp.optimizer.Request;
+import org.matsim.core.config.Config;
+import org.matsim.core.controler.MatsimServices;
+import org.matsim.core.controler.events.IterationEndsEvent;
+import org.matsim.core.controler.listener.IterationEndsListener;
+import org.matsim.core.utils.io.IOUtils;
+
+import java.io.BufferedWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * @author nkuehnel / MOIA
+ */
+public class SharingMetricsControlerListener implements IterationEndsListener {
+ private final MatsimServices matsimServices;
+
+ private final DrtConfigGroup drtConfigGroup;
+ private final SharingMetricsTracker sharingFactorTracker;
+
+ private boolean headerWritten = false;
+
+ private final String runId;
+
+ private final String delimiter;
+
+ private static final String notAvailableString = "NA";
+
+
+ @Inject
+ public SharingMetricsControlerListener(Config config,
+ DrtConfigGroup drtConfigGroup,
+ SharingMetricsTracker sharingFactorTracker,
+ MatsimServices matsimServices) {
+ this.drtConfigGroup = drtConfigGroup;
+ this.sharingFactorTracker = sharingFactorTracker;
+ this.matsimServices = matsimServices;
+ runId = Optional.ofNullable(config.controller().getRunId()).orElse(notAvailableString);
+ this.delimiter = config.global().getDefaultDelimiter();
+
+ }
+
+ @Override
+ public void notifyIterationEnds(IterationEndsEvent event) {
+ int createGraphsInterval = event.getServices().getConfig().controller().getCreateGraphsInterval();
+ boolean createGraphs = createGraphsInterval >0 && event.getIteration() % createGraphsInterval == 0;
+
+ Map, Double> sharingFactors = sharingFactorTracker.getSharingFactors();
+ Map, Boolean> poolingRates = sharingFactorTracker.getPoolingRates();
+
+ writeAndPlotSharingMetrics(
+ sharingFactors,
+ poolingRates,
+ filename(event, "sharingFactors", ".png"),
+ filename(event, "poolingRates", ".png"),
+ filename(event, "sharingMetrics", ".csv"),
+ createGraphs);
+
+ double nPooled = poolingRates.values().stream().filter(b -> b).count();
+ double nTotal = poolingRates.values().size();
+ double meanPoolingRate = nPooled / nTotal;
+ double meanSharingFactor = sharingFactors.values().stream().mapToDouble(d -> d).average().orElse(Double.NaN);
+
+ writeIterationPoolingStats(meanPoolingRate + delimiter + meanSharingFactor + delimiter + nPooled +delimiter + nTotal, event.getIteration());
+ }
+
+ private void writeAndPlotSharingMetrics(Map, Double> sharingFactorByRequest,
+ Map, Boolean> rates,
+ String sharingFactors,
+ String poolingRates,
+ String csvFile,
+ boolean createGraphs) {
+ try (var bw = IOUtils.getBufferedWriter(csvFile)) {
+ bw.append(line("Request", "SharingFactor", "Pooled"));
+
+ for (Map.Entry, Double> sharingFactorEntry : sharingFactorByRequest.entrySet()) {
+ bw.append(line(sharingFactorEntry.getKey(), sharingFactorEntry.getValue(),rates.get(sharingFactorEntry.getKey())));
+ }
+ bw.flush();
+
+ if (createGraphs) {
+ final DefaultBoxAndWhiskerCategoryDataset sharingFactorDataset
+ = new DefaultBoxAndWhiskerCategoryDataset();
+
+ final DefaultBoxAndWhiskerCategoryDataset poolingRateDataset
+ = new DefaultBoxAndWhiskerCategoryDataset();
+
+ sharingFactorDataset.add(sharingFactorByRequest.values().stream().toList(), "", "");
+ poolingRateDataset.add(rates.values().stream().toList(), "", "");
+
+ JFreeChart chartRides = ChartFactory.createBoxAndWhiskerChart("Sharing factor", "", "Factor", sharingFactorDataset, false);
+ JFreeChart chartPooling = ChartFactory.createBoxAndWhiskerChart("Pooling rate", "", "Rate", poolingRateDataset, false);
+
+ ((BoxAndWhiskerRenderer) chartRides.getCategoryPlot().getRenderer()).setMeanVisible(true);
+ ((BoxAndWhiskerRenderer) chartPooling.getCategoryPlot().getRenderer()).setMeanVisible(true);
+ ChartUtils.writeChartAsPNG(new FileOutputStream(sharingFactors), chartRides, 1500, 1500);
+ ChartUtils.writeChartAsPNG(new FileOutputStream(poolingRates), chartPooling, 1500, 1500);
+ }
+ } catch (
+ IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private String filename(IterationEndsEvent event, String prefix, String extension) {
+ return matsimServices.getControlerIO()
+ .getIterationFilename(event.getIteration(), prefix + "_" + drtConfigGroup.getMode() + extension);
+ }
+
+ private String line(Object... cells) {
+ return Arrays.stream(cells).map(Object::toString).collect(Collectors.joining(delimiter, "", "\n"));
+ }
+
+
+ private void writeIterationPoolingStats(String summarizePooling, int it) {
+ try (var bw = getAppendingBufferedWriter("drt_sharing_metrics", ".csv")) {
+ if (!headerWritten) {
+ headerWritten = true;
+ bw.write(line("runId", "iteration", "poolingRate", "sharingFactor", "nPooled", "nTotal"));
+ }
+ bw.write(runId + delimiter + it + delimiter + summarizePooling);
+ bw.newLine();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private BufferedWriter getAppendingBufferedWriter(String prefix, String extension) {
+ return IOUtils.getAppendingBufferedWriter(matsimServices.getControlerIO().getOutputFilename(prefix + "_" + drtConfigGroup.getMode() + extension));
+ }
+}
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsModule.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsModule.java
new file mode 100644
index 00000000000..2ebe3777ac1
--- /dev/null
+++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsModule.java
@@ -0,0 +1,33 @@
+package org.matsim.contrib.drt.sharingmetrics;
+
+import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.population.Person;
+import org.matsim.contrib.drt.run.DrtConfigGroup;
+import org.matsim.contrib.dvrp.run.AbstractDvrpModeModule;
+import org.matsim.core.controler.MatsimServices;
+
+/**
+ * @author nkuehnel / MOIA
+ */
+public class SharingMetricsModule extends AbstractDvrpModeModule {
+
+ private final DrtConfigGroup drtConfigGroup;
+
+ public SharingMetricsModule(DrtConfigGroup drtConfigGroup) {
+ super(drtConfigGroup.getMode());
+ this.drtConfigGroup = drtConfigGroup;
+ }
+
+ @Override
+ public void install() {
+ bindModal(SharingMetricsTracker.class).toProvider(modalProvider(getter ->
+ new SharingMetricsTracker(personId -> true))).asEagerSingleton();
+ addEventHandlerBinding().to(modalKey(SharingMetricsTracker.class));
+ bindModal(SharingMetricsControlerListener.class).toProvider(modalProvider(getter ->
+ new SharingMetricsControlerListener(getConfig(), drtConfigGroup,
+ getter.getModal(SharingMetricsTracker.class),
+ getter.get(MatsimServices.class))
+ ));
+ addControlerListenerBinding().to(modalKey(SharingMetricsControlerListener.class));
+ }
+}
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsTracker.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsTracker.java
new file mode 100644
index 00000000000..f5393b29144
--- /dev/null
+++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/sharingmetrics/SharingMetricsTracker.java
@@ -0,0 +1,110 @@
+package org.matsim.contrib.drt.sharingmetrics;
+
+import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.population.Person;
+import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
+import org.matsim.contrib.dvrp.optimizer.Request;
+import org.matsim.contrib.dvrp.passenger.PassengerDroppedOffEvent;
+import org.matsim.contrib.dvrp.passenger.PassengerDroppedOffEventHandler;
+import org.matsim.contrib.dvrp.passenger.PassengerPickedUpEvent;
+import org.matsim.contrib.dvrp.passenger.PassengerPickedUpEventHandler;
+import org.matsim.core.mobsim.framework.events.MobsimBeforeCleanupEvent;
+import org.matsim.core.mobsim.framework.listeners.MobsimBeforeCleanupListener;
+
+import java.util.*;
+
+/**
+ * @author nkuehnel / MOIA
+ */
+public class SharingMetricsTracker implements PassengerPickedUpEventHandler, PassengerDroppedOffEventHandler, MobsimBeforeCleanupListener {
+
+ private final GroupPredicate groupPredicate;
+
+ record Segment(double start, int occupancy) {
+ }
+
+ private final Map, List>> map = new HashMap<>();
+
+ private final Map, List> segments = new HashMap<>();
+
+ private final Map, Double> sharingFactors = new HashMap<>();
+ private final Map, Boolean> poolingRate = new HashMap<>();
+
+ public interface GroupPredicate {
+ boolean isGroupRepresentative(Id personId);
+ }
+
+ public SharingMetricsTracker(GroupPredicate groupPredicate) {
+ this.groupPredicate = groupPredicate;
+ }
+
+
+ @Override
+ public void handleEvent(PassengerDroppedOffEvent event) {
+ if (groupPredicate.isGroupRepresentative(event.getPersonId())) {
+
+ List> occupancy = map.get(event.getVehicleId());
+ occupancy.remove(event.getRequestId());
+ occupancy.forEach(p -> segments.get(p).add(new Segment(event.getTime(), occupancy.size())));
+
+
+ List finishedSegments = segments.remove(event.getRequestId());
+
+ double total = 0;
+ double portion = 0;
+
+ boolean pooled = false;
+
+ Segment last = finishedSegments.get(0);
+ if (last.occupancy > 1) {
+ pooled = true;
+ }
+ for (int i = 1; i < finishedSegments.size(); i++) {
+ Segment next = finishedSegments.get(i);
+ double duration = next.start - last.start;
+ total += duration;
+ portion += duration / last.occupancy;
+ last = next;
+ if (last.occupancy > 1) {
+ pooled = true;
+ }
+ }
+
+ double duration = event.getTime() - last.start;
+ total += duration;
+ portion += duration / last.occupancy;
+
+ double sharingFactor = total / portion;
+ sharingFactors.put(event.getRequestId(), sharingFactor);
+ poolingRate.put(event.getRequestId(), pooled);
+ }
+ }
+
+ @Override
+ public void handleEvent(PassengerPickedUpEvent event) {
+ if (groupPredicate.isGroupRepresentative(event.getPersonId())) {
+ map.computeIfAbsent(event.getVehicleId(), vehicleId -> new ArrayList<>());
+ List> occupancy = map.get(event.getVehicleId());
+ occupancy.add(event.getRequestId());
+ occupancy.forEach(
+ p -> segments.computeIfAbsent(p, requestId -> new ArrayList<>()).add(new Segment(event.getTime(), occupancy.size()))
+ );
+ }
+ }
+
+ @Override
+ public void notifyMobsimBeforeCleanup(MobsimBeforeCleanupEvent e) {
+ map.clear();
+ segments.clear();
+ poolingRate.clear();
+ sharingFactors.clear();
+ }
+
+ public Map, Double> getSharingFactors() {
+ return Collections.unmodifiableMap(sharingFactors);
+ }
+
+ public Map, Boolean> getPoolingRates() {
+ return Collections.unmodifiableMap(poolingRate);
+ }
+}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/DrtGridUtilsTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/DrtGridUtilsTest.java
index 110d6bc9852..0d73adba5c6 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/DrtGridUtilsTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/DrtGridUtilsTest.java
@@ -4,7 +4,7 @@
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.prep.PreparedGeometry;
@@ -18,7 +18,7 @@
public class DrtGridUtilsTest {
@Test
- public void test() {
+ void test() {
Network network = createNetwork();
Map grid = DrtGridUtils.createGridFromNetwork(network, 100);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/DrtZonalSystemTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/DrtZonalSystemTest.java
index af5b0be555e..a49cc10a3d0 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/DrtZonalSystemTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/DrtZonalSystemTest.java
@@ -21,11 +21,11 @@
package org.matsim.contrib.drt.analysis.zonal;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.matsim.contrib.drt.analysis.zonal.DrtGridUtilsTest.createNetwork;
import static org.matsim.contrib.drt.analysis.zonal.DrtZonalSystem.createFromPreparedGeometries;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.Polygon;
@@ -44,21 +44,21 @@
public class DrtZonalSystemTest {
@Test
- public void test_cellSize100() {
+ void test_cellSize100() {
DrtZonalSystem drtZonalSystem = createFromPreparedGeometries(createNetwork(),
DrtGridUtils.createGridFromNetwork(createNetwork(), 100));
assertThat(drtZonalSystem.getZoneForLinkId(Id.createLinkId("ab")).getId()).isEqualTo("10");
}
@Test
- public void test_cellSize700() {
+ void test_cellSize700() {
DrtZonalSystem drtZonalSystem = createFromPreparedGeometries(createNetwork(),
DrtGridUtils.createGridFromNetwork(createNetwork(), 700));
assertThat(drtZonalSystem.getZoneForLinkId(Id.createLinkId("ab")).getId()).isEqualTo("2");
}
@Test
- public void test_gridWithinServiceArea(){
+ void test_gridWithinServiceArea(){
Coordinate min = new Coordinate(-500, 500);
Coordinate max = new Coordinate(1500, 1500);
List serviceArea = createServiceArea(min,max);
@@ -74,7 +74,7 @@ public void test_gridWithinServiceArea(){
}
@Test
- public void test_noZonesWithoutLinks(){
+ void test_noZonesWithoutLinks(){
Coordinate min = new Coordinate(1500, 1500);
Coordinate max = new Coordinate(2500, 2500);
List serviceArea = createServiceArea(min,max);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/RandomDrtZoneTargetLinkSelectorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/RandomDrtZoneTargetLinkSelectorTest.java
index 3251579a09e..fa38b72749b 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/RandomDrtZoneTargetLinkSelectorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/analysis/zonal/RandomDrtZoneTargetLinkSelectorTest.java
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.function.IntUnaryOperator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.testcases.fakes.FakeLink;
@@ -44,7 +44,7 @@ public class RandomDrtZoneTargetLinkSelectorTest {
private final Link link3 = new FakeLink(Id.createLinkId("3"));
@Test
- public void testSelectTargetLink_fourLinks() {
+ void testSelectTargetLink_fourLinks() {
DrtZone zone = DrtZone.createDummyZone("zone", List.of(link0, link1, link2, link3), null);
//fake random sequence
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/config/ConfigBehaviorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/config/ConfigBehaviorTest.java
index ff70b6e4808..003b183046c 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/config/ConfigBehaviorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/config/ConfigBehaviorTest.java
@@ -2,9 +2,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.contrib.drt.run.DrtConfigGroup;
import org.matsim.contrib.drt.run.MultiModeDrtConfigGroup;
import org.matsim.contrib.dvrp.run.DvrpConfigGroup;
@@ -16,11 +16,11 @@
public class ConfigBehaviorTest{
private static final Logger log = LogManager.getLogger(ConfigBehaviorTest.class );
- @Rule public MatsimTestUtils utils = new MatsimTestUtils() ;
+ @RegisterExtension private MatsimTestUtils utils = new MatsimTestUtils() ;
- @Test
- public final void testMaterializeAfterReadParameterSets() {
+ @Test
+ final void testMaterializeAfterReadParameterSets() {
{
// generate a test config that sets two values away from their defaults, and write it to file:
Config config = ConfigUtils.createConfig();
@@ -46,13 +46,13 @@ public final void testMaterializeAfterReadParameterSets() {
MultiModeDrtConfigGroup multiModeDrtConfigGroup = ConfigUtils.addOrGetModule( config, MultiModeDrtConfigGroup.class );
// this should have two config groups here, but does not:
- Assert.assertEquals( 2, multiModeDrtConfigGroup.getModalElements().size() );
+ Assertions.assertEquals( 2, multiModeDrtConfigGroup.getModalElements().size() );
// check if you are getting back the values from the config file:
for( DrtConfigGroup drtConfigGroup : multiModeDrtConfigGroup.getModalElements() ){
log.info( drtConfigGroup.getMode() );
if ( ! ( drtConfigGroup.getMode().equals( "drt20" ) || drtConfigGroup.getMode().equals( "drt20000" ) ) ) {
- Assert.fail();
+ Assertions.fail();
}
}
@@ -60,8 +60,8 @@ public final void testMaterializeAfterReadParameterSets() {
}
}
- @Test
- public final void testMaterializeAfterReadStandardParams() {
+ @Test
+ final void testMaterializeAfterReadStandardParams() {
{
// generate a test config that sets two values away from their defaults, and write it to file:
Config config = ConfigUtils.createConfig();
@@ -79,8 +79,8 @@ public final void testMaterializeAfterReadStandardParams() {
DvrpConfigGroup dvrpConfig = ConfigUtils.addOrGetModule( config, DvrpConfigGroup.class );
// check if you are getting back the values from the config file:
- Assert.assertEquals( 1.23, dvrpConfig.travelTimeEstimationAlpha, Double.MIN_VALUE );
- Assert.assertEquals( 4.56, dvrpConfig.travelTimeEstimationBeta, Double.MIN_VALUE );
+ Assertions.assertEquals( 1.23, dvrpConfig.travelTimeEstimationAlpha, Double.MIN_VALUE );
+ Assertions.assertEquals( 4.56, dvrpConfig.travelTimeEstimationBeta, Double.MIN_VALUE );
}
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/fare/DrtFareHandlerTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/fare/DrtFareHandlerTest.java
index e586e1a9dda..35e41f5d018 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/fare/DrtFareHandlerTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/fare/DrtFareHandlerTest.java
@@ -21,8 +21,8 @@
package org.matsim.contrib.drt.fare;
import org.apache.commons.lang3.mutable.MutableDouble;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.events.PersonMoneyEvent;
import org.matsim.api.core.v01.events.handler.PersonMoneyEventHandler;
@@ -42,7 +42,7 @@ public class DrtFareHandlerTest {
* Test method for {@link DrtFareHandler}.
*/
@Test
- public void testDrtFareHandler() {
+ void testDrtFareHandler() {
String mode = "mode_0";
DrtFareParams fareParams = new DrtFareParams();
fareParams.baseFare = 1;
@@ -77,7 +77,7 @@ public void reset(int iteration) {
events.flush();
//fare: 1 (daily fee) + 1 (distance()+ 1 basefare + 1 (time)
- Assert.assertEquals(-4.0, fare.getValue(), 0);
+ Assertions.assertEquals(-4.0, fare.getValue(), 0);
}
{
// test minFarePerTrip
@@ -91,7 +91,7 @@ public void reset(int iteration) {
* fare new trip: 0 (daily fee already paid) + 0.1 (distance)+ 1 basefare + 0.1 (time) = 1.2 < minFarePerTrip = 1.5
* --> new total fare: 4 (previous trip) + 1.5 (minFarePerTrip for new trip) = 5.5
*/
- Assert.assertEquals(-5.5, fare.getValue(), 0);
+ Assertions.assertEquals(-5.5, fare.getValue(), 0);
}
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/DrtRequestInsertionRetryQueueTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/DrtRequestInsertionRetryQueueTest.java
index 208e652d1dc..8989aa90855 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/DrtRequestInsertionRetryQueueTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/DrtRequestInsertionRetryQueueTest.java
@@ -22,7 +22,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.drt.passenger.DrtRequest;
import org.matsim.contrib.dvrp.optimizer.Request;
@@ -43,21 +43,21 @@ public class DrtRequestInsertionRetryQueueTest {
.build();
@Test
- public void maxRequestAgeZero_noRetry() {
+ void maxRequestAgeZero_noRetry() {
var queue = new DrtRequestInsertionRetryQueue(params(10, 0));
assertThat(queue.tryAddFailedRequest(request, SUBMISSION_TIME)).isFalse();
assertThat(queue.getRequestsToRetryNow(9999)).isEmpty();
}
@Test
- public void requestMaxAgeExceeded_noRetry() {
+ void requestMaxAgeExceeded_noRetry() {
var queue = new DrtRequestInsertionRetryQueue(params(2, 10));
assertThat(queue.tryAddFailedRequest(request, SUBMISSION_TIME + 10)).isFalse();
assertThat(queue.getRequestsToRetryNow(9999)).isEmpty();
}
@Test
- public void requestMaxAgeNotExceeded_retry() {
+ void requestMaxAgeNotExceeded_retry() {
var queue = new DrtRequestInsertionRetryQueue(params(2, 10));
assertThat(queue.tryAddFailedRequest(request, SUBMISSION_TIME)).isTrue();
@@ -77,7 +77,7 @@ public void requestMaxAgeNotExceeded_retry() {
}
@Test
- public void requestMaxAgeNotExceeded_lateRetry() {
+ void requestMaxAgeNotExceeded_lateRetry() {
var queue = new DrtRequestInsertionRetryQueue(params(2, 10));
assertThat(queue.tryAddFailedRequest(request, SUBMISSION_TIME)).isTrue();
@@ -91,7 +91,7 @@ public void requestMaxAgeNotExceeded_lateRetry() {
}
@Test
- public void queueOrderMaintained() {
+ void queueOrderMaintained() {
var queue = new DrtRequestInsertionRetryQueue(params(2, 10));
assertThat(queue.tryAddFailedRequest(DrtRequest.newBuilder(request).id(Id.create("a", Request.class)).build(),
SUBMISSION_TIME)).isTrue();
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/VehicleDataEntryFactoryImplTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/VehicleDataEntryFactoryImplTest.java
index 035367e15fc..e74e3334a71 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/VehicleDataEntryFactoryImplTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/VehicleDataEntryFactoryImplTest.java
@@ -26,7 +26,7 @@
import java.util.Arrays;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.drt.optimizer.Waypoint.Stop;
@@ -50,7 +50,7 @@ public class VehicleDataEntryFactoryImplTest {
private final Stop stop1 = stop(300, 340, 400, 430);
@Test
- public void computeSlackTimes_withStops() {
+ void computeSlackTimes_withStops() {
final List precedingStayTimes = Arrays.asList(0.0, 0.0);
//final stay task not started - vehicle slack time is 50
@@ -64,7 +64,7 @@ public void computeSlackTimes_withStops() {
}
@Test
- public void computeSlackTimes_withoutStops() {
+ void computeSlackTimes_withoutStops() {
final List precedingStayTimes = Arrays.asList();
//final stay task not started yet - vehicle slack time is 10
@@ -85,9 +85,9 @@ public void computeSlackTimes_withoutStops() {
//final stay task planned after vehicle end time - vehicle slack time is 0s
assertThat(computeSlackTimes(vehicle(500, 510), 300, new Stop[] {}, null, precedingStayTimes)).containsExactly(0, 0);
}
-
+
@Test
- public void computeSlackTimes_withStart() {
+ void computeSlackTimes_withStart() {
final List noPrecedingStayTimes = Arrays.asList();
final List onePrecedingStayTime = Arrays.asList(0.0);
@@ -100,9 +100,9 @@ public void computeSlackTimes_withStart() {
//start with stop
assertThat(computeSlackTimes(vehicle(500, 450), 100, new Stop[] { stop1 }, stop0, onePrecedingStayTime)).containsExactly(30, 30, 50);
}
-
+
@Test
- public void computeSlackTimes_withPrecedingStayTimes() {
+ void computeSlackTimes_withPrecedingStayTimes() {
final List precedingStayTimes = Arrays.asList( //
0.0, //
33.0 // second stop is a prebooked pickup, so slack for insertion after first stop is longer
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/BestInsertionFinderTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/BestInsertionFinderTest.java
index 32b44c82f2f..bf42ede62a7 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/BestInsertionFinderTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/BestInsertionFinderTest.java
@@ -30,7 +30,7 @@
import java.util.Arrays;
import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
import org.matsim.contrib.drt.passenger.DrtRequest;
@@ -48,19 +48,19 @@ public class BestInsertionFinderTest {
private final BestInsertionFinder bestInsertionFinder = new BestInsertionFinder(insertionCostCalculator);
@Test
- public void noInsertions_empty() {
+ void noInsertions_empty() {
assertThat(findBestInsertion()).isEmpty();
}
@Test
- public void noFeasibleInsertions_empty() {
+ void noFeasibleInsertions_empty() {
when(insertionCostCalculator.calculate(eq(request), any(), any())).thenReturn(INFEASIBLE_SOLUTION_COST);
assertThat(findBestInsertion(insertion("v1", 0, 0), insertion("v1", 0, 1))).isEmpty();
}
@Test
- public void oneFeasibleInsertion_oneInfeasibleInsertion_chooseFeasible() {
+ void oneFeasibleInsertion_oneInfeasibleInsertion_chooseFeasible() {
var feasibleInsertion = insertion("v1", 0, 0);
whenInsertionThenCost(feasibleInsertion, 12345);
@@ -72,7 +72,7 @@ public void oneFeasibleInsertion_oneInfeasibleInsertion_chooseFeasible() {
}
@Test
- public void twoFeasibleInsertions_chooseBetter() {
+ void twoFeasibleInsertions_chooseBetter() {
var insertion1 = insertion("v1", 0, 0);
whenInsertionThenCost(insertion1, 123);
@@ -84,7 +84,7 @@ public void twoFeasibleInsertions_chooseBetter() {
}
@Test
- public void twoEqualInsertions_chooseLowerVehicleId() {
+ void twoEqualInsertions_chooseLowerVehicleId() {
var insertion1 = insertion("v1", 0, 0);
whenInsertionThenCost(insertion1, 123);
@@ -96,7 +96,7 @@ public void twoEqualInsertions_chooseLowerVehicleId() {
}
@Test
- public void twoEqualInsertions_sameVehicle_chooseLowerPickupIdx() {
+ void twoEqualInsertions_sameVehicle_chooseLowerPickupIdx() {
var insertion1 = insertion("v1", 0, 1);
whenInsertionThenCost(insertion1, 123);
@@ -108,7 +108,7 @@ public void twoEqualInsertions_sameVehicle_chooseLowerPickupIdx() {
}
@Test
- public void twoEqualInsertions_sameVehicle_samePickupIdx_chooseLowerDropoffIdx() {
+ void twoEqualInsertions_sameVehicle_samePickupIdx_chooseLowerDropoffIdx() {
var insertion1 = insertion("v1", 0, 0);
whenInsertionThenCost(insertion1, 123);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/CostCalculationStrategyTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/CostCalculationStrategyTest.java
index 569f4e7d708..cc52e2a3dbf 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/CostCalculationStrategyTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/CostCalculationStrategyTest.java
@@ -27,7 +27,7 @@
import static org.matsim.contrib.drt.optimizer.insertion.InsertionDetourTimeCalculator.DropoffDetourInfo;
import static org.matsim.contrib.drt.optimizer.insertion.InsertionDetourTimeCalculator.PickupDetourInfo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.contrib.drt.optimizer.insertion.InsertionDetourTimeCalculator.DetourTimeInfo;
import org.matsim.contrib.drt.passenger.DrtRequest;
@@ -36,20 +36,20 @@
*/
public class CostCalculationStrategyTest {
@Test
- public void RejectSoftConstraintViolations_tooLongWaitTime() {
+ void RejectSoftConstraintViolations_tooLongWaitTime() {
assertRejectSoftConstraintViolations(10, 9999,
new DetourTimeInfo(new PickupDetourInfo(11, 0), new DropoffDetourInfo(22, 0)),
INFEASIBLE_SOLUTION_COST);
}
@Test
- public void RejectSoftConstraintViolations_tooLongTravelTime() {
+ void RejectSoftConstraintViolations_tooLongTravelTime() {
assertRejectSoftConstraintViolations(9999, 10,
new DetourTimeInfo(new PickupDetourInfo(0, 0), new DropoffDetourInfo(11, 0)), INFEASIBLE_SOLUTION_COST);
}
@Test
- public void RejectSoftConstraintViolations_allConstraintSatisfied() {
+ void RejectSoftConstraintViolations_allConstraintSatisfied() {
assertRejectSoftConstraintViolations(9999, 9999,
new DetourTimeInfo(new PickupDetourInfo(11, 33), new DropoffDetourInfo(22, 44)), 33 + 44);
}
@@ -65,21 +65,21 @@ private void assertRejectSoftConstraintViolations(double latestStartTime, double
}
@Test
- public void DiscourageSoftConstraintViolations_tooLongWaitTime() {
+ void DiscourageSoftConstraintViolations_tooLongWaitTime() {
assertDiscourageSoftConstraintViolations(10, 9999,
new DetourTimeInfo(new PickupDetourInfo(11, 0), new DropoffDetourInfo(22, 0)),
MAX_WAIT_TIME_VIOLATION_PENALTY);
}
@Test
- public void DiscourageSoftConstraintViolations_tooLongTravelTime() {
+ void DiscourageSoftConstraintViolations_tooLongTravelTime() {
assertDiscourageSoftConstraintViolations(9999, 10,
new DetourTimeInfo(new PickupDetourInfo(0, 0), new DropoffDetourInfo(11, 0)),
MAX_TRAVEL_TIME_VIOLATION_PENALTY);
}
@Test
- public void DiscourageSoftConstraintViolations_allConstraintSatisfied() {
+ void DiscourageSoftConstraintViolations_allConstraintSatisfied() {
assertDiscourageSoftConstraintViolations(9999, 9999,
new DetourTimeInfo(new PickupDetourInfo(11, 33), new DropoffDetourInfo(22, 44)), 33 + 44);
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DefaultUnplannedRequestInserterTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DefaultUnplannedRequestInserterTest.java
index 5730c59ea46..58637acaddc 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DefaultUnplannedRequestInserterTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DefaultUnplannedRequestInserterTest.java
@@ -32,8 +32,9 @@
import java.util.*;
import org.apache.commons.lang3.mutable.MutableInt;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Identifiable;
import org.matsim.api.core.v01.network.Link;
@@ -69,11 +70,11 @@ public class DefaultUnplannedRequestInserterTest {
private final EventsManager eventsManager = mock(EventsManager.class);
- @Rule
- public final ForkJoinPoolTestRule rule = new ForkJoinPoolTestRule();
+ @RegisterExtension
+ public final ForkJoinPoolExtension forkJoinPoolExtension = new ForkJoinPoolExtension();
@Test
- public void nothingToSchedule() {
+ void nothingToSchedule() {
var fleet = fleet(vehicle("1"));
var unplannedRequests = requests();
double now = 15;
@@ -88,7 +89,7 @@ public void nothingToSchedule() {
}
@Test
- public void notScheduled_rejected() {
+ void notScheduled_rejected() {
var fleet = fleet();//no vehicles -> impossible to schedule
var unplannedRequests = requests(request1);
double now = 15;
@@ -121,7 +122,7 @@ public void notScheduled_rejected() {
}
@Test
- public void notScheduled_addedToRetry() {
+ void notScheduled_addedToRetry() {
var fleet = fleet();//no vehicles -> impossible to schedule
var unplannedRequests = requests(request1);
double now = 15;
@@ -158,7 +159,7 @@ public void notScheduled_addedToRetry() {
}
@Test
- public void firstRetryOldRequest_thenHandleNewRequest() {
+ void firstRetryOldRequest_thenHandleNewRequest() {
var fleet = fleet();//no vehicles -> impossible to schedule
var unplannedRequests = requests(request1);
double now = 15;
@@ -193,7 +194,7 @@ public void firstRetryOldRequest_thenHandleNewRequest() {
}
@Test
- public void acceptedRequest() {
+ void acceptedRequest() {
var vehicle1 = vehicle("1");
var fleet = fleet(vehicle1);
var unplannedRequests = requests(request1);
@@ -285,7 +286,7 @@ private DefaultUnplannedRequestInserter newInserter(Fleet fleet, double now,
DrtInsertionSearch insertionSearch, RequestInsertionScheduler insertionScheduler) {
return new DefaultUnplannedRequestInserter(mode, fleet, () -> now, eventsManager, insertionScheduler,
vehicleEntryFactory, insertionRetryQueue, insertionSearch, DrtOfferAcceptor.DEFAULT_ACCEPTOR,
- rule.forkJoinPool, StaticPassengerStopDurationProvider.of(10.0, 0.0));
+ forkJoinPoolExtension.forkJoinPool, StaticPassengerStopDurationProvider.of(10.0, 0.0));
}
private Link link(String id) {
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DetourTimeEstimatorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DetourTimeEstimatorTest.java
index 85caff1ca6c..d11094a9fd1 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DetourTimeEstimatorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DetourTimeEstimatorTest.java
@@ -25,7 +25,7 @@
import static org.mockito.Mockito.when;
import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.contrib.dvrp.trafficmonitoring.QSimFreeSpeedTravelTime;
import org.matsim.contrib.zone.skims.TravelTimeMatrix;
import org.matsim.testcases.fakes.FakeLink;
@@ -37,14 +37,14 @@
public class DetourTimeEstimatorTest {
@Test
- public void freeSpeedZonalTimeEstimator_fromLinkToLinkSame() {
+ void freeSpeedZonalTimeEstimator_fromLinkToLinkSame() {
var link = new FakeLink(null);
var estimator = DetourTimeEstimator.createMatrixBasedEstimator(1, null, null);
Assertions.assertThat(estimator.estimateTime(link, link, 345)).isZero();
}
@Test
- public void freeSpeedZonalTimeEstimator_fromLinkToLinkDifferent() {
+ void freeSpeedZonalTimeEstimator_fromLinkToLinkDifferent() {
var linkA = new FakeLink(null, null, new FakeNode(null));
var linkB = new FakeLink(null, new FakeNode(null), null);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DrtPoolingParameterTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DrtPoolingParameterTest.java
index c708e623de0..76b6f176cde 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DrtPoolingParameterTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/DrtPoolingParameterTest.java
@@ -3,9 +3,9 @@
import java.net.URL;
import java.util.*;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.population.*;
@@ -52,7 +52,7 @@
*/
public class DrtPoolingParameterTest {
- @Rule
+ @RegisterExtension
public final MatsimTestUtils utils = new MatsimTestUtils();
@@ -64,9 +64,9 @@ public class DrtPoolingParameterTest {
* With a low maxWaitTime of 100s, no DRT vehicle should have time to any agents.
*/
@Test
- public void testMaxWaitTimeNoVehicles() {
+ void testMaxWaitTimeNoVehicles() {
PersonEnterDrtVehicleEventHandler handler = setupAndRunScenario(50, 10.0, 10000.);
- Assert.assertEquals("There should be no vehicle used", 0, handler.getVehRequestCount().size());
+ Assertions.assertEquals(0, handler.getVehRequestCount().size(), "There should be no vehicle used");
}
@@ -76,20 +76,20 @@ public void testMaxWaitTimeNoVehicles() {
* too far away to reach those agents.
*/
@Test
- public void testMaxWaitTimeTwoVehiclesForTwoAgents() {
+ void testMaxWaitTimeTwoVehiclesForTwoAgents() {
PersonEnterDrtVehicleEventHandler handler = setupAndRunScenario(121, 10.0, 10000.);
- Assert.assertEquals("There should two vehicle used", 2, handler.getVehRequestCount().size());
+ Assertions.assertEquals(2, handler.getVehRequestCount().size(), "There should two vehicle used");
Id drt_veh_1_1 = Id.create("drt_veh_1_1", DvrpVehicle.class);
Id drt_veh_1_2 = Id.create("drt_veh_1_2", DvrpVehicle.class);
- Assert.assertTrue("drt_veh_1_1 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_1));
- Assert.assertEquals("drt_veh_1_1 should be requested exactly once", 1,
- handler.getVehRequestCount().get(drt_veh_1_1), 0);
- Assert.assertTrue("drt_veh_1_2 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_2));
- Assert.assertEquals("drt_veh_1_2 should be requested exactly once", 1,
- handler.getVehRequestCount().get(drt_veh_1_2), 0);
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_1),
+ "drt_veh_1_1 should be requested in general");
+ Assertions.assertEquals(1,
+ handler.getVehRequestCount().get(drt_veh_1_1), 0, "drt_veh_1_1 should be requested exactly once");
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_2),
+ "drt_veh_1_2 should be requested in general");
+ Assertions.assertEquals(1,
+ handler.getVehRequestCount().get(drt_veh_1_2), 0, "drt_veh_1_2 should be requested exactly once");
}
@@ -97,20 +97,20 @@ public void testMaxWaitTimeTwoVehiclesForTwoAgents() {
* With a maxWaitTime of 250s, both drt vehicles should have time to each pick up two passengers.
*/
@Test
- public void testMaxWaitTimeTwoVehiclesForFourAgents() {
+ void testMaxWaitTimeTwoVehiclesForFourAgents() {
PersonEnterDrtVehicleEventHandler handler = setupAndRunScenario(250, 10.0, 10000.);
- Assert.assertEquals("There should two vehicle used", 2, handler.getVehRequestCount().size());
+ Assertions.assertEquals(2, handler.getVehRequestCount().size(), "There should two vehicle used");
Id drt_veh_1_1 = Id.create("drt_veh_1_1", DvrpVehicle.class);
Id drt_veh_1_2 = Id.create("drt_veh_1_2", DvrpVehicle.class);
- Assert.assertTrue("drt_veh_1_1 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_1));
- Assert.assertEquals("drt_veh_1_1 should be requested exactly twice", 2,
- handler.getVehRequestCount().get(drt_veh_1_1), 0);
- Assert.assertTrue("drt_veh_1_2 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_2));
- Assert.assertEquals("drt_veh_1_2 should be requested exactly twice", 2,
- handler.getVehRequestCount().get(drt_veh_1_2), 0);
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_1),
+ "drt_veh_1_1 should be requested in general");
+ Assertions.assertEquals(2,
+ handler.getVehRequestCount().get(drt_veh_1_1), 0, "drt_veh_1_1 should be requested exactly twice");
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_2),
+ "drt_veh_1_2 should be requested in general");
+ Assertions.assertEquals(2,
+ handler.getVehRequestCount().get(drt_veh_1_2), 0, "drt_veh_1_2 should be requested exactly twice");
}
@@ -118,32 +118,32 @@ public void testMaxWaitTimeTwoVehiclesForFourAgents() {
* With a high maxWaitTime of 500s, a single DRT vehicle should be able to pick up all four agents.
*/
@Test
- public void testMaxWaitTimeOneVehicleForFourAgents() {
+ void testMaxWaitTimeOneVehicleForFourAgents() {
PersonEnterDrtVehicleEventHandler handler = setupAndRunScenario(500, 10.0, 10000.);
System.out.println(handler.getVehRequestCount());
- Assert.assertEquals("There should only be one vehicle used", 1, handler.getVehRequestCount().size());
+ Assertions.assertEquals(1, handler.getVehRequestCount().size(), "There should only be one vehicle used");
Id drt_veh_1_1 = Id.create("drt_veh_1_1", DvrpVehicle.class);
- Assert.assertTrue("drt_veh_1_1 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_1));
- Assert.assertEquals("drt_veh_1_1 should be requested exactly four times", 4,
- handler.getVehRequestCount().get(drt_veh_1_1), 0);
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_1),
+ "drt_veh_1_1 should be requested in general");
+ Assertions.assertEquals(4,
+ handler.getVehRequestCount().get(drt_veh_1_1), 0, "drt_veh_1_1 should be requested exactly four times");
}
/*
- The following tests vary the maxTravelTimeBeta parameter. maxTravelTimeAlpha is fixed to 1.0, while maxWaitTime is
- fixed to a high value: 5000s.
+ e following tests vary the maxTravelTimeBeta parameter. maxTravelTimeAlpha is fixed to 1.0, while maxWaitTime is
+ ixed to a high value: 5000s.
*/
/**
* With a low Beta of 0s, no DRT vehicles should be assigned to the agents.
*/
@Test
- public void testBetaNoVehicles() {
+ void testBetaNoVehicles() {
PersonEnterDrtVehicleEventHandler handler = setupAndRunScenario(5000, 1.0, 0.);
- Assert.assertEquals("There should only be zero vehicles used", 0, handler.getVehRequestCount().size());
+ Assertions.assertEquals(0, handler.getVehRequestCount().size(), "There should only be zero vehicles used");
}
@@ -152,20 +152,20 @@ public void testBetaNoVehicles() {
* the remaining two agents will be left stranded
*/
@Test
- public void testBetaTwoVehiclesForTwoAgents() {
+ void testBetaTwoVehiclesForTwoAgents() {
PersonEnterDrtVehicleEventHandler handler = setupAndRunScenario(5000, 1.0, 150);
- Assert.assertEquals("There should two vehicle used", 2, handler.getVehRequestCount().size());
+ Assertions.assertEquals(2, handler.getVehRequestCount().size(), "There should two vehicle used");
Id drt_veh_1_1 = Id.create("drt_veh_1_1", DvrpVehicle.class);
Id drt_veh_1_2 = Id.create("drt_veh_1_2", DvrpVehicle.class);
- Assert.assertTrue("drt_veh_1_1 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_1));
- Assert.assertEquals("drt_veh_1_1 should be requested exactly once", 1,
- handler.getVehRequestCount().get(drt_veh_1_1), 0);
- Assert.assertTrue("drt_veh_1_2 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_2));
- Assert.assertEquals("drt_veh_1_2 should be requested exactly once", 1,
- handler.getVehRequestCount().get(drt_veh_1_2), 0);
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_1),
+ "drt_veh_1_1 should be requested in general");
+ Assertions.assertEquals(1,
+ handler.getVehRequestCount().get(drt_veh_1_1), 0, "drt_veh_1_1 should be requested exactly once");
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_2),
+ "drt_veh_1_2 should be requested in general");
+ Assertions.assertEquals(1,
+ handler.getVehRequestCount().get(drt_veh_1_2), 0, "drt_veh_1_2 should be requested exactly once");
}
@@ -173,35 +173,35 @@ public void testBetaTwoVehiclesForTwoAgents() {
* With a Beta value of 250s, two DRT vehicles should have enough time to pick up two passengers each.
*/
@Test
- public void testBetaTwoVehiclesForFourAgents() {
+ void testBetaTwoVehiclesForFourAgents() {
PersonEnterDrtVehicleEventHandler handler = setupAndRunScenario(5000, 1.0, 250);
- Assert.assertEquals("There should two vehicle used", 2, handler.getVehRequestCount().size());
+ Assertions.assertEquals(2, handler.getVehRequestCount().size(), "There should two vehicle used");
Id drt_veh_1_1 = Id.create("drt_veh_1_1", DvrpVehicle.class);
Id drt_veh_1_2 = Id.create("drt_veh_1_2", DvrpVehicle.class);
- Assert.assertTrue("drt_veh_1_1 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_1));
- Assert.assertEquals("drt_veh_1_1 should be requested exactly twice", 2,
- handler.getVehRequestCount().get(drt_veh_1_1), 0);
- Assert.assertTrue("drt_veh_1_2 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_2));
- Assert.assertEquals("drt_veh_1_2 should be requested exactly twice", 2,
- handler.getVehRequestCount().get(drt_veh_1_2), 0);
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_1),
+ "drt_veh_1_1 should be requested in general");
+ Assertions.assertEquals(2,
+ handler.getVehRequestCount().get(drt_veh_1_1), 0, "drt_veh_1_1 should be requested exactly twice");
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_2),
+ "drt_veh_1_2 should be requested in general");
+ Assertions.assertEquals(2,
+ handler.getVehRequestCount().get(drt_veh_1_2), 0, "drt_veh_1_2 should be requested exactly twice");
}
/**
* With a high Beta of 400s, one DRT vehicle should be used to pick up all four agents
*/
@Test
- public void testBetaOneVehicleForFourAgents() {
+ void testBetaOneVehicleForFourAgents() {
PersonEnterDrtVehicleEventHandler handler = setupAndRunScenario(5000, 1.0, 400);
- Assert.assertEquals("There should only be one vehicle used", 1, handler.getVehRequestCount().size());
+ Assertions.assertEquals(1, handler.getVehRequestCount().size(), "There should only be one vehicle used");
Id drt_veh_1_1 = Id.create("drt_veh_1_1", DvrpVehicle.class);
- Assert.assertTrue("drt_veh_1_1 should be requested in general",
- handler.getVehRequestCount().containsKey(drt_veh_1_1));
- Assert.assertEquals("drt_veh_1_1 should be requested exactly four times", 4,
- handler.getVehRequestCount().get(drt_veh_1_1), 0);
+ Assertions.assertTrue(handler.getVehRequestCount().containsKey(drt_veh_1_1),
+ "drt_veh_1_1 should be requested in general");
+ Assertions.assertEquals(4,
+ handler.getVehRequestCount().get(drt_veh_1_1), 0, "drt_veh_1_1 should be requested exactly four times");
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/ForkJoinPoolTestRule.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/ForkJoinPoolExtension.java
similarity index 78%
rename from contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/ForkJoinPoolTestRule.java
rename to contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/ForkJoinPoolExtension.java
index 548decd28b6..e6f204bdf58 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/ForkJoinPoolTestRule.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/ForkJoinPoolExtension.java
@@ -22,27 +22,17 @@
import java.util.concurrent.ForkJoinPool;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
/**
* @author Michal Maciejewski (michalm)
*/
-public class ForkJoinPoolTestRule implements TestRule {
+public class ForkJoinPoolExtension implements AfterEachCallback {
public final ForkJoinPool forkJoinPool = new ForkJoinPool(1);
@Override
- public Statement apply(Statement base, Description description) {
- return new Statement() {
- @Override
- public void evaluate() throws Throwable {
- try {
- base.evaluate();
- } finally {
- forkJoinPool.shutdown();
- }
- }
- };
+ public void afterEach(ExtensionContext extensionContext) throws Exception {
+ forkJoinPool.shutdown();
}
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionCostCalculatorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionCostCalculatorTest.java
index 563788c0f5c..0d617d9fc9f 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionCostCalculatorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionCostCalculatorTest.java
@@ -24,7 +24,7 @@
import static org.matsim.contrib.drt.optimizer.insertion.InsertionCostCalculator.INFEASIBLE_SOLUTION_COST;
import static org.matsim.contrib.drt.optimizer.insertion.InsertionDetourTimeCalculator.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
@@ -41,7 +41,7 @@ public class InsertionCostCalculatorTest {
private final DrtRequest drtRequest = DrtRequest.newBuilder().fromLink(fromLink).toLink(toLink).build();
@Test
- public void testCalculate() {
+ void testCalculate() {
VehicleEntry entry = entry(new double[] { 20, 20, 50 });
var insertion = insertion(entry, 0, 1);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculatorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculatorTest.java
index 3489c5ee854..756682854b0 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculatorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculatorTest.java
@@ -24,8 +24,7 @@
import java.util.Collections;
import java.util.List;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
@@ -57,7 +56,7 @@ public class InsertionDetourTimeCalculatorTest {
private final DrtRequest drtRequest = DrtRequest.newBuilder().fromLink(fromLink).toLink(toLink).build();
@Test
- public void detourTimeLoss_start_pickup_dropoff() {
+ void detourTimeLoss_start_pickup_dropoff() {
Waypoint.Start start = start(null, 10, link("start"));
VehicleEntry entry = entry(start);
var detour = detourData(100., 15., Double.NaN, 0.);
@@ -74,7 +73,7 @@ public void detourTimeLoss_start_pickup_dropoff() {
}
@Test
- public void detourTimeLoss_ongoingStopAsStart_pickup_dropoff() {
+ void detourTimeLoss_ongoingStopAsStart_pickup_dropoff() {
//similar to detourTmeLoss_start_pickup_dropoff(), but the pickup is appended to the ongoing STOP task
// sh 03/08/23: Changed this test, according to VehicleDataEntryFactoryImpl the start time should be end time of stop task
Waypoint.Start start = start(new DefaultDrtStopTask(20, 20 + STOP_DURATION, fromLink), 20 + STOP_DURATION, fromLink);
@@ -91,7 +90,7 @@ public void detourTimeLoss_ongoingStopAsStart_pickup_dropoff() {
}
@Test
- public void detourTimeLoss_start_pickup_dropoff_stop() {
+ void detourTimeLoss_start_pickup_dropoff_stop() {
Waypoint.Start start = start(null, 5, link("start"));
Waypoint.Stop stop0 = stop(10, link("stop0"));
VehicleEntry entry = entry(start, stop0);
@@ -109,7 +108,7 @@ public void detourTimeLoss_start_pickup_dropoff_stop() {
}
@Test
- public void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff() {
+ void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff() {
Waypoint.Start start = start(null, 5, link("start"));
Waypoint.Stop stop0 = stop(10, link("stop0"));
VehicleEntry entry = entry(start, stop0);
@@ -127,7 +126,7 @@ public void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff() {
}
@Test
- public void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff_stop() {
+ void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff_stop() {
Waypoint.Start start = start(null, 5, link("start"));
Waypoint.Stop stop0 = stop(10, link("stop0"));
Waypoint.Stop stop1 = stop(200, link("stop1"));
@@ -148,7 +147,7 @@ public void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff_stop() {
}
@Test
- public void calculatePickupDetourTimeLoss_start_pickupNotAppended_stop_dropoffAppended_stop() {
+ void calculatePickupDetourTimeLoss_start_pickupNotAppended_stop_dropoffAppended_stop() {
Waypoint.Start start = start(null, 5, fromLink);//not a STOP -> pickup cannot be appended
Waypoint.Stop stop0 = stop(10, toLink);
Waypoint.Stop stop1 = stop(200, link("stop1"));
@@ -165,7 +164,7 @@ public void calculatePickupDetourTimeLoss_start_pickupNotAppended_stop_dropoffAp
}
@Test
- public void calculatePickupDetourTimeLoss_start_stop_pickupAppended_stop_dropoffAppended() {
+ void calculatePickupDetourTimeLoss_start_stop_pickupAppended_stop_dropoffAppended() {
Waypoint.Start start = start(null, 5, link("start"));
Waypoint.Stop stop0 = stop(10, fromLink);
Waypoint.Stop stop1 = stop(200, toLink);
@@ -182,7 +181,7 @@ public void calculatePickupDetourTimeLoss_start_stop_pickupAppended_stop_dropoff
}
@Test
- public void replacedDriveTimeEstimator() {
+ void replacedDriveTimeEstimator() {
Waypoint.Start start = start(null, 0, link("start"));
Waypoint.Stop stop0 = stop(10, link("stop0"));
Waypoint.Stop stop1 = stop(200, link("stop1"));
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculatorWithVariableDurationTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculatorWithVariableDurationTest.java
index 461a598d874..fcfa03962bd 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculatorWithVariableDurationTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculatorWithVariableDurationTest.java
@@ -24,8 +24,7 @@
import java.util.Collections;
import java.util.List;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
@@ -91,7 +90,7 @@ public double calcDropoffDuration(DvrpVehicle vehicle, DrtRequest request) {
new CumulativeStopTimeCalculator(STOP_DURATION_PROVIDER);
@Test
- public void detourTimeLoss_start_pickup_dropoff() {
+ void detourTimeLoss_start_pickup_dropoff() {
Waypoint.Start start = start(null, 10, link("start"));
VehicleEntry entry = entry(start);
var detour = new Detour(100., 15., 0., 0.);
@@ -109,7 +108,7 @@ public void detourTimeLoss_start_pickup_dropoff() {
}
@Test
- public void detourTimeLoss_ongoingStopAsStart_pickup_dropoff() {
+ void detourTimeLoss_ongoingStopAsStart_pickup_dropoff() {
//similar to detourTmeLoss_start_pickup_dropoff(), but the pickup is appended to the ongoing STOP task
DrtStopTask stopTask = new DefaultDrtStopTask(20, 20 + STOP_DURATION_INITIAL, fromLink);
stopTask.addDropoffRequest(AcceptedDrtRequest.createFromOriginalRequest(drtRequestInitial));
@@ -129,7 +128,7 @@ public void detourTimeLoss_ongoingStopAsStart_pickup_dropoff() {
}
@Test
- public void detourTimeLoss_start_pickup_dropoff_stop() {
+ void detourTimeLoss_start_pickup_dropoff_stop() {
Waypoint.Start start = start(null, 5, link("start"));
Waypoint.Stop stop0 = stop(10, link("stop0"));
VehicleEntry entry = entry(start, stop0);
@@ -146,7 +145,7 @@ public void detourTimeLoss_start_pickup_dropoff_stop() {
}
@Test
- public void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff() {
+ void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff() {
Waypoint.Start start = start(null, 5, link("start"));
Waypoint.Stop stop0 = stop(10, link("stop0"));
VehicleEntry entry = entry(start, stop0);
@@ -163,7 +162,7 @@ public void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff() {
}
@Test
- public void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff_stop() {
+ void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff_stop() {
Waypoint.Start start = start(null, 5, link("start"));
Waypoint.Stop stop0 = stop(10, link("stop0"));
Waypoint.Stop stop1 = stop(200, link("stop1"));
@@ -181,7 +180,7 @@ public void calculatePickupDetourTimeLoss_start_pickup_stop_dropoff_stop() {
}
@Test
- public void calculatePickupDetourTimeLoss_start_pickupNotAppended_stop_dropoffAppended_stop() {
+ void calculatePickupDetourTimeLoss_start_pickupNotAppended_stop_dropoffAppended_stop() {
Waypoint.Start start = start(null, 5, fromLink);//not a STOP -> pickup cannot be appended
Waypoint.Stop stop0 = stop(10, toLink);
Waypoint.Stop stop1 = stop(200, link("stop1"));
@@ -199,7 +198,7 @@ public void calculatePickupDetourTimeLoss_start_pickupNotAppended_stop_dropoffAp
}
@Test
- public void calculatePickupDetourTimeLoss_start_stop_pickupAppended_stop_dropoffAppended() {
+ void calculatePickupDetourTimeLoss_start_stop_pickupAppended_stop_dropoffAppended() {
Waypoint.Start start = start(null, 5, link("start"));
Waypoint.Stop stop0 = stop(10, fromLink);
Waypoint.Stop stop1 = stop(200, toLink);
@@ -217,7 +216,7 @@ public void calculatePickupDetourTimeLoss_start_stop_pickupAppended_stop_dropoff
}
@Test
- public void replacedDriveTimeEstimator() {
+ void replacedDriveTimeEstimator() {
Waypoint.Start start = start(null, 0, link("start"));
Waypoint.Stop stop0 = stop(10, link("stop0"));
Waypoint.Stop stop1 = stop(200, link("stop1"));
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGeneratorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGeneratorTest.java
index 18bb57661f2..53c6aa2d5ae 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGeneratorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGeneratorTest.java
@@ -28,7 +28,7 @@
import java.util.List;
import com.google.common.collect.Sets;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
@@ -94,7 +94,7 @@ public class InsertionGeneratorTest {
private final DvrpVehicle vehicle = new DvrpVehicleImpl(vehicleSpecification, depotLink);
@Test
- public void startEmpty_noStops() {
+ void startEmpty_noStops() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0); //no stops => must be empty
VehicleEntry entry = entry(start);
@@ -110,7 +110,7 @@ public void startEmpty_noStops() {
}
@Test
- public void startNotFull_oneStop() {
+ void startNotFull_oneStop() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 1); // 1 pax aboard
Waypoint.Stop stop0 = stop(start.time + TIME_REPLACED_DRIVE, link("stop0"), 0);//drop off 1 pax
VehicleEntry entry = entry(start, stop0);
@@ -143,7 +143,7 @@ public void startNotFull_oneStop() {
}
@Test
- public void startFull_oneStop() {
+ void startFull_oneStop() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, CAPACITY); //full
Waypoint.Stop stop0 = stop(start.time + TIME_REPLACED_DRIVE, link("stop0"), 0);//drop off 4 pax
VehicleEntry entry = entry(start, stop0);
@@ -160,7 +160,7 @@ public void startFull_oneStop() {
}
@Test
- public void startEmpty_twoStops_notFullBetweenStops() {
+ void startEmpty_twoStops_notFullBetweenStops() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0); //empty
Waypoint.Stop stop0 = stop(start.time + TIME_REPLACED_DRIVE, link("stop0"), 1);//pick up 1 pax
Waypoint.Stop stop1 = stop(stop0.getDepartureTime() + TIME_REPLACED_DRIVE, link("stop1"), 0);//drop off 1 pax
@@ -218,7 +218,7 @@ public void startEmpty_twoStops_notFullBetweenStops() {
}
@Test
- public void startEmpty_twoStops_notFullBetweenStops_tightSlackTimes() {
+ void startEmpty_twoStops_notFullBetweenStops_tightSlackTimes() {
//same as startEmpty_twoStops_notFullBetweenStops() but with different slack times
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0); //empty
Waypoint.Stop stop0 = stop(start.time + TIME_REPLACED_DRIVE, link("stop0"), 1);//pick up 1 pax
@@ -252,7 +252,7 @@ public void startEmpty_twoStops_notFullBetweenStops_tightSlackTimes() {
}
@Test
- public void startEmpty_twoStops_fullBetweenStops() {
+ void startEmpty_twoStops_fullBetweenStops() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0); //empty
Waypoint.Stop stop0 = stop(0, link("stop0"), CAPACITY);//pick up 4 pax (full)
Waypoint.Stop stop1 = stop(0, link("stop1"), 0);//drop off 4 pax
@@ -266,7 +266,7 @@ public void startEmpty_twoStops_fullBetweenStops() {
}
@Test
- public void startFull_twoStops_notFullBetweenStops() {
+ void startFull_twoStops_notFullBetweenStops() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, CAPACITY); //full
Waypoint.Stop stop0 = stop(0, link("stop0"), 2);//drop off 2 pax
Waypoint.Stop stop1 = stop(0, link("stop1"), 0);//drop off 2 pax
@@ -281,7 +281,7 @@ public void startFull_twoStops_notFullBetweenStops() {
}
@Test
- public void startFull_twoStops_fullBetweenStops() {
+ void startFull_twoStops_fullBetweenStops() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, CAPACITY); //full
Waypoint.Stop stop0 = stop(0, link("stop0"), CAPACITY);//drop off 1 pax, pickup 1 pax (full)
Waypoint.Stop stop1 = stop(0, link("stop1"), 0);//drop off 4 pax
@@ -294,7 +294,7 @@ public void startFull_twoStops_fullBetweenStops() {
}
@Test
- public void startNotFull_threeStops_emptyBetweenStops01_fullBetweenStops12() {
+ void startNotFull_threeStops_emptyBetweenStops01_fullBetweenStops12() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 1); //empty
Waypoint.Stop stop0 = stop(0, link("stop0"), 0);// dropoff 1 pax
Waypoint.Stop stop1 = stop(0, link("stop1"), CAPACITY);// pickup 4 pax
@@ -312,7 +312,7 @@ public void startNotFull_threeStops_emptyBetweenStops01_fullBetweenStops12() {
}
@Test
- public void startFull_threeStops_emptyBetweenStops01_fullBetweenStops12() {
+ void startFull_threeStops_emptyBetweenStops01_fullBetweenStops12() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, CAPACITY); //full
Waypoint.Stop stop0 = stop(0, link("stop0"), 0);// dropoff 4 pax
Waypoint.Stop stop1 = stop(0, link("stop1"), CAPACITY);// pickup 4 pax
@@ -328,7 +328,7 @@ public void startFull_threeStops_emptyBetweenStops01_fullBetweenStops12() {
}
@Test
- public void noDetourForPickup_noDuplicatedInsertions() {
+ void noDetourForPickup_noDuplicatedInsertions() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 1); // 1 pax
Waypoint.Stop stop0 = stop(0, fromLink, 0);//dropoff 1 pax
VehicleEntry entry = entry(start, stop0);
@@ -339,7 +339,7 @@ public void noDetourForPickup_noDuplicatedInsertions() {
}
@Test
- public void noDetourForDropoff_noDuplicatedInsertions() {
+ void noDetourForDropoff_noDuplicatedInsertions() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 1); // 1 pax
Waypoint.Stop stop0 = stop(0, toLink, 0);//dropoff 1 pax
VehicleEntry entry = entry(start, stop0);
@@ -351,7 +351,7 @@ public void noDetourForDropoff_noDuplicatedInsertions() {
}
@Test
- public void noDetourForDropoff_vehicleOutgoingFullAfterDropoff_insertionPossible() {
+ void noDetourForDropoff_vehicleOutgoingFullAfterDropoff_insertionPossible() {
// a special case where we allow inserting the dropoff after a stop despite outgoingOccupancy == maxCapacity
// this is only because the the dropoff happens exactly at (not after) the stop
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 1); // 1 pax
@@ -366,7 +366,7 @@ public void noDetourForDropoff_vehicleOutgoingFullAfterDropoff_insertionPossible
}
@Test
- public void startEmpty_prebookedRequest() {
+ void startEmpty_prebookedRequest() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0);
VehicleEntry entry = entry(start);
assertInsertionsOnly(prebookedRequest, entry,
@@ -374,7 +374,7 @@ public void startEmpty_prebookedRequest() {
}
@Test
- public void startEmpty_onlineRequest_beforeAlreadyPrebookedOtherRequest() {
+ void startEmpty_onlineRequest_beforeAlreadyPrebookedOtherRequest() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0);
Waypoint.Stop stop0 = stop(200, fromLink, 1);
Waypoint.Stop stop1 = stop(400, link("stop"), 0);
@@ -390,7 +390,7 @@ public void startEmpty_onlineRequest_beforeAlreadyPrebookedOtherRequest() {
}
@Test
- public void startEmpty_prebookedRequest_inMiddleOfAlreadyPrebookedOtherRequest() {
+ void startEmpty_prebookedRequest_inMiddleOfAlreadyPrebookedOtherRequest() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0);
Waypoint.Stop stop0 = stop(50, fromLink, 1);
Waypoint.Stop stop1 = stop(300, link("stop"), 0);
@@ -402,7 +402,7 @@ public void startEmpty_prebookedRequest_inMiddleOfAlreadyPrebookedOtherRequest()
}
@Test
- public void startEmpty_prebookedRequest_afterAlreadyPrebookedOtherRequest() {
+ void startEmpty_prebookedRequest_afterAlreadyPrebookedOtherRequest() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0);
Waypoint.Stop stop0 = stop(20, fromLink, 1);
Waypoint.Stop stop1 = stop(70, link("stop"), 0);
@@ -413,7 +413,7 @@ public void startEmpty_prebookedRequest_afterAlreadyPrebookedOtherRequest() {
@Test
- public void startEmpty_smallGroup() {
+ void startEmpty_smallGroup() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0); //empty
VehicleEntry entry = entry(start);
assertInsertionsOnly(drtRequest2Pax, entry,
@@ -422,7 +422,7 @@ public void startEmpty_smallGroup() {
}
@Test
- public void startEmpty_groupExceedsCapacity() {
+ void startEmpty_groupExceedsCapacity() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0); //empty
VehicleEntry entry = entry(start);
assertInsertionsOnly(drtRequest5Pax, entry
@@ -431,7 +431,7 @@ public void startEmpty_groupExceedsCapacity() {
}
@Test
- public void startEmpty_twoStops_groupExceedsCapacityAtFirstStop() {
+ void startEmpty_twoStops_groupExceedsCapacityAtFirstStop() {
Waypoint.Start start = new Waypoint.Start(null, link("start"), 0, 0); //empty
Waypoint.Stop stop0 = stop(0, toLink, 3);//dropoff 1 pax
Waypoint.Stop stop1 = stop(0, link("stop1"), 0);//dropoff 1 pax
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/DetourPathDataCacheTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/DetourPathDataCacheTest.java
index af7c0c331f2..fcc8928de9c 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/DetourPathDataCacheTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/DetourPathDataCacheTest.java
@@ -24,8 +24,7 @@
import static org.mockito.Mockito.mock;
import java.util.Arrays;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
@@ -86,32 +85,32 @@ public class DetourPathDataCacheTest {
pathToDropoffMap, pathFromDropoffMap, ZERO_DETOUR);
@Test
- public void insertion_0_0() {
+ void insertion_0_0() {
assertInsertion(0, 0, start_pickup, pickup_dropoff, null, dropoff_stop0);
}
@Test
- public void insertion_0_1() {
+ void insertion_0_1() {
assertInsertion(0, 1, start_pickup, pickup_stop0, stop0_dropoff, dropoff_stop1);
}
@Test
- public void insertion_0_2() {
+ void insertion_0_2() {
assertInsertion(0, 2, start_pickup, pickup_stop0, stop1_dropoff, ZERO_DETOUR);
}
@Test
- public void insertion_1_1() {
+ void insertion_1_1() {
assertInsertion(1, 1, stop0_pickup, pickup_dropoff, null, dropoff_stop1);
}
@Test
- public void insertion_1_2() {
+ void insertion_1_2() {
assertInsertion(1, 2, stop0_pickup, pickup_stop1, stop1_dropoff, ZERO_DETOUR);
}
@Test
- public void insertion_2_2() {
+ void insertion_2_2() {
assertInsertion(2, 2, stop1_pickup, pickup_dropoff, null, ZERO_DETOUR);
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/ExtensiveInsertionProviderTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/ExtensiveInsertionProviderTest.java
index 3e94e70dfd5..c6dc35ebdf6 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/ExtensiveInsertionProviderTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/ExtensiveInsertionProviderTest.java
@@ -29,8 +29,8 @@
import java.util.List;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
import org.matsim.contrib.drt.optimizer.Waypoint;
import org.matsim.contrib.drt.optimizer.insertion.*;
@@ -43,25 +43,25 @@
* @author Michal Maciejewski (michalm)
*/
public class ExtensiveInsertionProviderTest {
- @Rule
- public final ForkJoinPoolTestRule rule = new ForkJoinPoolTestRule();
+ @RegisterExtension
+ public final ForkJoinPoolExtension rule = new ForkJoinPoolExtension();
@Test
- public void getInsertions_noInsertionsGenerated() {
+ void getInsertions_noInsertionsGenerated() {
var insertionProvider = new ExtensiveInsertionProvider(null, null, new InsertionGenerator(new DefaultStopTimeCalculator(120), null),
rule.forkJoinPool);
assertThat(insertionProvider.getInsertions(null, List.of())).isEmpty();
}
@Test
- public void getInsertions_twoAtEndInsertionsGenerated_zeroNearestInsertionsAtEndLimit() {
+ void getInsertions_twoAtEndInsertionsGenerated_zeroNearestInsertionsAtEndLimit() {
//the infeasible solution gets discarded in the first stage
//the feasible solution gets discarded in the second stage (KNearestInsertionsAtEndFilter)
getInsertions_twoInsertionsGenerated(0);
}
@Test
- public void getInsertions_twoAtEndInsertionsGenerated_tenNearestInsertionsAtEndLimit() {
+ void getInsertions_twoAtEndInsertionsGenerated_tenNearestInsertionsAtEndLimit() {
//the infeasible solution gets discarded in the first stage
//the feasible solution is NOT discarded in the second stage (KNearestInsertionsAtEndFilter)
getInsertions_twoInsertionsGenerated(10);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/KNearestInsertionsAtEndFilterTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/KNearestInsertionsAtEndFilterTest.java
index 77fc80cf388..02a92a9588b 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/KNearestInsertionsAtEndFilterTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/KNearestInsertionsAtEndFilterTest.java
@@ -25,8 +25,7 @@
import static org.mockito.Mockito.when;
import java.util.List;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
import org.matsim.contrib.drt.optimizer.Waypoint;
@@ -46,7 +45,7 @@
public class KNearestInsertionsAtEndFilterTest {
@Test
- public void k0_atEndInsertionsNotReturned() {
+ void k0_atEndInsertionsNotReturned() {
var vehicleEntry = vehicleEntry("v1", start(0), stop(100));
var insertion = insertion(vehicleEntry, 1, 10);
var filteredInsertions = KNearestInsertionsAtEndFilter.filterInsertionsAtEnd(0, List.of(insertion));
@@ -54,13 +53,13 @@ public void k0_atEndInsertionsNotReturned() {
}
@Test
- public void noInsertions_emptyList() {
+ void noInsertions_emptyList() {
var filteredInsertions = filterOneInsertionAtEnd();
assertThat(filteredInsertions).isEmpty();
}
@Test
- public void noAtEndInsertions_allReturned() {
+ void noAtEndInsertions_allReturned() {
var vehicleEntry = vehicleEntry("v1", start(0), stop(100));
var insertion1 = insertion(vehicleEntry, 0, 11);
var insertion2 = insertion(vehicleEntry, 0, 22);
@@ -70,7 +69,7 @@ public void noAtEndInsertions_allReturned() {
}
@Test
- public void onlyAtEndInsertions_theEarliestReturned() {
+ void onlyAtEndInsertions_theEarliestReturned() {
var vehicleEntry1 = vehicleEntry("v1", start(0), stop(100));
var insertion1 = insertion(vehicleEntry1, 1, 110);
@@ -83,7 +82,7 @@ public void onlyAtEndInsertions_theEarliestReturned() {
}
@Test
- public void onlyAtEndInsertions_equalArrivalTime_useVehicleIdAsTieBreaker() {
+ void onlyAtEndInsertions_equalArrivalTime_useVehicleIdAsTieBreaker() {
var vehicleEntry1 = vehicleEntry("v1", start(0), stop(100));
var insertion1 = insertion(vehicleEntry1, 1, 110);
@@ -96,7 +95,7 @@ public void onlyAtEndInsertions_equalArrivalTime_useVehicleIdAsTieBreaker() {
}
@Test
- public void mixedTypeInsertions_bothReturned() {
+ void mixedTypeInsertions_bothReturned() {
var vehicleEntry = vehicleEntry("v1", start(0), stop(100));
var insertionAfterStart = insertion(vehicleEntry, 0, 11);
var insertionAtEnd = insertion(vehicleEntry, 1, 10);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/MultiInsertionDetourPathCalculatorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/MultiInsertionDetourPathCalculatorTest.java
index 83ad6959ffe..b11903b01df 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/MultiInsertionDetourPathCalculatorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/extensive/MultiInsertionDetourPathCalculatorTest.java
@@ -31,8 +31,8 @@
import java.util.List;
import java.util.Map;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.api.core.v01.network.Node;
@@ -70,13 +70,13 @@ public class MultiInsertionDetourPathCalculatorTest {
private final MultiInsertionDetourPathCalculator detourPathCalculator = new MultiInsertionDetourPathCalculator(
pathSearch, pathSearch, pathSearch, pathSearch, 1);
- @After
+ @AfterEach
public void after() {
detourPathCalculator.notifyMobsimBeforeCleanup(null);
}
@Test
- public void calculatePaths() {
+ void calculatePaths() {
var pathToPickup = mockCalcPathData(pickupLink, beforePickupLink, request.getEarliestStartTime(), false, 11);
var pathFromPickup = mockCalcPathData(pickupLink, afterPickupLink, request.getEarliestStartTime(), true, 22);
var pathToDropoff = mockCalcPathData(dropoffLink, beforeDropoffLink, request.getLatestArrivalTime(), false, 33);
@@ -96,7 +96,7 @@ public void calculatePaths() {
}
@Test
- public void calculatePaths_dropoffAfterPickup_dropoffAtEnd() {
+ void calculatePaths_dropoffAfterPickup_dropoffAtEnd() {
//compute only 2 paths (instead of 4)
var pathToPickup = mockCalcPathData(pickupLink, beforePickupLink, request.getEarliestStartTime(), false, 11);
var pathFromPickup = mockCalcPathData(pickupLink, dropoffLink, request.getEarliestStartTime(), true, 22);
@@ -117,7 +117,7 @@ public void calculatePaths_dropoffAfterPickup_dropoffAtEnd() {
}
@Test
- public void calculatePaths_noDetours() {
+ void calculatePaths_noDetours() {
// OneToManyPathSearch.calcPathDataMap() returns a map that contains entries for all toLinks
// (unless the stop criterion terminates computations earlier)
// If fromLink is in toLinks than PathData.EMPTY is mapped for such a link
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/selective/SelectiveInsertionProviderTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/selective/SelectiveInsertionProviderTest.java
index a88df5ac539..d6ed2a51d7b 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/selective/SelectiveInsertionProviderTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/selective/SelectiveInsertionProviderTest.java
@@ -31,11 +31,11 @@
import java.util.Optional;
import java.util.Set;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.contrib.drt.optimizer.VehicleEntry;
import org.matsim.contrib.drt.optimizer.insertion.BestInsertionFinder;
-import org.matsim.contrib.drt.optimizer.insertion.ForkJoinPoolTestRule;
+import org.matsim.contrib.drt.optimizer.insertion.ForkJoinPoolExtension;
import org.matsim.contrib.drt.optimizer.insertion.InsertionGenerator;
import org.matsim.contrib.drt.optimizer.insertion.InsertionGenerator.Insertion;
import org.matsim.contrib.drt.optimizer.insertion.InsertionWithDetourData;
@@ -47,8 +47,8 @@
* @author Michal Maciejewski (michalm)
*/
public class SelectiveInsertionProviderTest {
- @Rule
- public final ForkJoinPoolTestRule rule = new ForkJoinPoolTestRule();
+ @RegisterExtension
+ public final ForkJoinPoolExtension rule = new ForkJoinPoolExtension();
private final BestInsertionFinder initialInsertionFinder = mock(BestInsertionFinder.class);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/selective/SingleInsertionDetourPathCalculatorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/selective/SingleInsertionDetourPathCalculatorTest.java
index 95d69fe11c4..19897df2149 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/selective/SingleInsertionDetourPathCalculatorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/insertion/selective/SingleInsertionDetourPathCalculatorTest.java
@@ -30,8 +30,8 @@
import java.util.List;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.api.core.v01.network.Node;
@@ -74,13 +74,13 @@ public class SingleInsertionDetourPathCalculatorTest {
private final SingleInsertionDetourPathCalculator detourPathCalculator = new SingleInsertionDetourPathCalculator(
null, new FreeSpeedTravelTime(), null, 1, (network, travelCosts, travelTimes) -> pathCalculator);
- @After
+ @AfterEach
public void after() {
detourPathCalculator.notifyMobsimBeforeCleanup(null);
}
@Test
- public void calculatePaths() {
+ void calculatePaths() {
var pathToPickup = mockCalcLeastCostPath(beforePickupLink, pickupLink, request.getEarliestStartTime(), 11);
var pathFromPickup = mockCalcLeastCostPath(pickupLink, afterPickupLink, request.getEarliestStartTime(), 22);
var pathToDropoff = mockCalcLeastCostPath(beforeDropoffLink, dropoffLink, request.getLatestArrivalTime(), 33);
@@ -99,7 +99,7 @@ public void calculatePaths() {
}
@Test
- public void calculatePaths_dropoffAfterPickup_dropoffAtEnd() {
+ void calculatePaths_dropoffAfterPickup_dropoffAtEnd() {
//compute only 2 paths (instead of 4)
var pathToPickup = mockCalcLeastCostPath(beforePickupLink, pickupLink, request.getEarliestStartTime(), 11);
var pathFromPickup = mockCalcLeastCostPath(pickupLink, dropoffLink, request.getEarliestStartTime(), 22);
@@ -120,7 +120,7 @@ public void calculatePaths_dropoffAfterPickup_dropoffAtEnd() {
}
@Test
- public void calculatePaths_noDetours() {
+ void calculatePaths_noDetours() {
var pickup = insertionPoint(waypoint(pickupLink), waypoint(pickupLink));
var dropoff = insertionPoint(waypoint(dropoffLink), waypoint(dropoffLink));
var insertion = new Insertion(null, pickup, dropoff);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/demandestimator/PreviousIterationDrtDemandEstimatorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/demandestimator/PreviousIterationDrtDemandEstimatorTest.java
index 7a155267da4..954959480ba 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/demandestimator/PreviousIterationDrtDemandEstimatorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/demandestimator/PreviousIterationDrtDemandEstimatorTest.java
@@ -24,7 +24,7 @@
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.TransportMode;
@@ -51,7 +51,7 @@ public class PreviousIterationDrtDemandEstimatorTest {
private final DrtZonalSystem zonalSystem = new DrtZonalSystem(List.of(zone1, zone2));
@Test
- public void noDepartures() {
+ void noDepartures() {
PreviousIterationDrtDemandEstimator estimator = createEstimator();
//no events in previous iterations
@@ -66,7 +66,7 @@ public void noDepartures() {
}
@Test
- public void drtDepartures() {
+ void drtDepartures() {
PreviousIterationDrtDemandEstimator estimator = createEstimator();
//time bin 0-1800
@@ -101,7 +101,7 @@ public void drtDepartures() {
}
@Test
- public void nonDrtDepartures() {
+ void nonDrtDepartures() {
PreviousIterationDrtDemandEstimator estimator = createEstimator();
estimator.handleEvent(departureEvent(100, link1, "mode X"));
@@ -113,7 +113,7 @@ public void nonDrtDepartures() {
}
@Test
- public void currentCountsAreCopiedToPreviousAfterReset() {
+ void currentCountsAreCopiedToPreviousAfterReset() {
PreviousIterationDrtDemandEstimator estimator = createEstimator();
estimator.handleEvent(departureEvent(100, link1, TransportMode.drt));
@@ -129,7 +129,7 @@ public void currentCountsAreCopiedToPreviousAfterReset() {
}
@Test
- public void timeBinsAreRespected() {
+ void timeBinsAreRespected() {
PreviousIterationDrtDemandEstimator estimator = createEstimator();
estimator.handleEvent(departureEvent(100, link1, TransportMode.drt));
@@ -147,7 +147,7 @@ public void timeBinsAreRespected() {
}
@Test
- public void noTimeLimitIsImposed() {
+ void noTimeLimitIsImposed() {
PreviousIterationDrtDemandEstimator estimator = createEstimator();
estimator.handleEvent(departureEvent(10000000, link1, TransportMode.drt));
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/targetcalculator/EqualVehicleDensityTargetCalculatorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/targetcalculator/EqualVehicleDensityTargetCalculatorTest.java
index b37ef0d10f1..4f51cb334a5 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/targetcalculator/EqualVehicleDensityTargetCalculatorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/targetcalculator/EqualVehicleDensityTargetCalculatorTest.java
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.function.ToDoubleFunction;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Network;
import org.matsim.contrib.drt.analysis.zonal.DrtGridUtils;
@@ -57,21 +57,21 @@ public class EqualVehicleDensityTargetCalculatorTest {
DrtGridUtils.createGridFromNetwork(network, 500.));
@Test
- public void calculate_oneVehiclePerZone() {
+ void calculate_oneVehiclePerZone() {
var targetFunction = new EqualVehicleDensityTargetCalculator(zonalSystem,
createFleetSpecification(8)).calculate(0, Map.of());
zonalSystem.getZones().keySet().forEach(id -> assertTarget(targetFunction, zonalSystem, id, 1));
}
@Test
- public void calculate_lessVehiclesThanZones() {
+ void calculate_lessVehiclesThanZones() {
var targetFunction = new EqualVehicleDensityTargetCalculator(zonalSystem,
createFleetSpecification(7)).calculate(0, Map.of());
zonalSystem.getZones().keySet().forEach(id -> assertTarget(targetFunction, zonalSystem, id, 7. / 8));
}
@Test
- public void calculate_moreVehiclesThanZones() {
+ void calculate_moreVehiclesThanZones() {
var targetFunction = new EqualVehicleDensityTargetCalculator(zonalSystem,
createFleetSpecification(9)).calculate(0, Map.of());
zonalSystem.getZones().keySet().forEach(id -> assertTarget(targetFunction, zonalSystem, id, 9. / 8));
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/targetcalculator/EqualVehiclesToPopulationRatioTargetCalculatorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/targetcalculator/EqualVehiclesToPopulationRatioTargetCalculatorTest.java
index e27e9850b96..7d1044fcd6e 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/targetcalculator/EqualVehiclesToPopulationRatioTargetCalculatorTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/optimizer/rebalancing/targetcalculator/EqualVehiclesToPopulationRatioTargetCalculatorTest.java
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.function.ToDoubleFunction;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.api.core.v01.network.Network;
@@ -66,7 +66,7 @@ public class EqualVehiclesToPopulationRatioTargetCalculatorTest {
private final PopulationFactory factory = population.getFactory();
@Test
- public void testCalculate_oneVehiclePerZone() {
+ void testCalculate_oneVehiclePerZone() {
initPopulation(Map.of("2", 1, "4", 1, "8", 1));
var targetFunction = new EqualVehiclesToPopulationRatioTargetCalculator(zonalSystem, population,
createFleetSpecification(8)).calculate(0, Map.of());
@@ -82,7 +82,7 @@ public void testCalculate_oneVehiclePerZone() {
}
@Test
- public void testCalculate_twoVehiclesPerZone() {
+ void testCalculate_twoVehiclesPerZone() {
initPopulation(Map.of("2", 1, "4", 1, "8", 1));
var targetFunction = new EqualVehiclesToPopulationRatioTargetCalculator(zonalSystem, population,
createFleetSpecification(16)).calculate(0, Map.of());
@@ -98,7 +98,7 @@ public void testCalculate_twoVehiclesPerZone() {
}
@Test
- public void testCalculate_noPopulation() {
+ void testCalculate_noPopulation() {
initPopulation(Map.of());
var targetFunction = new EqualVehiclesToPopulationRatioTargetCalculator(zonalSystem, population,
createFleetSpecification(16)).calculate(0, Map.of());
@@ -114,7 +114,7 @@ public void testCalculate_noPopulation() {
}
@Test
- public void testCalculate_unevenDistributionOfActivitiesInPopulatedZones() {
+ void testCalculate_unevenDistributionOfActivitiesInPopulatedZones() {
initPopulation(Map.of("2", 2, "4", 4, "8", 8));
var targetFunction = new EqualVehiclesToPopulationRatioTargetCalculator(zonalSystem, population,
createFleetSpecification(16)).calculate(0, Map.of());
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/AbandonAndCancelTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/AbandonAndCancelTest.java
index c3dc7f546b0..61241d7c293 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/AbandonAndCancelTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/AbandonAndCancelTest.java
@@ -1,10 +1,10 @@
package org.matsim.contrib.drt.prebooking;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.population.Leg;
import org.matsim.contrib.drt.prebooking.PrebookingTestEnvironment.RequestInfo;
@@ -21,11 +21,11 @@
* @author Sebastian Hörl (sebhoerl) / IRT SystemX
*/
public class AbandonAndCancelTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
-
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
+
@Test
- public void noAbandonTest() {
+ void noAbandonTest() {
/*
* One person requests to depart at 2000 and also is there at 2000. Another
* person asks also to depart at 2000, but only arrives at 4000, i.e. the person
@@ -59,12 +59,12 @@ public void noAbandonTest() {
}
@Test
- public void abandonTest() {
+ void abandonTest() {
/*
* One person requests to depart at 2000 and also is there at 2000. Another
* person asks also to depart at 2000, but only arrives at 4000, i.e. the person
* has 1000s delay.
- *
+ *
* We configure that the vehicle should leave without the passenger if it waits
* longer than 500s. The late request will be rejected!
*/
@@ -98,12 +98,12 @@ public void abandonTest() {
}
@Test
- public void abandonThenImmediateTest() {
+ void abandonThenImmediateTest() {
/*
* One person requests to depart at 2000 and also is there at 2000. Another
* person asks also to depart at 2000, but only arrives at 4000, i.e. the person
* has 1000s delay.
- *
+ *
* We configure that the vehicle should leave without the passenger if it waits
* longer than 500s. The person will, however, send a new request when arriving
* at the departure point and get an immediate vehicle.
@@ -141,12 +141,12 @@ public void abandonThenImmediateTest() {
}
@Test
- public void cancelEarlyTest() {
+ void cancelEarlyTest() {
/*
* One person requests to depart at 2000 and also is there at 2000. Another
* person asks also to depart at 2000, but only arrives at 4000, i.e. the person
* has 1000s delay.
- *
+ *
* In this test we manually cancel the second request at 500.0 (so before
* departure of any agent).
*/
@@ -174,9 +174,9 @@ public void notifyMobsimBeforeSimStep(MobsimBeforeSimStepEvent e) {
if (e.getSimulationTime() == 500.0) {
PlanAgent planAgent = (PlanAgent) qsim.getAgents()
.get(Id.createPersonId("personLate"));
-
+
Leg leg = TripStructureUtils.getLegs(planAgent.getCurrentPlan()).get(1);
-
+
prebookingManager.cancel(leg);
}
}
@@ -202,14 +202,14 @@ public void notifyMobsimBeforeSimStep(MobsimBeforeSimStepEvent e) {
assertTrue(requestInfo.rejected);
}
}
-
+
@Test
- public void cancelLateTest() {
+ void cancelLateTest() {
/*
* One person requests to depart at 2000 and also is there at 2000. Another
* person asks also to depart at 2000, but only arrives at 4000, i.e. the person
* has 1000s delay.
- *
+ *
* In this test we manually cancel the second request at 3000.0 (so after
* departure of the first agent).
*/
@@ -237,9 +237,9 @@ public void notifyMobsimBeforeSimStep(MobsimBeforeSimStepEvent e) {
if (e.getSimulationTime() == 3000.0) {
PlanAgent planAgent = (PlanAgent) qsim.getAgents()
.get(Id.createPersonId("personLate"));
-
+
Leg leg = TripStructureUtils.getLegs(planAgent.getCurrentPlan()).get(1);
-
+
prebookingManager.cancel(leg);
}
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/ComplexUnschedulerTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/ComplexUnschedulerTest.java
index 84c3ada7791..93a59a769bd 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/ComplexUnschedulerTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/ComplexUnschedulerTest.java
@@ -1,14 +1,14 @@
package org.matsim.contrib.drt.prebooking;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
@@ -55,7 +55,7 @@
*/
public class ComplexUnschedulerTest {
@Test
- public void testDirectDropoffAfterPickup() {
+ void testDirectDropoffAfterPickup() {
Fixture fixture = new Fixture();
Schedule schedule = fixture.schedule;
@@ -115,7 +115,7 @@ public void testDirectDropoffAfterPickup() {
}
@Test
- public void testStandardSituation() {
+ void testStandardSituation() {
Fixture fixture = new Fixture();
Schedule schedule = fixture.schedule;
@@ -179,7 +179,7 @@ public void testStandardSituation() {
}
@Test
- public void testRemoveAtEnd() {
+ void testRemoveAtEnd() {
Fixture fixture = new Fixture();
Schedule schedule = fixture.schedule;
@@ -244,7 +244,7 @@ public void testRemoveAtEnd() {
}
@Test
- public void testRemoveAtBeginningWithWaitSecond() {
+ void testRemoveAtBeginningWithWaitSecond() {
Fixture fixture = new Fixture();
Schedule schedule = fixture.schedule;
@@ -310,7 +310,7 @@ public void testRemoveAtBeginningWithWaitSecond() {
}
@Test
- public void testRemoveAtBeginningWithWaitFirst() {
+ void testRemoveAtBeginningWithWaitFirst() {
Fixture fixture = new Fixture();
Schedule schedule = fixture.schedule;
@@ -374,7 +374,7 @@ public void testRemoveAtBeginningWithWaitFirst() {
}
@Test
- public void testRemoveAtBeginningWithDriveDiversion() {
+ void testRemoveAtBeginningWithDriveDiversion() {
Fixture fixture = new Fixture();
Schedule schedule = fixture.schedule;
@@ -451,7 +451,7 @@ public void testRemoveAtBeginningWithDriveDiversion() {
}
@Test
- public void testRemoveAllStartWithWait() {
+ void testRemoveAllStartWithWait() {
Fixture fixture = new Fixture();
Schedule schedule = fixture.schedule;
@@ -484,7 +484,7 @@ public void testRemoveAllStartWithWait() {
}
@Test
- public void testRemoveAllStartWithDrive() {
+ void testRemoveAllStartWithDrive() {
Fixture fixture = new Fixture();
Schedule schedule = fixture.schedule;
@@ -541,16 +541,16 @@ private static void assertTasks(Schedule schedule, List reference
Task task = schedule.getTasks().get(i);
ReferenceTask reference = references.get(i);
- assertEquals("wrong type in task " + i, reference.taskType, task.getClass());
- assertEquals("wrong begin time in task " + i, reference.startTime, task.getBeginTime(), 1e-3);
- assertEquals("wrong end time in task " + i, reference.endTime, task.getEndTime(), 1e-3);
+ assertEquals(reference.taskType, task.getClass(), "wrong type in task " + i);
+ assertEquals(reference.startTime, task.getBeginTime(), 1e-3, "wrong begin time in task " + i);
+ assertEquals(reference.endTime, task.getEndTime(), 1e-3, "wrong end time in task " + i);
if (i > 0) {
- assertEquals("wrong transition from " + (i - 1) + " to " + i, schedule.getTasks().get(i).getBeginTime(),
- schedule.getTasks().get(i - 1).getEndTime(), 1e-3);
+ assertEquals(schedule.getTasks().get(i).getBeginTime(),
+ schedule.getTasks().get(i - 1).getEndTime(), 1e-3, "wrong transition from " + (i - 1) + " to " + i);
}
- assertTrue("invalid task " + i, task.getEndTime() >= task.getBeginTime());
+ assertTrue(task.getEndTime() >= task.getBeginTime(), "invalid task " + i);
}
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PersonStuckPrebookingTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PersonStuckPrebookingTest.java
index 11d3951b632..4245cd4b4ca 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PersonStuckPrebookingTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PersonStuckPrebookingTest.java
@@ -1,13 +1,13 @@
package org.matsim.contrib.drt.prebooking;
-import static org.junit.Assert.assertEquals;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.Set;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.population.Activity;
import org.matsim.api.core.v01.population.Leg;
@@ -37,11 +37,11 @@
* @author Sebastian Hörl (sebhoerl) / IRT SystemX
*/
public class PersonStuckPrebookingTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void baselineTest() {
+ void baselineTest() {
/*
* Agent personA is performing three drt legs during the day. Agent personB does
* exactly the same in parallel, both prebook their requests.
@@ -72,7 +72,7 @@ public void baselineTest() {
}
@Test
- public void cancelTest() {
+ void cancelTest() {
/*
* Agent personA is performing three drt legs during the day. Agent personB does
* exactly the same in parallel, both prebook there requests.
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PrebookingTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PrebookingTest.java
index 35d9a0ef62b..cb149fc1f3b 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PrebookingTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/prebooking/PrebookingTest.java
@@ -1,9 +1,9 @@
package org.matsim.contrib.drt.prebooking;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.contrib.drt.prebooking.PrebookingTestEnvironment.RequestInfo;
import org.matsim.contrib.drt.prebooking.logic.AttributeBasedPrebookingLogic;
import org.matsim.contrib.drt.run.DrtConfigGroup;
@@ -14,11 +14,11 @@
* @author Sebastian Hörl (sebhoerl) / IRT SystemX
*/
public class PrebookingTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
-
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
+
@Test
- public void withoutPrebookedRequests() {
+ void withoutPrebookedRequests() {
/*-
* Standard test running with prebooking but without any prebooked requests
*/
@@ -49,7 +49,7 @@ public void withoutPrebookedRequests() {
assertEquals(2086.0, taskInfo.get(2).startTime, 1e-3);
assertEquals(2146.0, taskInfo.get(2).endTime, 1e-3);
}
-
+
static PrebookingParams installPrebooking(Controler controller) {
return installPrebooking(controller, true);
}
@@ -57,16 +57,16 @@ static PrebookingParams installPrebooking(Controler controller) {
static PrebookingParams installPrebooking(Controler controller, boolean installLogic) {
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(controller.getConfig());
drtConfig.addParameterSet(new PrebookingParams());
-
+
if (installLogic) {
AttributeBasedPrebookingLogic.install(controller, drtConfig);
}
-
+
return drtConfig.getPrebookingParams().get();
}
@Test
- public void oneRequestArrivingLate() {
+ void oneRequestArrivingLate() {
/*-
* One request arriving after the requested departure time. Vehicle should wait
* and depart with appropriate delay (taking into account a fixed duration for
@@ -105,7 +105,7 @@ public void oneRequestArrivingLate() {
}
@Test
- public void oneRequestArrivingEarly() {
+ void oneRequestArrivingEarly() {
/*-
* One request arriving in advance before the requested departure time. Vehicle
* will pickup up agent and then depart after the duration to enter the vehicle.
@@ -143,7 +143,7 @@ public void oneRequestArrivingEarly() {
}
@Test
- public void twoSequentialRequests() {
+ void twoSequentialRequests() {
/*-
* Two requests that are scheduled in advance.
* - First the early one is submitted, then the late one
@@ -176,7 +176,7 @@ public void twoSequentialRequests() {
}
@Test
- public void twoSequentialRequests_inverseSubmission() {
+ void twoSequentialRequests_inverseSubmission() {
/*-
* Two requests that are scheduled in advance.
* - First the late one is submitted, then the early one (inverse of above test).
@@ -210,9 +210,9 @@ public void twoSequentialRequests_inverseSubmission() {
}
@Test
- public void sameTrip_differentDepartureTime() {
+ void sameTrip_differentDepartureTime() {
/*-
- * Two requests with the same origin and destination, but distinct departure time.
+ * Two requests with the same origin and destination, but distinct departure time.
* - First, early one is submitted, then late one.
* - Vehicle picks up and drops off early one, then late one.
* - In total four stops (P,D,P,D)
@@ -248,9 +248,9 @@ public void sameTrip_differentDepartureTime() {
}
@Test
- public void sameTrip_sameDepartureTime() {
+ void sameTrip_sameDepartureTime() {
/*-
- * Two requests with the same origin and destination, and same departure time.
+ * Two requests with the same origin and destination, and same departure time.
* - First, A is submitted, then B.
* - Vehicle picks up and A and B, then drops off A and B.
* - In total two stops (P,D)
@@ -286,7 +286,7 @@ public void sameTrip_sameDepartureTime() {
}
@Test
- public void sameTrip_extendPickupDuration() {
+ void sameTrip_extendPickupDuration() {
/*-
* Two requests with the same origin and destination, different departure times.
* - First, A is submitted with departure time 2000
@@ -330,7 +330,7 @@ public void sameTrip_extendPickupDuration() {
}
@Test
- public void sameTrip_splitPickup() {
+ void sameTrip_splitPickup() {
/*-
* Two requests with the same origin and destination, different departure times.
* - First, A is submitted with departure time 2000
@@ -377,31 +377,31 @@ public void sameTrip_splitPickup() {
}
@Test
- public void sameTrip_inverseSubmission_noPrepending() {
+ void sameTrip_inverseSubmission_noPrepending() {
/*-
* Two requests with the same origin and destination, different departure times.
* - First, A is submitted with departure time 2020
* - Then, B is submitted with departure time 2000
- *
- * - This is inverse of sameTrip_extendPickupDuration above, the request with the earlier departure
+ *
+ * - This is inverse of sameTrip_extendPickupDuration above, the request with the earlier departure
* time is submitted second.
* - We would expect the requests to be merged, but this is not so trivial with the current code base:
- * It would be necessary to shift the stop task to the past and extend it. Theoretically, this is
+ * It would be necessary to shift the stop task to the past and extend it. Theoretically, this is
* possible but it would be nice to embed this in a more robust way in the code base.
* - Plus, it may change the current DRT behavior because we have these situations also in non-prebooked
* simulations: We may submit an immediate request and find an insertion for a stop task that starts
- * in 5 seconds. This case is treated in standard DRT as any other request (extending the task but
+ * in 5 seconds. This case is treated in standard DRT as any other request (extending the task but
* keeping the start time fixed).
- * - We follow this default behaviour here: Instead of *prepending* the task with the new request, we
+ * - We follow this default behaviour here: Instead of *prepending* the task with the new request, we
* *append* it as usual. If there is at least one pickup in the stop task with the standard stop
* durations, there is no additional cost of adding the request, but the person experiences a wait
* delay that could be minimized if we were able to prepend the task.
* - (Then again, do we actually want to do this, it would reserve the vehicle a few seconds more than
* necessary for a stop that is potentially prebooked in a long time).
- *
+ *
* - Expected behavior in current implementation: Merge new request with the later departing existing
* one, which generates wait time for the customer.
- *
+ *
* - In total two stops (P, D)
*/
@@ -435,17 +435,17 @@ public void sameTrip_inverseSubmission_noPrepending() {
}
@Test
- public void sameTrip_inverseSubmission_splitPickup() {
+ void sameTrip_inverseSubmission_splitPickup() {
/*-
* Two requests with the same origin and destination, different departure times.
- * - First, A is submitted with departure time 2020
+ * - First, A is submitted with departure time 2020
* - Then, B is submitted with departure time 1770
- * - B's departure is 250s before A, so appending it to A would lead to more than 300s
+ * - B's departure is 250s before A, so appending it to A would lead to more than 300s
* of wait time, which is not a valid insertion
* - Hence, the insertion *after* the pickup of A is not valid
* - But the insertion *before* A is possible (it is usually evaluated but dominated by the insertion after)
* - TODO: May think this through and eliminate these insertion upfront
- *
+ *
* - Expectation: Standard scheduling a prebooked request before another one (as if they had not the
* same origin link).
* - In total three stops (P,P,D)
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/routing/DrtRoutingModuleTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/routing/DrtRoutingModuleTest.java
index 365c5e04dff..e4d242dabcf 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/routing/DrtRoutingModuleTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/routing/DrtRoutingModuleTest.java
@@ -22,9 +22,9 @@
import java.util.Arrays;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
@@ -66,11 +66,11 @@
* @author jbischoff
*/
public class DrtRoutingModuleTest {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testCottbusClosestAccessEgressStopFinder() {
+ void testCottbusClosestAccessEgressStopFinder() {
Scenario scenario = createTestScenario();
ActivityFacilities facilities = scenario.getActivityFacilities();
final double networkTravelSpeed = 0.83333;
@@ -111,7 +111,7 @@ public void testCottbusClosestAccessEgressStopFinder() {
List routedList = dvrpRoutingModule.calcRoute(
DefaultRoutingRequest.withoutAttributes(hf, wf, 8 * 3600, p1));
- Assert.assertEquals(5, routedList.size());
+ Assertions.assertEquals(5, routedList.size());
Leg accessLegP1 = (Leg)routedList.get(0);
GenericRouteImpl accessLegP1Route = (GenericRouteImpl)accessLegP1.getRoute();
@@ -129,32 +129,32 @@ public void testCottbusClosestAccessEgressStopFinder() {
// drt boarding should be at link id 2183 or 2184, not totally clear which one of these (from and to nodes inverted)
// drt alighting should be at link id 5866 or 5867, not totally clear which one of these (from and to nodes inverted)
- Assert.assertEquals(TransportMode.walk, accessLegP1.getMode());
- Assert.assertEquals(Id.createLinkId(3699), accessLegP1Route.getStartLinkId());
- Assert.assertEquals(Id.createLinkId(2184), accessLegP1Route.getEndLinkId());
+ Assertions.assertEquals(TransportMode.walk, accessLegP1.getMode());
+ Assertions.assertEquals(Id.createLinkId(3699), accessLegP1Route.getStartLinkId());
+ Assertions.assertEquals(Id.createLinkId(2184), accessLegP1Route.getEndLinkId());
- Assert.assertEquals(drtMode + " interaction", stageActivityAccessP1.getType());
- Assert.assertEquals(Id.createLinkId(2184), stageActivityAccessP1.getLinkId());
+ Assertions.assertEquals(drtMode + " interaction", stageActivityAccessP1.getType());
+ Assertions.assertEquals(Id.createLinkId(2184), stageActivityAccessP1.getLinkId());
- Assert.assertEquals(drtMode, realDrtLegP1.getMode());
- Assert.assertEquals(Id.createLinkId(2184), realDrtLegP1Route.getStartLinkId());
+ Assertions.assertEquals(drtMode, realDrtLegP1.getMode());
+ Assertions.assertEquals(Id.createLinkId(2184), realDrtLegP1Route.getStartLinkId());
/*
* links 5866 and 5867 are located between the same nodes, so their drt stops should be at the same place place,
* too. Therefore it is not clear which one of these is the right one, as ClosestAccessEgressStopFinder should
* find the nearest drt stop, but both have the same distance from the destination facility.
*/
- Assert.assertTrue(
+ Assertions.assertTrue(
realDrtLegP1Route.getEndLinkId().equals(Id.createLinkId(5866)) || realDrtLegP1Route.getEndLinkId()
.equals(Id.createLinkId(5867)));
Id endLink = realDrtLegP1Route.getEndLinkId();
// Check of other, more drt-specific attributes of the DrtRoute is missing, maybe these should be tested in DrtRoutingModule instead
- Assert.assertEquals(drtMode + " interaction", stageActivityEgressP1.getType());
- Assert.assertEquals(endLink, stageActivityEgressP1.getLinkId());
+ Assertions.assertEquals(drtMode + " interaction", stageActivityEgressP1.getType());
+ Assertions.assertEquals(endLink, stageActivityEgressP1.getLinkId());
- Assert.assertEquals(TransportMode.walk, egressLegP1.getMode());
- Assert.assertEquals(endLink, egressLegP1Route.getStartLinkId());
- Assert.assertEquals(Id.createLinkId(7871), egressLegP1Route.getEndLinkId());
+ Assertions.assertEquals(TransportMode.walk, egressLegP1.getMode());
+ Assertions.assertEquals(endLink, egressLegP1Route.getStartLinkId());
+ Assertions.assertEquals(Id.createLinkId(7871), egressLegP1Route.getEndLinkId());
// case 2: origin and destination outside max walking distance from next stop (>2000m vs. max 200m)
Person p2 = scenario.getPopulation().getPersons().get(Id.createPersonId(2));
@@ -167,7 +167,7 @@ public void testCottbusClosestAccessEgressStopFinder() {
List routedList2 = dvrpRoutingModule.calcRoute(
DefaultRoutingRequest.withoutAttributes(hf2, wf2, 8 * 3600, p2));
- Assert.assertNull(routedList2);
+ Assertions.assertNull(routedList2);
// case 3: origin and destination at the same coordinate, > 2000 m walking distance from next stop
Person p3 = scenario.getPopulation().getPersons().get(Id.createPersonId(3));
@@ -180,7 +180,7 @@ public void testCottbusClosestAccessEgressStopFinder() {
List routedList3 = dvrpRoutingModule.calcRoute(
DefaultRoutingRequest.withoutAttributes(hf3, wf3, 8 * 3600, p3));
- Assert.assertNull(routedList3);
+ Assertions.assertNull(routedList3);
// case 4: origin and destination at the same coordinate, in 200 m walking distance from next stop
Person p4 = scenario.getPopulation().getPersons().get(Id.createPersonId(4));
@@ -193,7 +193,7 @@ public void testCottbusClosestAccessEgressStopFinder() {
List routedList4 = dvrpRoutingModule.calcRoute(
DefaultRoutingRequest.withoutAttributes(hf4, wf4, 8 * 3600, p4));
- Assert.assertNull(routedList4);
+ Assertions.assertNull(routedList4);
// case 5: origin within 200 m walking distance from next stop, but destination outside walking distance
Person p5 = scenario.getPopulation().getPersons().get(Id.createPersonId(5));
@@ -207,7 +207,7 @@ public void testCottbusClosestAccessEgressStopFinder() {
DefaultRoutingRequest.withoutAttributes(hf5, wf5, 8 * 3600, p5));
// TODO: Asserts are prepared for interpreting maxWalkingDistance as a real maximum, but routing still works wrongly
- Assert.assertNull(routedList5);
+ Assertions.assertNull(routedList5);
// case 6: destination within 200 m walking distance from next stop, but origin outside walking distance
Person p6 = scenario.getPopulation().getPersons().get(Id.createPersonId(6));
@@ -221,12 +221,12 @@ public void testCottbusClosestAccessEgressStopFinder() {
DefaultRoutingRequest.withoutAttributes(hf6, wf6, 8 * 3600, p6));
// TODO: Asserts are prepared for interpreting maxWalkingDistance as a real maximum, but routing still works wrongly
- Assert.assertNull(routedList6);
+ Assertions.assertNull(routedList6);
}
@Test
- public void testRouteDescriptionHandling() {
+ void testRouteDescriptionHandling() {
String oldRouteFormat = "600 400";
String newRouteFormat = "{\"maxWaitTime\":600.0,\"directRideTime\":400.0,\"unsharedPath\":[\"a\",\"b\",\"c\"]}";
@@ -243,13 +243,13 @@ public void testRouteDescriptionHandling() {
DrtRoute drtRoute = new DrtRoute(h.getLinkId(), w.getLinkId());
drtRoute.setRouteDescription(oldRouteFormat);
- Assert.assertTrue(drtRoute.getMaxWaitTime() == 600.);
- Assert.assertTrue(drtRoute.getDirectRideTime() == 400);
+ Assertions.assertTrue(drtRoute.getMaxWaitTime() == 600.);
+ Assertions.assertTrue(drtRoute.getDirectRideTime() == 400);
drtRoute.setRouteDescription(newRouteFormat);
- Assert.assertTrue(drtRoute.getMaxWaitTime() == 600.);
- Assert.assertTrue(drtRoute.getDirectRideTime() == 400);
- Assert.assertTrue(drtRoute.getUnsharedPath().equals(Arrays.asList("a", "b", "c")));
+ Assertions.assertTrue(drtRoute.getMaxWaitTime() == 600.);
+ Assertions.assertTrue(drtRoute.getDirectRideTime() == 400);
+ Assertions.assertTrue(drtRoute.getUnsharedPath().equals(Arrays.asList("a", "b", "c")));
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/routing/MultiModeDrtMainModeIdentifierTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/routing/MultiModeDrtMainModeIdentifierTest.java
index d9af16f9896..cfdc3002eee 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/routing/MultiModeDrtMainModeIdentifierTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/routing/MultiModeDrtMainModeIdentifierTest.java
@@ -3,8 +3,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.TransportMode;
import org.matsim.api.core.v01.population.Activity;
@@ -21,7 +21,7 @@
public class MultiModeDrtMainModeIdentifierTest {
@Test
- public void test() {
+ void test() {
DrtConfigGroup drtConfigGroup = new DrtConfigGroup();
String drtMode = "drt";
drtConfigGroup.mode = drtMode;
@@ -34,13 +34,13 @@ public void test() {
List testElements = new ArrayList<>();
Leg l1 = PopulationUtils.createLeg(TransportMode.car);
testElements.add(l1);
- Assert.assertEquals(TransportMode.car, mmi.identifyMainMode(testElements));
+ Assertions.assertEquals(TransportMode.car, mmi.identifyMainMode(testElements));
}
{
List testElements = new ArrayList<>();
Leg l1 = PopulationUtils.createLeg(drtMode);
testElements.add(l1);
- Assert.assertEquals(drtMode, mmi.identifyMainMode(testElements));
+ Assertions.assertEquals(drtMode, mmi.identifyMainMode(testElements));
}
{
String drtStageActivityType = ScoringConfigGroup.createStageActivityType(drtMode);
@@ -58,7 +58,7 @@ public void test() {
testElements.add(l2);
testElements.add(a3);
testElements.add(l3);
- Assert.assertEquals(drtMode, mmi.identifyMainMode(testElements));
+ Assertions.assertEquals(drtMode, mmi.identifyMainMode(testElements));
}
}
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunDrtExampleIT.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunDrtExampleIT.java
index b95f6d8de61..e3ac88d4985 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunDrtExampleIT.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunDrtExampleIT.java
@@ -20,7 +20,7 @@
package org.matsim.contrib.drt.run.examples;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.net.URL;
@@ -30,9 +30,8 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.drt.optimizer.DrtRequestInsertionRetryParams;
import org.matsim.contrib.drt.optimizer.insertion.repeatedselective.RepeatedSelectiveInsertionSearchParams;
@@ -72,11 +71,11 @@
*/
public class RunDrtExampleIT {
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
@Test
- public void testRunDrtExampleWithNoRejections_ExtensiveSearch() {
+ void testRunDrtExampleWithNoRejections_ExtensiveSearch() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_drt_config.xml");
Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
@@ -103,7 +102,7 @@ public void testRunDrtExampleWithNoRejections_ExtensiveSearch() {
}
@Test
- public void testRunDrtExampleWithNoRejections_SelectiveSearch() {
+ void testRunDrtExampleWithNoRejections_SelectiveSearch() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_drt_config.xml");
Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
@@ -137,7 +136,7 @@ public void testRunDrtExampleWithNoRejections_SelectiveSearch() {
}
@Test
- public void testRunDrtExampleWithNoRejections_RepeatedSelectiveSearch() {
+ void testRunDrtExampleWithNoRejections_RepeatedSelectiveSearch() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_drt_config.xml");
Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
@@ -172,7 +171,7 @@ public void testRunDrtExampleWithNoRejections_RepeatedSelectiveSearch() {
}
@Test
- public void testRunDrtExampleWithRequestRetry() {
+ void testRunDrtExampleWithRequestRetry() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_drt_config.xml");
Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
@@ -201,7 +200,7 @@ public void testRunDrtExampleWithRequestRetry() {
}
@Test
- public void testRunDrtStopbasedExample() {
+ void testRunDrtStopbasedExample() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"),
"mielec_stop_based_drt_config.xml");
@@ -224,7 +223,7 @@ public void testRunDrtStopbasedExample() {
}
@Test
- public void testRunDrtStopbasedExampleWithFlexibleStopDuration() {
+ void testRunDrtStopbasedExampleWithFlexibleStopDuration() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"),
"mielec_stop_based_drt_config.xml");
@@ -259,7 +258,7 @@ public void install() {
}
@Test
- public void testRunServiceAreabasedExampleWithSpeedUp() {
+ void testRunServiceAreabasedExampleWithSpeedUp() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"),
"mielec_serviceArea_based_drt_config.xml");
@@ -282,7 +281,7 @@ public void testRunServiceAreabasedExampleWithSpeedUp() {
}
@Test
- public void testRunDrtExampleWithIncrementalStopDuration() {
+ void testRunDrtExampleWithIncrementalStopDuration() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"), "mielec_drt_config.xml");
Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
@@ -319,30 +318,30 @@ public void install() {
verifyDrtCustomerStatsCloseToExpectedStats(utils.getOutputDirectory(), expectedStats);
}
-
+
@Test
- public void testRunDrtWithPrebooking() {
+ void testRunDrtWithPrebooking() {
Id.resetCaches();
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("mielec"),
"mielec_drt_config.xml");
-
+
Config config = ConfigUtils.loadConfig(configUrl, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(),
new OTFVisConfigGroup());
config.controller().setOverwriteFileSetting(OverwriteFileSetting.deleteDirectoryIfExists);
config.controller().setOutputDirectory(utils.getOutputDirectory());
-
+
DrtConfigGroup drtConfig = DrtConfigGroup.getSingleModeDrtConfig(config);
drtConfig.addParameterSet(new PrebookingParams());
-
+
Controler controller = DrtControlerCreator.createControler(config, false);
ProbabilityBasedPrebookingLogic.install(controller, drtConfig, 0.5, 4.0 * 3600.0);
-
+
PrebookingTracker tracker = new PrebookingTracker();
tracker.install(controller);
-
+
controller.run();
-
+
assertEquals(157, tracker.immediateScheduled);
assertEquals(205, tracker.prebookedScheduled);
assertEquals(26, tracker.immediateRejected);
@@ -467,13 +466,13 @@ public Stats build() {
}
}
}
-
+
static private class PrebookingTracker implements PassengerRequestRejectedEventHandler, PassengerRequestScheduledEventHandler {
int immediateScheduled = 0;
int prebookedScheduled = 0;
int immediateRejected = 0;
int prebookedRejected = 0;
-
+
@Override
public void handleEvent(PassengerRequestScheduledEvent event) {
if (event.getRequestId().toString().contains("prebooked")) {
@@ -491,10 +490,10 @@ public void handleEvent(PassengerRequestRejectedEvent event) {
immediateRejected++;
}
}
-
+
void install(Controler controller) {
PrebookingTracker thisTracker = this;
-
+
controller.addOverridingModule(new AbstractModule() {
@Override
public void install() {
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunMultiModeDrtExampleIT.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunMultiModeDrtExampleIT.java
index 88aae448e87..b5bdb9ca19a 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunMultiModeDrtExampleIT.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunMultiModeDrtExampleIT.java
@@ -22,13 +22,13 @@
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
public class RunMultiModeDrtExampleIT {
@Test
- public void testRun() {
+ void testRun() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"),
"multi_mode_one_shared_taxi_config.xml");
RunMultiModeDrtExample.run(configUrl, false, 0);
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunOneSharedTaxiExampleIT.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunOneSharedTaxiExampleIT.java
index db6373e49be..eaa173d1466 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunOneSharedTaxiExampleIT.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/run/examples/RunOneSharedTaxiExampleIT.java
@@ -20,7 +20,7 @@
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
@@ -29,7 +29,7 @@
*/
public class RunOneSharedTaxiExampleIT {
@Test
- public void testRun() {
+ void testRun() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"), "one_shared_taxi_config.xml");
RunOneSharedTaxiExample.run(configUrl, false, 1);
}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/sharingmetrics/SharingFactorTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/sharingmetrics/SharingFactorTest.java
new file mode 100644
index 00000000000..b731cedf080
--- /dev/null
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/sharingmetrics/SharingFactorTest.java
@@ -0,0 +1,205 @@
+package org.matsim.contrib.drt.sharingmetrics;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.population.Person;
+import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
+import org.matsim.contrib.dvrp.optimizer.Request;
+import org.matsim.contrib.dvrp.passenger.PassengerDroppedOffEvent;
+import org.matsim.contrib.dvrp.passenger.PassengerPickedUpEvent;
+import org.matsim.core.events.ParallelEventsManager;
+import org.matsim.testcases.MatsimTestUtils;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author nkuehnel / MOIA
+ */
+public class SharingFactorTest {
+
+ /**
+ * Test method for {@link SharingMetricsTracker}.
+ */
+ @Test
+ public void testDrtSharingFactorHandler() {
+ String mode = "mode_0";
+
+ var vehicleId = Id.create("v1", DvrpVehicle.class);
+ var personId1 = Id.createPersonId("p1");
+ var personId2 = Id.createPersonId("p2");
+
+
+ Set> groupRepresentatives = new HashSet<>();
+
+ // two separate bookings
+ groupRepresentatives.add(personId1);
+ groupRepresentatives.add(personId2);
+
+
+ ParallelEventsManager events = new ParallelEventsManager(false);
+ SharingMetricsTracker sharingFactorTracker = new SharingMetricsTracker(new SharingMetricsTracker.GroupPredicate() {
+ @Override
+ public boolean isGroupRepresentative(Id personId) {
+ return groupRepresentatives.contains(personId);
+ }
+ });
+ events.addHandler(sharingFactorTracker);
+
+ events.initProcessing();
+
+
+ {
+ //single trip, no pooling
+ var requestId = Id.create(0, Request.class);
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId));
+
+ events.processEvent(new PassengerPickedUpEvent(100.0, mode, requestId, personId1, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(300.0, mode, requestId, personId1, vehicleId));
+ events.flush();
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId));
+ Assertions.assertFalse(sharingFactorTracker.getPoolingRates().get(requestId));
+ Assertions.assertEquals(1., sharingFactorTracker.getSharingFactors().get(requestId), MatsimTestUtils.EPSILON);
+ }
+
+ //clean up
+ sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+
+ {
+ //two trips exactly after each other, no pooling
+ var requestId1 = Id.create(0, Request.class);
+ var requestId2 = Id.create(1, Request.class);
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+
+ events.processEvent(new PassengerPickedUpEvent(100.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(300.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerPickedUpEvent(300.0, mode, requestId2, personId2, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(500.0, mode, requestId2, personId2, vehicleId));
+ events.flush();
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId1));
+ Assertions.assertFalse(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertEquals(1., sharingFactorTracker.getSharingFactors().get(requestId1), MatsimTestUtils.EPSILON);
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId2));
+ Assertions.assertFalse(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertEquals(1., sharingFactorTracker.getSharingFactors().get(requestId2), MatsimTestUtils.EPSILON);
+ }
+
+ //clean up
+ sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+
+ {
+ //two trips overlap half of the time
+ var requestId1 = Id.create(0, Request.class);
+ var requestId2 = Id.create(1, Request.class);
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+
+ events.processEvent(new PassengerPickedUpEvent(100.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerPickedUpEvent(200.0, mode, requestId2, personId2, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(300.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(400.0, mode, requestId2, personId2, vehicleId));
+ events.flush();
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId1));
+ Assertions.assertTrue(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertEquals((100. + 100.) / (100 + 50), sharingFactorTracker.getSharingFactors().get(requestId1), MatsimTestUtils.EPSILON);
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId2));
+ Assertions.assertTrue(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertEquals((100. + 100.) / (50 + 100), sharingFactorTracker.getSharingFactors().get(requestId2), MatsimTestUtils.EPSILON);
+ }
+
+
+ //clean up
+ sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+
+ {
+ // second trip (sharing factor = 2) happens completely within first trip (sharing factor = 1.2)
+ var requestId1 = Id.create(0, Request.class);
+ var requestId2 = Id.create(1, Request.class);
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+
+ events.processEvent(new PassengerPickedUpEvent(100.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerPickedUpEvent(200.0, mode, requestId2, personId2, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(300.0, mode, requestId2, personId2, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(400.0, mode, requestId1, personId1, vehicleId));
+ events.flush();
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId1));
+ Assertions.assertTrue(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertEquals((100. + 100. + 100.) / (100 + 50 + 100), sharingFactorTracker.getSharingFactors().get(requestId1), MatsimTestUtils.EPSILON);
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId2));
+ Assertions.assertTrue(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertEquals((100. ) / (50.), sharingFactorTracker.getSharingFactors().get(requestId2), MatsimTestUtils.EPSILON);
+ }
+
+ //clean up
+ sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+
+ {
+ // two persons share exact same trip but not part of a group
+
+ var requestId1 = Id.create(0, Request.class);
+ var requestId2 = Id.create(1, Request.class);
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+
+ events.processEvent(new PassengerPickedUpEvent(100.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerPickedUpEvent(100.0, mode, requestId2, personId2, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(200.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(200.0, mode, requestId2, personId2, vehicleId));
+ events.flush();
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId1));
+ Assertions.assertTrue(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertEquals(2., sharingFactorTracker.getSharingFactors().get(requestId1), MatsimTestUtils.EPSILON);
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId2));
+ Assertions.assertTrue(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertEquals(2., sharingFactorTracker.getSharingFactors().get(requestId2), MatsimTestUtils.EPSILON);
+ }
+
+
+ //clean up
+ sharingFactorTracker.notifyMobsimBeforeCleanup(null);
+
+ {
+ // two persons part of a group, only person 1 is representative -> not pooled
+ groupRepresentatives.remove(personId2);
+
+ var requestId1 = Id.create(0, Request.class);
+ var requestId2 = Id.create(1, Request.class);
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+
+ events.processEvent(new PassengerPickedUpEvent(100.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerPickedUpEvent(100.0, mode, requestId2, personId2, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(200.0, mode, requestId1, personId1, vehicleId));
+ events.processEvent(new PassengerDroppedOffEvent(200.0, mode, requestId2, personId2, vehicleId));
+ events.flush();
+
+ Assertions.assertNotNull(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertNotNull(sharingFactorTracker.getSharingFactors().get(requestId1));
+ Assertions.assertFalse(sharingFactorTracker.getPoolingRates().get(requestId1));
+ Assertions.assertEquals(1., sharingFactorTracker.getSharingFactors().get(requestId1), MatsimTestUtils.EPSILON);
+
+ Assertions.assertNull(sharingFactorTracker.getPoolingRates().get(requestId2));
+ Assertions.assertNull(sharingFactorTracker.getSharingFactors().get(requestId2));
+ }
+ }
+}
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/speedup/DrtSpeedUpTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/speedup/DrtSpeedUpTest.java
index af92306b69e..1f08cf7c993 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/speedup/DrtSpeedUpTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/speedup/DrtSpeedUpTest.java
@@ -30,8 +30,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.TransportMode;
@@ -72,7 +71,7 @@ public class DrtSpeedUpTest {
private final ControllerConfigGroup controlerConfig = new ControllerConfigGroup();
@Test
- public final void test_computeMovingAverage() {
+ final void test_computeMovingAverage() {
List list = List.of(2., 5., 22.);
assertThat(computeMovingAverage(2, list)).isEqualTo(27. / 2);
assertThat(computeMovingAverage(3, list)).isEqualTo(29. / 3);
@@ -80,7 +79,7 @@ public final void test_computeMovingAverage() {
}
@Test
- public void test_isTeleportDrtUsers() {
+ void test_isTeleportDrtUsers() {
drtSpeedUpParams.fractionOfIterationsSwitchOn = 0.1;
drtSpeedUpParams.fractionOfIterationsSwitchOff = 0.9;
drtSpeedUpParams.intervalDetailedIteration = 10;
@@ -124,7 +123,7 @@ public void test_isTeleportDrtUsers() {
private final DrtEventSequenceCollector requestAnalyzer = mock(DrtEventSequenceCollector.class);
@Test
- public void test_useOnlyInitialEstimates_noRegression() {
+ void test_useOnlyInitialEstimates_noRegression() {
//iters 0 & 100 - simulated, iters 1...99 - teleported
drtSpeedUpParams.fractionOfIterationsSwitchOn = 0.0;
drtSpeedUpParams.fractionOfIterationsSwitchOff = 1.0;
@@ -161,7 +160,7 @@ public void test_useOnlyInitialEstimates_noRegression() {
}
@Test
- public void test_useAveragesFromLastTwoSimulations_noRegression() {
+ void test_useAveragesFromLastTwoSimulations_noRegression() {
//iters 0, 2, 4 - simulated, iters 1, 3 - teleported
drtSpeedUpParams.fractionOfIterationsSwitchOn = 0.0;
drtSpeedUpParams.fractionOfIterationsSwitchOff = 1.0;
@@ -209,7 +208,7 @@ public void test_useAveragesFromLastTwoSimulations_noRegression() {
}
@Test
- public void test_linearRegression() {
+ void test_linearRegression() {
//iters 0, 2, 4 - simulated, iters 1, 3 - teleported
drtSpeedUpParams.fractionOfIterationsSwitchOn = 0.0;
drtSpeedUpParams.fractionOfIterationsSwitchOff = 1.0;
diff --git a/contribs/drt/src/test/java/org/matsim/contrib/drt/util/DrtEventsReadersTest.java b/contribs/drt/src/test/java/org/matsim/contrib/drt/util/DrtEventsReadersTest.java
index 27fcefc3b52..6ba4b41e0c8 100644
--- a/contribs/drt/src/test/java/org/matsim/contrib/drt/util/DrtEventsReadersTest.java
+++ b/contribs/drt/src/test/java/org/matsim/contrib/drt/util/DrtEventsReadersTest.java
@@ -28,7 +28,7 @@
import java.util.Collections;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.events.Event;
import org.matsim.api.core.v01.network.Link;
@@ -72,7 +72,7 @@ public class DrtEventsReadersTest {
taskEnded(70, EmptyVehicleRelocator.RELOCATE_VEHICLE_TASK_TYPE, 3, link2));
@Test
- public void testReader() {
+ void testReader() {
var outputStream = new ByteArrayOutputStream();
EventWriterXML writer = new EventWriterXML(outputStream);
drtEvents.forEach(writer::handleEvent);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/benchmark/DvrpBenchmarkQSimModuleTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/benchmark/DvrpBenchmarkQSimModuleTest.java
index 1571faf0e43..da9b96c0036 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/benchmark/DvrpBenchmarkQSimModuleTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/benchmark/DvrpBenchmarkQSimModuleTest.java
@@ -25,7 +25,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.core.network.NetworkUtils;
import org.matsim.core.router.util.TravelTime;
@@ -36,7 +36,7 @@
*/
public class DvrpBenchmarkQSimModuleTest {
@Test
- public void calcLinkSpeed() {
+ void calcLinkSpeed() {
var link = NetworkUtils.createLink(Id.createLinkId("id"), null, null, null, 150, 15, 10, 1);
var vehicle = mock(Vehicle.class);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxi/RunOneTaxiExampleIT.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxi/RunOneTaxiExampleIT.java
index 0e509daca53..cb490c13c13 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxi/RunOneTaxiExampleIT.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxi/RunOneTaxiExampleIT.java
@@ -21,13 +21,13 @@
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
public class RunOneTaxiExampleIT {
@Test
- public void testRun() {
+ void testRun() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"),
"generic_dvrp_one_taxi_config.xml");
RunOneTaxiExample.run(configUrl, "one_taxi_vehicles.xml", false, 0);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxi/RunOneTaxiWithPrebookingExampleIT.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxi/RunOneTaxiWithPrebookingExampleIT.java
index b6c7e2ed828..b6661027c45 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxi/RunOneTaxiWithPrebookingExampleIT.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxi/RunOneTaxiWithPrebookingExampleIT.java
@@ -32,9 +32,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.assertj.core.data.Offset;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
@@ -68,12 +68,12 @@ public class RunOneTaxiWithPrebookingExampleIT {
private static final Logger log = LogManager.getLogger(RunOneTaxiWithPrebookingExampleIT.class);
- @Rule
- public MatsimTestUtils utils = new MatsimTestUtils();
+ @RegisterExtension
+ private MatsimTestUtils utils = new MatsimTestUtils();
- @Ignore
+ @Disabled
@Test
- public void testRun() {
+ void testRun() {
// load config
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"),
"generic_dvrp_one_taxi_config.xml");
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxionetruck/RunOneTaxiOneTruckExampleIT.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxionetruck/RunOneTaxiOneTruckExampleIT.java
index 8f9ec937f63..10c9373563d 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxionetruck/RunOneTaxiOneTruckExampleIT.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetaxionetruck/RunOneTaxiOneTruckExampleIT.java
@@ -22,13 +22,13 @@
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
public class RunOneTaxiOneTruckExampleIT {
@Test
- public void testRun() {
+ void testRun() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"), "one_taxi_one_truck_config.xml");
RunOneTaxiOneTruckExample.run(configUrl, "one_taxi_vehicles.xml", "one_truck_vehicles.xml", false, 0);
}
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetruck/RunOneTruckExampleIT.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetruck/RunOneTruckExampleIT.java
index 1363005eb93..b43bcac98b5 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetruck/RunOneTruckExampleIT.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/examples/onetruck/RunOneTruckExampleIT.java
@@ -21,13 +21,13 @@
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
public class RunOneTruckExampleIT {
@Test
- public void testRun() {
+ void testRun() {
URL configUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"), "one_truck_config.xml");
RunOneTruckExample.run(configUrl, "one_truck_vehicles.xml", false, 0);
}
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/DefaultPassengerEngineTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/DefaultPassengerEngineTest.java
index db4efe8d602..97579d14517 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/DefaultPassengerEngineTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/DefaultPassengerEngineTest.java
@@ -25,8 +25,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.events.ActivityEndEvent;
import org.matsim.api.core.v01.events.ActivityStartEvent;
@@ -80,7 +79,7 @@ public class DefaultPassengerEngineTest {
private final Fleet fleet = () -> ImmutableMap.of(oneTaxi.getId(), oneTaxi);
@Test
- public void test_valid_served() {
+ void test_valid_served() {
double departureTime = 0;
fixture.addPersonWithLeg(fixture.linkAB, fixture.linkBA, departureTime, fixture.PERSON_ID);
@@ -114,7 +113,7 @@ public void test_valid_served() {
}
@Test
- public void test_invalid_rejected() {
+ void test_invalid_rejected() {
double departureTime = 0;
fixture.addPersonWithLeg(fixture.linkAB, fixture.linkBA, departureTime, fixture.PERSON_ID);
@@ -132,7 +131,7 @@ public void test_invalid_rejected() {
}
@Test
- public void test_valid_rejected() {
+ void test_valid_rejected() {
double departureTime = 0;
fixture.addPersonWithLeg(fixture.linkAB, fixture.linkBA, departureTime, fixture.PERSON_ID);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/GroupPassengerEngineTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/GroupPassengerEngineTest.java
index 2f34014ca2f..9630efb9374 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/GroupPassengerEngineTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/GroupPassengerEngineTest.java
@@ -2,7 +2,7 @@
import com.google.common.collect.ImmutableMap;
import org.apache.commons.compress.utils.Sets;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.events.*;
import org.matsim.api.core.v01.network.Network;
@@ -49,7 +49,7 @@ public class GroupPassengerEngineTest {
private final Fleet fleet = () -> ImmutableMap.of(oneTaxi.getId(), oneTaxi);
@Test
- public void test_group() {
+ void test_group() {
double departureTime = 0;
Id person1 = Id.createPersonId("1");
Id person2 = Id.createPersonId("2");
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/TeleportingPassengerEngineTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/TeleportingPassengerEngineTest.java
index 6d1c3edd7d1..e26364800ab 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/TeleportingPassengerEngineTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/passenger/TeleportingPassengerEngineTest.java
@@ -20,7 +20,7 @@
package org.matsim.contrib.dvrp.passenger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.events.*;
import org.matsim.api.core.v01.network.Network;
@@ -50,7 +50,7 @@ public class TeleportingPassengerEngineTest {
private final PassengerEngineTestFixture fixture = new PassengerEngineTestFixture();
@Test
- public void test_valid_teleported() {
+ void test_valid_teleported() {
double departureTime = 0;
fixture.addPersonWithLeg(fixture.linkAB, fixture.linkBA, departureTime, fixture.PERSON_ID);
@@ -81,7 +81,7 @@ public void test_valid_teleported() {
}
@Test
- public void test_invalid_rejected() {
+ void test_invalid_rejected() {
double departureTime = 0;
fixture.addPersonWithLeg(fixture.linkAB, fixture.linkBA, departureTime, fixture.PERSON_ID);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/LeastCostPathTreeStopCriteriaTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/LeastCostPathTreeStopCriteriaTest.java
index 9b83de3356f..b10829bc365 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/LeastCostPathTreeStopCriteriaTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/LeastCostPathTreeStopCriteriaTest.java
@@ -28,7 +28,7 @@
import java.util.Map;
import java.util.function.IntToDoubleFunction;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.core.router.speedy.LeastCostPathTree.StopCriterion;
import org.matsim.testcases.fakes.FakeNode;
@@ -39,7 +39,7 @@
public class LeastCostPathTreeStopCriteriaTest {
@Test
- public void testAnd() {
+ void testAnd() {
StopCriterion scTrue = (nodeIndex, arrivalTime, travelCost, distance, departureTime) -> true;
StopCriterion scFalse = (nodeIndex, arrivalTime, travelCost, distance, departureTime) -> false;
@@ -51,7 +51,7 @@ public void testAnd() {
}
@Test
- public void testOr() {
+ void testOr() {
StopCriterion scTrue = (nodeIndex, arrivalTime, travelCost, distance, departureTime) -> true;
StopCriterion scFalse = (nodeIndex, arrivalTime, travelCost, distance, departureTime) -> false;
@@ -63,7 +63,7 @@ public void testOr() {
}
@Test
- public void testMaxTravelTime() {
+ void testMaxTravelTime() {
StopCriterion sc = maxTravelTime(100);
//TT is 100 - continue
@@ -74,13 +74,13 @@ public void testMaxTravelTime() {
}
@Test
- public void testAllEndNodesReached_noEndNodes() {
+ void testAllEndNodesReached_noEndNodes() {
assertThatThrownBy(() -> allEndNodesReached(List.of())).isExactlyInstanceOf(IllegalArgumentException.class)
.hasMessage("At least one end node must be provided.");
}
@Test
- public void testAllEndNodesReached_oneEndNode() {
+ void testAllEndNodesReached_oneEndNode() {
var endNode = new FakeNode(Id.createNodeId("end_node"));
var otherNode = new FakeNode(Id.createNodeId("other_node"));
StopCriterion sc = allEndNodesReached(List.of(endNode));
@@ -96,7 +96,7 @@ public void testAllEndNodesReached_oneEndNode() {
}
@Test
- public void testAllEndNodesReached_twoEndNodes() {
+ void testAllEndNodesReached_twoEndNodes() {
var endNode1 = new FakeNode(Id.createNodeId("end_node_1"));
var endNode2 = new FakeNode(Id.createNodeId("end_node_2"));
var otherNode = new FakeNode(Id.createNodeId("other_node"));
@@ -119,13 +119,13 @@ public void testAllEndNodesReached_twoEndNodes() {
}
@Test
- public void testLeastCostEndNodeReached_noEndNodes() {
+ void testLeastCostEndNodeReached_noEndNodes() {
assertThatThrownBy(() -> new LeastCostEndNodeReached(List.of(), value -> 0)).isExactlyInstanceOf(
IllegalArgumentException.class).hasMessage("At least one end node must be provided.");
}
@Test
- public void testLeastCostEndNodeReached_oneEndNode() {
+ void testLeastCostEndNodeReached_oneEndNode() {
var endNodeId = Id.createNodeId("end_node");
var otherNodeId = Id.createNodeId("other_node");
@@ -152,7 +152,7 @@ public void testLeastCostEndNodeReached_oneEndNode() {
}
@Test
- public void testLeastCostEndNodeReached_twoEndNodes_stopBeforeReachingTheOtherEndNode() {
+ void testLeastCostEndNodeReached_twoEndNodes_stopBeforeReachingTheOtherEndNode() {
var endNodeId1 = Id.createNodeId("end_node");
var endNodeId2 = Id.createNodeId("end_node_2");
var otherNodeId = Id.createNodeId("other_node");
@@ -172,7 +172,7 @@ public void testLeastCostEndNodeReached_twoEndNodes_stopBeforeReachingTheOtherEn
}
@Test
- public void testLeastCostEndNodeReached_twoEndNodes_bothVisited_fartherEndNodeWithLowerTotalCost() {
+ void testLeastCostEndNodeReached_twoEndNodes_bothVisited_fartherEndNodeWithLowerTotalCost() {
var endNodeId1 = Id.createNodeId("end_node");
var endNodeId2 = Id.createNodeId("end_node_2");
@@ -192,7 +192,7 @@ public void testLeastCostEndNodeReached_twoEndNodes_bothVisited_fartherEndNodeWi
}
@Test
- public void testLeastCostEndNodeReached_twoEndNodes_noAdditionalCost_stopAfterVisitingFirstEndNode() {
+ void testLeastCostEndNodeReached_twoEndNodes_noAdditionalCost_stopAfterVisitingFirstEndNode() {
var endNodeId1 = Id.createNodeId("end_node");
var endNodeId2 = Id.createNodeId("end_node_2");
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java
index d042fb3c814..2db1640cdf5 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/path/OneToManyPathCalculatorTest.java
@@ -26,8 +26,8 @@
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.IdMap;
@@ -68,7 +68,7 @@ public class OneToManyPathCalculatorTest {
private final LeastCostPathTree dijkstraTree = new LeastCostPathTree(new SpeedyGraph(network), travelTime,
new TimeAsTravelDisutility(travelTime));
- @Before
+ @BeforeEach
public void init() {
for (Node node : List.of(nodeA, nodeB, nodeC, nodeD, nodeE)) {
nodeMap.put(node.getId(), node);
@@ -76,7 +76,7 @@ public void init() {
}
@Test
- public void forward_fromNodeB_toNodeB() {
+ void forward_fromNodeB_toNodeB() {
//forward search starting from nodeB at time 0
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, true, linkAB, 0);
@@ -94,7 +94,7 @@ public void forward_fromNodeB_toNodeB() {
}
@Test
- public void forward_fromNodeB_toNodesBD() {
+ void forward_fromNodeB_toNodesBD() {
//forward search starting from nodeB at time 0
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, true, linkAB, 0);
@@ -109,7 +109,7 @@ public void forward_fromNodeB_toNodesBD() {
}
@Test
- public void forward_fromNodeB_toNodesBD_maxTravelTime() {
+ void forward_fromNodeB_toNodesBD_maxTravelTime() {
//forward search starting from nodeB at time 0
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, true, linkAB, 0);
@@ -124,7 +124,7 @@ public void forward_fromNodeB_toNodesBD_maxTravelTime() {
}
@Test
- public void backward_fromNodeD_toNodeD() {
+ void backward_fromNodeD_toNodeD() {
//backward search starting from nodeD at time 0
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, false, linkDE, 0);
@@ -142,7 +142,7 @@ public void backward_fromNodeD_toNodeD() {
}
@Test
- public void backward_fromNodeD_toNodesBD() {
+ void backward_fromNodeD_toNodesBD() {
//backward search starting from nodeD at time 0
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, false, linkDE, 0);
@@ -157,7 +157,7 @@ public void backward_fromNodeD_toNodesBD() {
}
@Test
- public void backward_fromNodeD_toNodesBD_maxTravelTime() {
+ void backward_fromNodeD_toNodesBD_maxTravelTime() {
//backward search starting from nodeD at time 0
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, false, linkDE, 0);
@@ -172,7 +172,7 @@ public void backward_fromNodeD_toNodesBD_maxTravelTime() {
}
@Test
- public void equalFromLinkAndToLink() {
+ void equalFromLinkAndToLink() {
LeastCostPathTree mockedTree = mock(LeastCostPathTree.class);
for (boolean forward : List.of(true, false)) {
@@ -186,7 +186,7 @@ public void equalFromLinkAndToLink() {
}
@Test
- public void pathData_forward() {
+ void pathData_forward() {
//forward search starting from linkAB at time 0
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, true, linkAB, 0);
@@ -198,7 +198,7 @@ public void pathData_forward() {
}
@Test
- public void pathData_backward() {
+ void pathData_backward() {
//backward search starting from linkDE at time 0
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, false, linkDE, 0);
@@ -210,7 +210,7 @@ public void pathData_backward() {
}
@Test
- public void pathData_fromLinkEqualsToLink() {
+ void pathData_fromLinkEqualsToLink() {
for (boolean forward : List.of(true, false)) {
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, forward, linkAB, 0);
pathCalculator.calculateDijkstraTree(List.of(linkAB));
@@ -219,7 +219,7 @@ public void pathData_fromLinkEqualsToLink() {
}
@Test
- public void pathData_nodeNotReached() {
+ void pathData_nodeNotReached() {
for (boolean forward : List.of(true, false)) {
var pathCalculator = new OneToManyPathCalculator(nodeMap, dijkstraTree, travelTime, forward, linkAB, 0);
pathCalculator.calculateDijkstraTree(List.of(linkBC));
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/router/DiversionTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/router/DiversionTest.java
index adf44ba57ac..2aa72304e53 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/router/DiversionTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/router/DiversionTest.java
@@ -4,9 +4,8 @@
import java.util.List;
import java.util.Objects;
import java.util.Set;
-
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
@@ -75,7 +74,6 @@ public class DiversionTest {
static public final String MODE = "testmode";
static public final int DIVERSION_FREQUENCY = 10;
- @Test
/**
* This is a relatively complex test to the the diversion behaviour. The
* experiment is constructed as folows: We have one DVRP vehicle which moves
@@ -120,7 +118,8 @@ public class DiversionTest {
* current one.
*
*/
- public void testRepeatedSameDestinationDiversions() {
+ @Test
+ void testRepeatedSameDestinationDiversions() {
Config config = ConfigUtils.createConfig();
{
@@ -221,18 +220,18 @@ protected void configureQSim() {
// Took the fixed value from the simulation, to make sure this stays consistent
// over refactorings
- Assert.assertEquals(testTracker.eventBasedArrivalTime, 657.0, 0);
+ Assertions.assertEquals(testTracker.eventBasedArrivalTime, 657.0, 0);
// Initially calculated arrival time should predict correctly the final arrival
// time
- Assert.assertEquals(testTracker.initialArrivalTime, 657.0, 0);
+ Assertions.assertEquals(testTracker.initialArrivalTime, 657.0, 0);
// Along the route, when diverting to the same destination, arrival time should
// stay constant
- testTracker.diversionArrivalTimes.forEach(t -> Assert.assertEquals(t, 657.0, 0));
+ testTracker.diversionArrivalTimes.forEach(t -> Assertions.assertEquals(t, 657.0, 0));
// Also ,the task end time should be consistent with the path
- testTracker.taskEndTimes.forEach(t -> Assert.assertEquals(t, 657.0, 0));
+ testTracker.taskEndTimes.forEach(t -> Assertions.assertEquals(t, 657.0, 0));
}
static private class TestModeModule extends AbstractDvrpModeModule {
@@ -423,7 +422,6 @@ static private class TestTracker {
private List taskEndTimes = new LinkedList<>();
}
- @Test
/**
* This test is similar as the one above. However, there is another catch when
* diverting, which is not covered on top. In fact, following the QSim and
@@ -447,7 +445,8 @@ static private class TestTracker {
* get a reduced arrival time estimate by one second.
*
*/
- public void testRepeatedDiversionToDifferentDestinationRightBeforeLastLink() {
+ @Test
+ void testRepeatedDiversionToDifferentDestinationRightBeforeLastLink() {
Config config = ConfigUtils.createConfig();
{
@@ -549,15 +548,15 @@ protected void configureQSim() {
// Took the fixed value from the simulation, to make sure this stays consistent
// over refactorings - same as previous unit test
- Assert.assertEquals(testTracker.eventBasedArrivalTime, 657.0, 0);
+ Assertions.assertEquals(testTracker.eventBasedArrivalTime, 657.0, 0);
// Initially calculated arrival time should predict correctly the final arrival
// time - as in the first unit test as we route to L8
- Assert.assertEquals(testTracker.initialArrivalTime, 657.0, 0);
+ Assertions.assertEquals(testTracker.initialArrivalTime, 657.0, 0);
// Along the route, when diverting to the same destination, arrival time should
// stay constant
- testTracker.diversionArrivalTimes.forEach(t -> Assert.assertEquals(t, 739.0, 0));
+ testTracker.diversionArrivalTimes.forEach(t -> Assertions.assertEquals(t, 739.0, 0));
// Without fix in OnlineDriveTaskTrackerImpl, the last test will lead to a
// difference of one second for the samples at late times
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/router/RoutingTimeStructureTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/router/RoutingTimeStructureTest.java
index 41760878b96..f670f83a405 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/router/RoutingTimeStructureTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/router/RoutingTimeStructureTest.java
@@ -28,7 +28,7 @@
import java.util.Optional;
import org.apache.commons.lang3.tuple.Pair;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.population.Activity;
@@ -49,7 +49,7 @@
*/
public class RoutingTimeStructureTest {
@Test
- public void testTimingWithSimpleAccess() {
+ void testTimingWithSimpleAccess() {
TimeInterpretation timeInterpretation = TimeInterpretation.create(ConfigUtils.createConfig());
Facility fromFacility = mock(Facility.class);
@@ -109,7 +109,7 @@ public void testTimingWithSimpleAccess() {
}
@Test
- public void testTimingWithComplexAccess() {
+ void testTimingWithComplexAccess() {
TimeInterpretation timeInterpretation = TimeInterpretation.create(ConfigUtils.createConfig());
Facility fromFacility = mock(Facility.class);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/trafficmonitoring/DvrpOfflineTravelTimeEstimatorTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/trafficmonitoring/DvrpOfflineTravelTimeEstimatorTest.java
index 229738c16ce..808df1ff835 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/trafficmonitoring/DvrpOfflineTravelTimeEstimatorTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/trafficmonitoring/DvrpOfflineTravelTimeEstimatorTest.java
@@ -22,8 +22,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
@@ -61,7 +60,7 @@ public class DvrpOfflineTravelTimeEstimatorTest {
private final TimeDiscretizer timeDiscretizer = new TimeDiscretizer(200, 100);
@Test
- public void getLinkTravelTime_timeAreCorrectlyBinned() {
+ void getLinkTravelTime_timeAreCorrectlyBinned() {
var estimator = new DvrpOfflineTravelTimeEstimator(initialTT, null, network, timeDiscretizer, 0.25, null);
//bin 0
@@ -79,7 +78,7 @@ public void getLinkTravelTime_timeAreCorrectlyBinned() {
}
@Test
- public void getLinkTravelTime_exponentialAveragingOverIterations() {
+ void getLinkTravelTime_exponentialAveragingOverIterations() {
double alpha = 0.25;
//observed TTs for each time bin
@@ -124,7 +123,7 @@ public void getLinkTravelTime_exponentialAveragingOverIterations() {
}
@Test
- public void getLinkTravelTime_linkOutsideNetwork_fail() {
+ void getLinkTravelTime_linkOutsideNetwork_fail() {
var linkOutsideNetwork = new FakeLink(Id.createLinkId("some-link"));
var estimator = new DvrpOfflineTravelTimeEstimator(initialTT, null, network, timeDiscretizer, 0.25, null);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/trafficmonitoring/DvrpOfflineTravelTimesTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/trafficmonitoring/DvrpOfflineTravelTimesTest.java
index efaa83bac7b..e3b904d4084 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/trafficmonitoring/DvrpOfflineTravelTimesTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/trafficmonitoring/DvrpOfflineTravelTimesTest.java
@@ -34,8 +34,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.common.timeprofile.TimeDiscretizer;
@@ -52,7 +51,7 @@ public class DvrpOfflineTravelTimesTest {
private final Id linkIdB = Id.createLinkId("B");
@Test
- public void saveLinkTravelTimes() throws IOException {
+ void saveLinkTravelTimes() throws IOException {
//the matrix may have more than 2 rows (depends on how many link ids are cached)
var linkTTs = new double[Id.getNumberOfIds(Link.class)][];
@@ -70,7 +69,7 @@ public void saveLinkTravelTimes() throws IOException {
}
@Test
- public void loadLinkTravelTimes() throws IOException {
+ void loadLinkTravelTimes() throws IOException {
var line0 = String.join(";", "linkId", "0.0", "900.0", "1800.0", "2700.0", "3600.0");
var line1 = String.join(";", "A", 0.1 + "", 1.1 + "", 2.2 + "", 3.3 + "", 4.4 + "");
var line2 = String.join(";", "B", 5.5 + "", 6.6 + "", 7.7 + "", 8.8 + "", 9.9 + "");
@@ -89,7 +88,7 @@ public void loadLinkTravelTimes() throws IOException {
}
@Test
- public void convertToLinkTravelTimes() {
+ void convertToLinkTravelTimes() {
var link = new FakeLink(Id.createLinkId("link_A"));
var timeDiscretizer = new TimeDiscretizer(100, 100);
@@ -105,7 +104,7 @@ public void convertToLinkTravelTimes() {
}
@Test
- public void asTravelTime() {
+ void asTravelTime() {
var linkA = new FakeLink(Id.createLinkId("link_A"));
var linkB = new FakeLink(Id.createLinkId("link_B"));
var timeDiscretizer = new TimeDiscretizer(100, 100);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/util/DvrpEventsReadersTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/util/DvrpEventsReadersTest.java
index b9452d7c495..3f8cbc2594e 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/util/DvrpEventsReadersTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/util/DvrpEventsReadersTest.java
@@ -29,7 +29,7 @@
import java.util.Collections;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.events.Event;
import org.matsim.api.core.v01.network.Link;
@@ -81,7 +81,7 @@ private enum TestTaskType implements Task.TaskType {
new TaskEndedEvent(333, mode, vehicle, driver, TestTaskType.DRIVE_TASK, 0, toLink));
@Test
- public void testReader() {
+ void testReader() {
var outputStream = new ByteArrayOutputStream();
EventWriterXML writer = new EventWriterXML(outputStream);
dvrpEvents.forEach(writer::handleEvent);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/vrpagent/VrpAgentLogicTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/vrpagent/VrpAgentLogicTest.java
index 89958aed641..9546a1ce4e4 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/vrpagent/VrpAgentLogicTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dvrp/vrpagent/VrpAgentLogicTest.java
@@ -26,7 +26,7 @@
import static org.matsim.contrib.dvrp.vrpagent.VrpAgentLogic.BEFORE_SCHEDULE_ACTIVITY_TYPE;
import static org.mockito.Mockito.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.dvrp.fleet.DvrpVehicle;
@@ -86,7 +86,7 @@ public void nextTask(DvrpVehicle vehicle) {
null, dynAgentLogic);
@Test
- public void testInitialActivity_unplanned() {
+ void testInitialActivity_unplanned() {
DynActivity initialActivity = dynAgentLogic.computeInitialActivity(dynAgent);
assertThat(initialActivity.getActivityType()).isEqualTo(BEFORE_SCHEDULE_ACTIVITY_TYPE);
@@ -95,7 +95,7 @@ public void testInitialActivity_unplanned() {
}
@Test
- public void testInitialActivity_planned() {
+ void testInitialActivity_planned() {
DynActivity initialActivity = dynAgentLogic.computeInitialActivity(dynAgent);
StayTask task0 = new DefaultStayTask(TestTaskType.TYPE, 10, 90, startLink);
@@ -107,7 +107,7 @@ public void testInitialActivity_planned() {
}
@Test
- public void testInitialActivity_started_failure() {
+ void testInitialActivity_started_failure() {
DynActivity initialActivity = dynAgentLogic.computeInitialActivity(dynAgent);
StayTask task0 = new DefaultStayTask(TestTaskType.TYPE, 10, 90, startLink);
@@ -121,7 +121,7 @@ public void testInitialActivity_started_failure() {
}
@Test
- public void testNextAction_unplanned_completed() {
+ void testNextAction_unplanned_completed() {
IdleDynActivity nextAction = (IdleDynActivity)dynAgentLogic.computeNextAction(null,
vehicle.getServiceEndTime());
@@ -131,7 +131,7 @@ public void testNextAction_unplanned_completed() {
}
@Test
- public void testNextAction_planned_started() {
+ void testNextAction_planned_started() {
double time = 10;
StayTask task0 = new DefaultStayTask(TestTaskType.TYPE, time, 90, startLink);
vehicle.getSchedule().addTask(task0);
@@ -142,7 +142,7 @@ public void testNextAction_planned_started() {
}
@Test
- public void testNextAction_started_started() {
+ void testNextAction_started_started() {
double time = 50;
StayTask task0 = new DefaultStayTask(TestTaskType.TYPE, 10, time, startLink);
vehicle.getSchedule().addTask(task0);
@@ -156,7 +156,7 @@ public void testNextAction_started_started() {
}
@Test
- public void testNextAction_started_completed() {
+ void testNextAction_started_completed() {
double time = 90;
StayTask task0 = new DefaultStayTask(TestTaskType.TYPE, 10, time, startLink);
vehicle.getSchedule().addTask(task0);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/dynagent/examples/random/RunRandomDynAgentExampleTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/dynagent/examples/random/RunRandomDynAgentExampleTest.java
index 7076c71a804..78db1598058 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/dynagent/examples/random/RunRandomDynAgentExampleTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/dynagent/examples/random/RunRandomDynAgentExampleTest.java
@@ -21,13 +21,13 @@
import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
public class RunRandomDynAgentExampleTest {
@Test
- public void testRun() {
+ void testRun() {
URL networkUrl = IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("dvrp-grid"), "config.xml");
RunRandomDynAgentExample.run(networkUrl, "grid_network.xml", false);
}
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/SquareGridTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/SquareGridTest.java
index 697585b3ff6..dc09184888e 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/SquareGridTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/SquareGridTest.java
@@ -25,7 +25,7 @@
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Node;
@@ -36,20 +36,20 @@
*/
public class SquareGridTest {
@Test
- public void emptyNodes_fail() {
+ void emptyNodes_fail() {
assertThatThrownBy(() -> new SquareGrid(List.of(), 100)).isExactlyInstanceOf(IllegalArgumentException.class)
.hasMessage("Cannot create SquareGrid if no nodes");
}
@Test
- public void outsideBoundaries_withinEpsilon_success() {
+ void outsideBoundaries_withinEpsilon_success() {
Node node_0_0 = node(0, 0);
SquareGrid grid = new SquareGrid(List.of(node_0_0), 100);
assertThatCode(() -> grid.getZone(new Coord(-EPSILON, EPSILON))).doesNotThrowAnyException();
}
@Test
- public void outsideBoundaries_outsideEpsilon_fail() {
+ void outsideBoundaries_outsideEpsilon_fail() {
Node node_0_0 = node(0, 0);
SquareGrid grid = new SquareGrid(List.of(node_0_0), 100);
assertThatThrownBy(() -> grid.getZone(new Coord(-2 * EPSILON, 0))).isExactlyInstanceOf(
@@ -57,7 +57,7 @@ public void outsideBoundaries_outsideEpsilon_fail() {
}
@Test
- public void testLazyZoneCreation() {
+ void testLazyZoneCreation() {
Node node_0_0 = node(0, 0);
SquareGrid grid = new SquareGrid(List.of(node_0_0), 100);
@@ -69,7 +69,7 @@ public void testLazyZoneCreation() {
}
@Test
- public void testGrid() {
+ void testGrid() {
Node node_0_0 = node(0, 0);
Node node_150_150 = node(150, 150);
SquareGrid grid = new SquareGrid(List.of(node_0_0, node_150_150), 100);
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/FreeSpeedTravelTimeMatrixTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/FreeSpeedTravelTimeMatrixTest.java
index e5522c47942..c5743ffaafb 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/FreeSpeedTravelTimeMatrixTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/FreeSpeedTravelTimeMatrixTest.java
@@ -22,7 +22,7 @@
import static org.assertj.core.api.Assertions.assertThat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Network;
@@ -47,7 +47,7 @@ public FreeSpeedTravelTimeMatrixTest() {
}
@Test
- public void matrix() {
+ void matrix() {
DvrpTravelTimeMatrixParams params = new DvrpTravelTimeMatrixParams();
params.cellSize = 100;
params.maxNeighborDistance = 0;
@@ -67,7 +67,7 @@ public void matrix() {
}
@Test
- public void sparseMatrix() {
+ void sparseMatrix() {
DvrpTravelTimeMatrixParams params = new DvrpTravelTimeMatrixParams();
params.cellSize = 100;
params.maxNeighborDistance = 9999;
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/MatrixTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/MatrixTest.java
index 18f59308d00..02e6f9fc5dd 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/MatrixTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/MatrixTest.java
@@ -26,7 +26,7 @@
import java.util.NoSuchElementException;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.contrib.zone.Zone;
@@ -46,7 +46,7 @@ public class MatrixTest {
private final static int MAX_ALLOWED_VALUE = (1 << 16) - 2;
@Test
- public void get_unsetValue() {
+ void get_unsetValue() {
for (Zone from : zones) {
for (Zone to : zones) {
assertThatThrownBy(() -> matrix.get(from, to)).isExactlyInstanceOf(NoSuchElementException.class)
@@ -56,7 +56,7 @@ public void get_unsetValue() {
}
@Test
- public void get_validValue() {
+ void get_validValue() {
matrix.set(zoneA, zoneB, 0);
assertThat(matrix.get(zoneA, zoneB)).isEqualTo(0);
@@ -65,7 +65,7 @@ public void get_validValue() {
}
@Test
- public void set_invalidValue() {
+ void set_invalidValue() {
assertThatThrownBy(() -> matrix.set(zoneA, zoneB, Double.POSITIVE_INFINITY)).isExactlyInstanceOf(
IllegalArgumentException.class);
assertThatThrownBy(() -> matrix.set(zoneA, zoneC, -1)).isExactlyInstanceOf(IllegalArgumentException.class);
@@ -74,13 +74,13 @@ public void set_invalidValue() {
}
@Test
- public void get_unknownZone() {
+ void get_unknownZone() {
assertThatThrownBy(() -> matrix.get(zoneA, unknownZone)).isExactlyInstanceOf(IllegalArgumentException.class);
assertThatThrownBy(() -> matrix.get(unknownZone, zoneC)).isExactlyInstanceOf(IllegalArgumentException.class);
}
@Test
- public void set_unknownZone() {
+ void set_unknownZone() {
assertThatThrownBy(() -> matrix.set(zoneA, unknownZone, 1)).isExactlyInstanceOf(IllegalArgumentException.class);
assertThatThrownBy(() -> matrix.set(unknownZone, zoneC, 1)).isExactlyInstanceOf(IllegalArgumentException.class);
}
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/SparseMatrixTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/SparseMatrixTest.java
index 808730fea7c..a277900e956 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/SparseMatrixTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/SparseMatrixTest.java
@@ -24,8 +24,7 @@
import static org.matsim.contrib.zone.skims.SparseMatrix.SparseRow;
import java.util.List;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Node;
import org.matsim.contrib.zone.skims.SparseMatrix.NodeAndTime;
@@ -44,7 +43,7 @@ public class SparseMatrixTest {
private final List allNodes = List.of(nodeA, nodeB, nodeC);
@Test
- public void emptyMatrix() {
+ void emptyMatrix() {
var matrix = new SparseMatrix();
for (Node from : allNodes) {
for (Node to : allNodes) {
@@ -54,7 +53,7 @@ public void emptyMatrix() {
}
@Test
- public void triangularMatrix() {
+ void triangularMatrix() {
var matrix = new SparseMatrix();
//A -> A, B, C
matrix.setRow(nodeA,
@@ -76,7 +75,7 @@ public void triangularMatrix() {
}
@Test
- public void nodeAndTimeOrderNotImportant() {
+ void nodeAndTimeOrderNotImportant() {
//A -> A, B, C
var nodeAndTimes = List.of(nodeAndTime(nodeA, 0), nodeAndTime(nodeB, 1), nodeAndTime(nodeC, 2));
diff --git a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/TravelTimeMatricesTest.java b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/TravelTimeMatricesTest.java
index d60f34f7fa2..02d7b7bd241 100644
--- a/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/TravelTimeMatricesTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/contrib/zone/skims/TravelTimeMatricesTest.java
@@ -24,7 +24,7 @@
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Network;
@@ -39,7 +39,7 @@
*/
public class TravelTimeMatricesTest {
@Test
- public void travelTimeMatrix() {
+ void travelTimeMatrix() {
Network network = NetworkUtils.createNetwork();
Node nodeA = NetworkUtils.createAndAddNode(network, Id.createNodeId("A"), new Coord(0, 0));
Node nodeB = NetworkUtils.createAndAddNode(network, Id.createNodeId("B"), new Coord(150, 150));
@@ -58,7 +58,7 @@ public void travelTimeMatrix() {
}
@Test
- public void travelTimeSparseMatrix_maxDistance() {
+ void travelTimeSparseMatrix_maxDistance() {
Network network = NetworkUtils.createNetwork();
Node nodeA = NetworkUtils.createAndAddNode(network, Id.createNodeId("A"), new Coord(0, 0));
Node nodeB = NetworkUtils.createAndAddNode(network, Id.createNodeId("B"), new Coord(150, 150));
@@ -85,7 +85,7 @@ public void travelTimeSparseMatrix_maxDistance() {
}
@Test
- public void travelTimeSparseMatrix_maxTravelTime() {
+ void travelTimeSparseMatrix_maxTravelTime() {
Network network = NetworkUtils.createNetwork();
Node nodeA = NetworkUtils.createAndAddNode(network, Id.createNodeId("A"), new Coord(0, 0));
Node nodeB = NetworkUtils.createAndAddNode(network, Id.createNodeId("B"), new Coord(150, 150));
diff --git a/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTBackwardTest.java b/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTBackwardTest.java
index 7377d2c7ba0..828831db27b 100644
--- a/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTBackwardTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTBackwardTest.java
@@ -24,7 +24,7 @@
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
@@ -80,7 +80,7 @@ public class SpeedyMultiSourceALTBackwardTest {
travelDisutility);
@Test
- public void testOneSource_backward() {
+ void testOneSource_backward() {
var startNode = new StartNode(nodeB, 9999, 7777);
var path = multiSourceALT.calcLeastCostPath(List.of(startNode), nodeA, null, null, true);
assertThat(path.nodes).containsExactly(nodeA, nodeE, nodeD, nodeB);
@@ -90,7 +90,7 @@ public void testOneSource_backward() {
}
@Test
- public void testManySources_backward_sameStartCost() {
+ void testManySources_backward_sameStartCost() {
var startNodeB = new StartNode(nodeB, 9999, 7777);
var startNodeC = new StartNode(nodeC, 9999, 7777);
var path = multiSourceALT.calcLeastCostPath(List.of(startNodeB, startNodeC), nodeA, null, null, true);
@@ -101,7 +101,7 @@ public void testManySources_backward_sameStartCost() {
}
@Test
- public void testManySources_backward_selectFartherNodeWithLowerCost() {
+ void testManySources_backward_selectFartherNodeWithLowerCost() {
var startNodeB = new StartNode(nodeB, 100, 7777);
var startNodeC = new StartNode(nodeC, 111, 1111);
var path = multiSourceALT.calcLeastCostPath(List.of(startNodeB, startNodeC), nodeA, null, null, true);
@@ -112,7 +112,7 @@ public void testManySources_backward_selectFartherNodeWithLowerCost() {
}
@Test
- public void testManySources_backward_selectNearestNodeWithHigherCost() {
+ void testManySources_backward_selectNearestNodeWithHigherCost() {
var startNodeB = new StartNode(nodeB, 100, 7777);
var startNodeC = new StartNode(nodeC, 109, 1111);
var path = multiSourceALT.calcLeastCostPath(List.of(startNodeB, startNodeC), nodeA, null, null, true);
diff --git a/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTForwardTest.java b/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTForwardTest.java
index 35158e0b0c1..45287f7b776 100644
--- a/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTForwardTest.java
+++ b/contribs/dvrp/src/test/java/org/matsim/core/router/speedy/SpeedyMultiSourceALTForwardTest.java
@@ -24,7 +24,7 @@
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
@@ -78,7 +78,7 @@ public class SpeedyMultiSourceALTForwardTest {
travelDisutility);
@Test
- public void testOneSource_forward() {
+ void testOneSource_forward() {
var startNode = new StartNode(nodeB, 9999, 7777);
var path = multiSourceALT.calcLeastCostPath(List.of(startNode), nodeA, null, null, false);
assertThat(path.nodes).containsExactly(nodeB, nodeD, nodeE, nodeA);
@@ -88,7 +88,7 @@ public void testOneSource_forward() {
}
@Test
- public void testManySources_forward_sameStartCost() {
+ void testManySources_forward_sameStartCost() {
var startNodeB = new StartNode(nodeB, 9999, 7777);
var startNodeC = new StartNode(nodeC, 9999, 7777);
var path = multiSourceALT.calcLeastCostPath(List.of(startNodeB, startNodeC), nodeA, null, null, false);
@@ -99,7 +99,7 @@ public void testManySources_forward_sameStartCost() {
}
@Test
- public void testManySources_forward_selectFartherNodeWithLowerCost() {
+ void testManySources_forward_selectFartherNodeWithLowerCost() {
var startNodeB = new StartNode(nodeB, 100, 7777);
var startNodeC = new StartNode(nodeC, 111, 1111);
var path = multiSourceALT.calcLeastCostPath(List.of(startNodeB, startNodeC), nodeA, null, null, false);
@@ -110,7 +110,7 @@ public void testManySources_forward_selectFartherNodeWithLowerCost() {
}
@Test
- public void testManySources_forward_selectNearestNodeWithHigherCost() {
+ void testManySources_forward_selectNearestNodeWithHigherCost() {
var startNodeB = new StartNode(nodeB, 100, 7777);
var startNodeC = new StartNode(nodeC, 109, 1111);
var path = multiSourceALT.calcLeastCostPath(List.of(startNodeB, startNodeC), nodeA, null, null, false);
diff --git a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/EmissionModuleTest.java b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/EmissionModuleTest.java
index 5f61653ebc3..c7cde9b6eb1 100644
--- a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/EmissionModuleTest.java
+++ b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/EmissionModuleTest.java
@@ -1,7 +1,7 @@
package org.matsim.contrib.emissions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Scenario;
import org.matsim.contrib.emissions.utils.EmissionsConfigGroup;
import org.matsim.contrib.emissions.utils.TestUtils;
@@ -15,52 +15,55 @@
import org.matsim.examples.ExamplesUtils;
import org.matsim.testcases.MatsimTestUtils;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Most of the other test implicitly test the EmissionModule as well. Still, I guess it makes sense to have this here
*/
public class EmissionModuleTest {
- @Rule
- public MatsimTestUtils testUtils = new MatsimTestUtils();
+ @RegisterExtension
+ public MatsimTestUtils testUtils = new MatsimTestUtils();
- @Test(expected = RuntimeException.class)
- public void testWithIncorrectNetwork() {
+ @Test
+ void testWithIncorrectNetwork() {
+ assertThrows(RuntimeException.class, () -> {
- var scenarioURL = ExamplesUtils.getTestScenarioURL("emissions-sampleScenario");
+ var scenarioURL = ExamplesUtils.getTestScenarioURL("emissions-sampleScenario");
- var emissionConfig = new EmissionsConfigGroup();
- emissionConfig.setHbefaTableConsistencyCheckingLevel(EmissionsConfigGroup.HbefaTableConsistencyCheckingLevel.none);
- emissionConfig.setAverageColdEmissionFactorsFile(IOUtils.extendUrl(scenarioURL, "sample_41_EFA_ColdStart_SubSegm_2020detailed.csv").toString());
- emissionConfig.setAverageWarmEmissionFactorsFile(IOUtils.extendUrl(scenarioURL, "sample_41_EFA_HOT_vehcat_2020average.csv").toString());
- emissionConfig.setDetailedVsAverageLookupBehavior(EmissionsConfigGroup.DetailedVsAverageLookupBehavior.directlyTryAverageTable);
+ var emissionConfig = new EmissionsConfigGroup();
+ emissionConfig.setHbefaTableConsistencyCheckingLevel(EmissionsConfigGroup.HbefaTableConsistencyCheckingLevel.none);
+ emissionConfig.setAverageColdEmissionFactorsFile(IOUtils.extendUrl(scenarioURL, "sample_41_EFA_ColdStart_SubSegm_2020detailed.csv").toString());
+ emissionConfig.setAverageWarmEmissionFactorsFile(IOUtils.extendUrl(scenarioURL, "sample_41_EFA_HOT_vehcat_2020average.csv").toString());
+ emissionConfig.setDetailedVsAverageLookupBehavior(EmissionsConfigGroup.DetailedVsAverageLookupBehavior.directlyTryAverageTable);
- var config = ConfigUtils.createConfig(emissionConfig);
+ var config = ConfigUtils.createConfig(emissionConfig);
- // create a scenario with a random network where every link has a hbefa road type except one link.
- var scenario = ScenarioUtils.createMutableScenario(config);
- var network = TestUtils.createRandomNetwork(1000, 10000, 10000);
- new VspHbefaRoadTypeMapping().addHbefaMappings(network);
- network.getLinks().values().iterator().next().getAttributes().removeAttribute(EmissionUtils.HBEFA_ROAD_TYPE);
- scenario.setNetwork(network);
+ // create a scenario with a random network where every link has a hbefa road type except one link.
+ var scenario = ScenarioUtils.createMutableScenario(config);
+ var network = TestUtils.createRandomNetwork(1000, 10000, 10000);
+ new VspHbefaRoadTypeMapping().addHbefaMappings(network);
+ network.getLinks().values().iterator().next().getAttributes().removeAttribute(EmissionUtils.HBEFA_ROAD_TYPE);
+ scenario.setNetwork(network);
- var eventsManager = EventsUtils.createEventsManager();
+ var eventsManager = EventsUtils.createEventsManager();
- var module = new AbstractModule() {
- @Override
- public void install() {
- bind(Scenario.class).toInstance(scenario);
- bind(EventsManager.class).toInstance(eventsManager);
- bind(EmissionModule.class);
- }
- };
+ var module = new AbstractModule() {
+ @Override
+ public void install() {
+ bind(Scenario.class).toInstance(scenario);
+ bind(EventsManager.class).toInstance(eventsManager);
+ bind(EmissionModule.class);
+ }
+ };
- com.google.inject.Injector injector = Injector.createInjector(config, module);
- // this call should cause an exception when the consistency check in the constructor of the emission module fails
- injector.getInstance(EmissionModule.class);
+ com.google.inject.Injector injector = Injector.createInjector(config, module);
+ // this call should cause an exception when the consistency check in the constructor of the emission module fails
+ injector.getInstance(EmissionModule.class);
- fail("Was expecting exception");
- }
-}
\ No newline at end of file
+ fail("Was expecting exception");
+ });
+ }
+}
diff --git a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/OsmHbefaMappingTest.java b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/OsmHbefaMappingTest.java
index d0bf9433dfa..195fc6e6fcb 100644
--- a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/OsmHbefaMappingTest.java
+++ b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/OsmHbefaMappingTest.java
@@ -1,17 +1,17 @@
package org.matsim.contrib.emissions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.core.network.NetworkUtils;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
public class OsmHbefaMappingTest {
- @Test
- public void testRegularMapping() {
+ @Test
+ void testRegularMapping() {
var mapping = OsmHbefaMapping.build();
var link = getTestLink("primary", 70 / 3.6);
@@ -22,7 +22,7 @@ public void testRegularMapping() {
}
@Test
- public void testMergedLinkTypeMapping() {
+ void testMergedLinkTypeMapping() {
var mapping = OsmHbefaMapping.build();
var link = getTestLink("primary|railway.tram", 70 / 3.6);
@@ -32,19 +32,21 @@ public void testMergedLinkTypeMapping() {
assertEquals("URB/Trunk-City/70", hbefaType);
}
- @Test(expected = RuntimeException.class)
- public void testUnknownType() {
+ @Test
+ void testUnknownType() {
+ assertThrows(RuntimeException.class, () -> {
- var mapping = OsmHbefaMapping.build();
- var link = getTestLink("unknown-tag", 100 / 3.6);
+ var mapping = OsmHbefaMapping.build();
+ var link = getTestLink("unknown-tag", 100 / 3.6);
- mapping.determineHebfaType(link);
+ mapping.determineHebfaType(link);
- fail("Expected Runtime Exception.");
- }
+ fail("Expected Runtime Exception.");
+ });
+ }
- @Test
- public void testFastMotorway() {
+ @Test
+ void testFastMotorway() {
var mapping = OsmHbefaMapping.build();
var link = getTestLink("motorway", 100 / 3.6);
@@ -55,7 +57,7 @@ public void testFastMotorway() {
}
@Test
- public void testMotorwayWithNoExactSpeedTag() {
+ void testMotorwayWithNoExactSpeedTag() {
var mapping = OsmHbefaMapping.build();
@@ -70,7 +72,7 @@ public void testMotorwayWithNoExactSpeedTag() {
}
@Test
- public void testFastMotorwayLink() {
+ void testFastMotorwayLink() {
var mapping = OsmHbefaMapping.build();
var link = getTestLink("motorway_link", 100 / 3.6);
@@ -81,7 +83,7 @@ public void testFastMotorwayLink() {
}
@Test
- public void testLivingStreet() {
+ void testLivingStreet() {
var mapping = OsmHbefaMapping.build();
var link = getTestLink("living_street", 50 / 3.6);
@@ -90,8 +92,8 @@ public void testLivingStreet() {
assertEquals("URB/Access/50", hbefaType);
}
- @Test
- public void testUnclassified() {
+ @Test
+ void testUnclassified() {
var mapping = OsmHbefaMapping.build();
var link = getTestLink("unclassified", 50 / 3.6);
@@ -101,8 +103,8 @@ public void testUnclassified() {
assertEquals("URB/Access/50", hbefaType);
}
- @Test
- public void testNoHighwayType() {
+ @Test
+ void testNoHighwayType() {
var mapping = OsmHbefaMapping.build();
var link = getTestLink(" ", 60 / 3.6);
@@ -112,8 +114,8 @@ public void testNoHighwayType() {
assertEquals("URB/Local/60", hbefaType);
}
- @Test
- public void testNoAllowedSpeedTag() {
+ @Test
+ void testNoAllowedSpeedTag() {
var mapping = OsmHbefaMapping.build();
var link = getTestLink("residential", 40 / 3.6);
diff --git a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModule.java b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModule.java
index 57c8636221a..d5d32b96239 100644
--- a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModule.java
+++ b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModule.java
@@ -20,9 +20,9 @@
package org.matsim.contrib.emissions;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.emissions.utils.EmissionsConfigGroup;
@@ -70,11 +70,11 @@ public class TestColdEmissionAnalysisModule {
private static final Set pollutants = new HashSet<>(Arrays.asList(CO, CO2_TOTAL, FC, HC, NMHC, NOx, NO2,PM, SO2));
private final int numberOfColdEmissions = pollutants.size();
// strings for test cases
-
+
// The material below was confused in the way that strings like "petrol" or "diesel" were given for the
// size classes, and "<1,4L" or ">=2L" for the emissions concept. Tried to make it consistent,
// but I don't know if it is still testing the original functionality. kai, jul'18
-
+
// first case: complete data - corresponding entry in average table
private static final String petrol_technology = "petrol";
private static final String none_sizeClass = "average";
@@ -95,7 +95,7 @@ public class TestColdEmissionAnalysisModule {
private static final Double averagePetrolFactor = .01;
private static final double fakeFactor = -1.;
-
+
private boolean excep = false;
@@ -104,7 +104,7 @@ public class TestColdEmissionAnalysisModule {
* all of them should throw exceptions
*/
@Test
- public void calculateColdEmissionsAndThrowEventTest_Exceptions() {
+ void calculateColdEmissionsAndThrowEventTest_Exceptions() {
ColdEmissionAnalysisModule coldEmissionAnalysisModule = setUp();
List> testCasesExceptions = new ArrayList<>();
@@ -116,7 +116,7 @@ public void calculateColdEmissionsAndThrowEventTest_Exceptions() {
testCasesExceptions.add( Id.create( "", VehicleType.class ) );
//case: null id
testCasesExceptions.add( null );
-
+
for ( Id vehicleTypeId : testCasesExceptions ) {
String message = "'" + vehicleTypeId + "'" + " was used to calculate cold emissions and generate an emissions event."
+ "It should instead throw an exception because it is not a valid vehicle information string.";
@@ -128,18 +128,18 @@ public void calculateColdEmissionsAndThrowEventTest_Exceptions() {
} catch (Exception e) {
excep = true;
}
- Assert.assertTrue(message, excep);
+ Assertions.assertTrue(excep, message);
excep = false;
}
}
@Test
- public void calculateColdEmissionsAndThrowEventTest_minimalVehicleInformation() {
+ void calculateColdEmissionsAndThrowEventTest_minimalVehicleInformation() {
ColdEmissionAnalysisModule coldEmissionAnalysisModule = setUp();
excep = false;
-
+
// case: no specifications for technology, size, class, em concept
// string has no semicolons as separators - use average values
Id vehInfo11 = Id.create("PASSENGER_CAR", VehicleType.class );
@@ -154,17 +154,17 @@ public void calculateColdEmissionsAndThrowEventTest_minimalVehicleInformation()
String message = "The expected emissions for an emissions event with vehicle information string '" + vehInfo11 + "' are " +
numberOfColdEmissions * averageAverageFactor + " but were " + sumOfEmissions;
- Assert.assertEquals( message, numberOfColdEmissions * averageAverageFactor, sumOfEmissions, MatsimTestUtils.EPSILON );
-
+ Assertions.assertEquals( numberOfColdEmissions * averageAverageFactor, sumOfEmissions, MatsimTestUtils.EPSILON, message );
+
}
-
+
private static ColdEmissionAnalysisModule setUp() {
Map avgHbefaColdTable = new HashMap<>();
Map detailedHbefaColdTable = new HashMap<>();
-
+
fillAveragesTable( avgHbefaColdTable );
fillDetailedTable( detailedHbefaColdTable );
-
+
EventsManager emissionEventManager = new HandlerToTestEmissionAnalysisModules();
EmissionsConfigGroup ecg = new EmissionsConfigGroup();
ecg.setHbefaVehicleDescriptionSource( EmissionsConfigGroup.HbefaVehicleDescriptionSource.usingVehicleTypeId );
@@ -172,7 +172,7 @@ private static ColdEmissionAnalysisModule setUp() {
//This represents the previous behavior, which fallbacks to the average table, if values are not found in the detailed table, kmt apr'20
ecg.setDetailedVsAverageLookupBehavior(EmissionsConfigGroup.DetailedVsAverageLookupBehavior.tryDetailedThenTechnologyAverageThenAverageTable);
return new ColdEmissionAnalysisModule( avgHbefaColdTable, detailedHbefaColdTable, ecg, pollutants, emissionEventManager );
-
+
}
@@ -196,36 +196,36 @@ private static void fillDetailedTable( Map avgHbefaColdTable ) {
// create all needed and one unneeded entry for the average table
{
// add passenger car entry "average;average;average":
HbefaVehicleAttributes vehAtt = ColdEmissionAnalysisModule.createHbefaVehicleAttributes( "average", "average", "average" ) ;
-
+
putIntoHbefaColdTable( avgHbefaColdTable, vehAtt, new HbefaColdEmissionFactor(averageAverageFactor), PASSENGER_CAR );
}
{
HbefaVehicleAttributes vehAtt = ColdEmissionAnalysisModule.createHbefaVehicleAttributes( petrol_technology, none_sizeClass, none_emConcept );
-
+
putIntoHbefaColdTable( avgHbefaColdTable, vehAtt, new HbefaColdEmissionFactor( averagePetrolFactor ), PASSENGER_CAR );
}
{
// duplicate from detailed table, but with different emission factor.
// this should not be used but is needed to assure that the detailed table is tried before the average table
HbefaVehicleAttributes vehAtt = ColdEmissionAnalysisModule.createHbefaVehicleAttributes( diesel_technology, geq2l_sizeClass, PC_D_Euro_3_emConcept );
-
+
putIntoHbefaColdTable( avgHbefaColdTable, vehAtt, new HbefaColdEmissionFactor( fakeFactor ), PASSENGER_CAR );
}
{
// add HGV entry "petrol;none;none".
// (pre-existing comment: HEAVY_GOODS_VEHICLE;PC petrol;petrol;none should not be used --???)
final HbefaVehicleAttributes vehAtt = ColdEmissionAnalysisModule.createHbefaVehicleAttributes( petrol_technology, none_sizeClass, none_emConcept );
-
+
putIntoHbefaColdTable( avgHbefaColdTable, vehAtt, new HbefaColdEmissionFactor( fakeFactor ), HEAVY_GOODS_VEHICLE );
}
}
-
+
private static void putIntoHbefaColdTable( final Map detailedHbefaColdTable, final HbefaVehicleAttributes vehAtt, final HbefaColdEmissionFactor detColdFactor, final HbefaVehicleCategory hbefaVehicleCategory ) {
for ( Pollutant cp : pollutants ) {
HbefaColdEmissionFactorKey detColdKey = new HbefaColdEmissionFactorKey();
@@ -237,5 +237,5 @@ private static void putIntoHbefaColdTable( final Map testCase1 = new ArrayList<>();
// first case: complete data
@@ -119,7 +119,7 @@ public void calculateColdEmissionsAndThrowEventTest_completeData() {
double sumOfEmissions = calculatedPollutants.values().stream().mapToDouble(Double::doubleValue).sum();
String message = "The expected emissions for " + testCase1.toString() + " are " + pollutants.size() * (Double) testCase1.get(4) + " but were " + sumOfEmissions;
- Assert.assertEquals(message, pollutants.size() * (Double) testCase1.get(4), sumOfEmissions, MatsimTestUtils.EPSILON);
+ Assertions.assertEquals(pollutants.size() * (Double) testCase1.get(4), sumOfEmissions, MatsimTestUtils.EPSILON, message);
}
private static ColdEmissionAnalysisModule setUp() {
diff --git a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModuleCase2.java b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModuleCase2.java
index feed9108fb3..c97de7d7ecd 100644
--- a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModuleCase2.java
+++ b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModuleCase2.java
@@ -22,8 +22,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.emissions.utils.EmissionsConfigGroup;
@@ -93,7 +93,7 @@ public class TestColdEmissionAnalysisModuleCase2 {
private static final double fakeFactor = -1.;
@Test
- public void calculateColdEmissionsAndThrowEventTest_completeData() {
+ void calculateColdEmissionsAndThrowEventTest_completeData() {
ColdEmissionAnalysisModule coldEmissionAnalysisModule = setUp();
@@ -112,7 +112,7 @@ public void calculateColdEmissionsAndThrowEventTest_completeData() {
double sumOfEmissions = calculatedPollutants.values().stream().mapToDouble(Double::doubleValue).sum();
String message = "The expected emissions for " + testCase2.toString() + " are " + pollutants.size() * (Double) testCase2.get( 4 ) + " but were " + sumOfEmissions;
- Assert.assertEquals( message, pollutants.size() * (Double) testCase2.get( 4 ), sumOfEmissions, MatsimTestUtils.EPSILON );
+ Assertions.assertEquals( pollutants.size() * (Double) testCase2.get( 4 ), sumOfEmissions, MatsimTestUtils.EPSILON, message );
}
diff --git a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModuleCase3.java b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModuleCase3.java
index 861850165d5..3da0de0f540 100644
--- a/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModuleCase3.java
+++ b/contribs/emissions/src/test/java/org/matsim/contrib/emissions/TestColdEmissionAnalysisModuleCase3.java
@@ -22,8 +22,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.contrib.emissions.utils.EmissionsConfigGroup;
@@ -94,7 +94,7 @@ public class TestColdEmissionAnalysisModuleCase3 {
private static final double fakeFactor = -1.;
@Test
- public void calculateColdEmissionsAndThrowEventTest_completeData() {
+ void calculateColdEmissionsAndThrowEventTest_completeData() {
ColdEmissionAnalysisModule coldEmissionAnalysisModule = setUp();
ArrayList