Fix pipeline test

amodeus-science · Oct 9, 2019 · e38caa1 · e38caa1
1 parent abf119b
commit e38caa1
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/test/java/ch/ethz/idsc/amodeus/test/ScenarioPipeLineTest.java b/src/test/java/ch/ethz/idsc/amodeus/test/ScenarioPipeLineTest.java
@@ -131,8 +131,8 @@ public void testAnalysis() throws Exception {
 
         AnalysisTestExport ate = testServer.getAnalysisTestExport();
 
-        /** number of processed requests */
-        assertEquals(2000, ate.getSimulationInformationElement().reqsize());
+        /** number of processed requests, 25 are same link requests and therefore are not covered by Amodeus */
+        assertEquals(1975, ate.getSimulationInformationElement().reqsize());
 
         /** fleet size */
         assertEquals(200, ate.getSimulationInformationElement().vehicleSize());
@@ -149,8 +149,8 @@ public void testAnalysis() throws Exception {
         Scalar distanceRatio = Mean.of(ate.getDistancElement().ratios).Get(1);
 
         //
-        scalarAssert.add(RationalScalar.of(2369, 28800), occupancyRatio);
-        scalarAssert.add(RealScalar.of(0.6859942202326029), distanceRatio);
+        scalarAssert.add(RationalScalar.of(180653, 2160000), occupancyRatio);
+        scalarAssert.add(RealScalar.of(0.6814775194509531), distanceRatio);
 
         /** fleet distances */
         assertTrue(Scalars.lessEquals(RealScalar.ZERO, ate.getDistancElement().totalDistance));
@@ -165,11 +165,11 @@ public void testAnalysis() throws Exception {
         assertTrue(((Scalar) Total.of(ate.getDistancElement().totalDistancesPerVehicle)).equals( //
                 ate.getDistancElement().totalDistance));
 
-        scalarAssert.add(RealScalar.of(34023.54116536432), ate.getDistancElement().totalDistance);
-        scalarAssert.add(RealScalar.of(28712.764946237683), ate.getDistancElement().totalDistanceWtCst);
-        scalarAssert.add(RealScalar.of(5310.77621912671), ate.getDistancElement().totalDistancePicku);
+        scalarAssert.add(RealScalar.of(34367.02346336422), ate.getDistancElement().totalDistance);
+        scalarAssert.add(RealScalar.of(28853.759188309727), ate.getDistancElement().totalDistanceWtCst);
+        scalarAssert.add(RealScalar.of(5513.264275054483), ate.getDistancElement().totalDistancePicku);
         scalarAssert.add(RealScalar.of(0.0), ate.getDistancElement().totalDistanceRebal);
-        scalarAssert.add(RealScalar.of(0.8439087750062607), ate.getDistancElement().totalDistanceRatio);
+        scalarAssert.add(RealScalar.of(0.8395769048509041), ate.getDistancElement().totalDistanceRatio);
 
         scalarAssert.add((Scalar) Total.of(ate.getDistancElement().totalDistancesPerVehicle), //
                 ate.getDistancElement().totalDistance);
@@ -188,10 +188,10 @@ public void testAnalysis() throws Exception {
                 ate.getTravelTimeAnalysis().getWaitAggrgte().get(0).Get(2)));
         assertTrue(Scalars.lessEquals(Quantity.of(0, SI.SECOND), ate.getTravelTimeAnalysis().getWaitAggrgte().Get(1)));
 
-        scalarAssert.add(Quantity.of(274.053, SI.SECOND), ate.getTravelTimeAnalysis().getWaitAggrgte().Get(1));
-        scalarAssert.add(Quantity.of(3267.0, SI.SECOND), ate.getTravelTimeAnalysis().getWaitAggrgte().Get(2));
-        scalarAssert.add(Quantity.of(RationalScalar.of(7107, 8), SI.SECOND), ate.getTravelTimeAnalysis().getDrveAggrgte().Get(1));
-        scalarAssert.add(Quantity.of(4070, SI.SECOND), ate.getTravelTimeAnalysis().getDrveAggrgte().Get(2));
+        scalarAssert.add(Quantity.of(284.01620253164555, SI.SECOND), ate.getTravelTimeAnalysis().getWaitAggrgte().Get(1));
+        scalarAssert.add(Quantity.of(3297.0, SI.SECOND), ate.getTravelTimeAnalysis().getWaitAggrgte().Get(2));
+        scalarAssert.add(Quantity.of(RationalScalar.of(361306, 395), SI.SECOND), ate.getTravelTimeAnalysis().getDrveAggrgte().Get(1));
+        scalarAssert.add(Quantity.of(4100, SI.SECOND), ate.getTravelTimeAnalysis().getDrveAggrgte().Get(2));
 
         /* TODO Have a look at {AmodeusModule::install}. At some point the travel time calculation in DVRP has been improved.
          * Unfortunately, this improvement breaks these tests.