Merge branch 'master' into support-turn-restrictions-in-SpeedyALT

matsim-org · May 6, 2024 · 33b85cd · 33b85cd
2 parents d5d1e87 + 670fd95
commit 33b85cd
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 132 deletions.
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
@@ -236,9 +236,9 @@ void testRunDrtStopbasedExample() {
 		var expectedStats = Stats.newBuilder()
 				.rejectionRate(0.05)
 				.rejections(17)
-				.waitAverage(260.41)
-				.inVehicleTravelTimeMean(374.87)
-				.totalTravelTimeMean(635.28)
+				.waitAverage(260.24)
+				.inVehicleTravelTimeMean(375.14)
+				.totalTravelTimeMean(635.38)
 				.build();
 
 		verifyDrtCustomerStatsCloseToExpectedStats(utils.getOutputDirectory(), expectedStats);
@@ -271,9 +271,9 @@ public void install() {
 		var expectedStats = Stats.newBuilder()
 				.rejectionRate(0.05)
 				.rejections(17)
-				.waitAverage(261.88)
-				.inVehicleTravelTimeMean(376.04)
-				.totalTravelTimeMean(637.93)
+				.waitAverage(261.71)
+				.inVehicleTravelTimeMean(376.32)
+				.totalTravelTimeMean(638.03)
 				.build();
 
 		verifyDrtCustomerStatsCloseToExpectedStats(utils.getOutputDirectory(), expectedStats);
@@ -294,8 +294,8 @@ void testRunServiceAreabasedExampleWithSpeedUp() {
 		var expectedStats = Stats.newBuilder()
 				.rejectionRate(0.02)
 				.rejections(9)
-				.waitAverage(224.56)
-				.inVehicleTravelTimeMean(392.65)
+				.waitAverage(224.46)
+				.inVehicleTravelTimeMean(392.74)
 				.totalTravelTimeMean(617.21)
 				.build();
 

diff --git a/contribs/ev/pom.xml b/contribs/ev/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-csv</artifactId>
-			<version>1.10.0</version>
+			<version>1.11.0</version>
 		</dependency>
         <dependency>
             <groupId>one.util</groupId>

diff --git a/matsim/pom.xml b/matsim/pom.xml
@@ -257,7 +257,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-csv</artifactId>
-			<version>1.10.0</version>
+			<version>1.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>