fixup! core: add last stop in standalone simulation

Signed-off-by: Erashin <[email protected]>

Author: flomonster

core/src/main/java/fr/sncf/osrd/standalone_sim/EnvelopeStopWrapper.java

@@ -91,14 +91,15 @@ public List<EnvelopePoint> iteratePoints() {
         double sumPreviousStopDuration = 0;
         int stopIndex = 0;
         for (var point : envelope.iteratePoints()) {
+            var shiftedTime = point.time() + sumPreviousStopDuration;
             var shiftedPoint =
-                    new EnvelopePoint(point.time() + sumPreviousStopDuration, point.speed(), point.position());
+                    new EnvelopePoint(shiftedTime, point.speed(), point.position());
             res.add(shiftedPoint);
             if (stopIndex < stops.size() && point.position() >= stops.get(stopIndex).position) {
                 var stopDuration = stops.get(stopIndex).duration;
+                res.add(new EnvelopePoint(shiftedTime + stopDuration, point.speed(), point.position()));
                 stopIndex++;
                 sumPreviousStopDuration += stopDuration;
-                res.add(new EnvelopePoint(point.time() + sumPreviousStopDuration, point.speed(), point.position()));
             }
         }
         return res;

core/src/test/java/fr/sncf/osrd/standalone_sim/EnvelopeStopWrapperTests.java

@@ -13,38 +13,43 @@ public class EnvelopeStopWrapperTests {
     @Test
     public void iteratePointsWithoutStops() {
         var envelopeFloor = Envelope.make(EnvelopeTestUtils.generateTimes(
-                new double[] {0, 1, 2, 3, 4, 5, 6}, new double[] {1, 1, 1, 1, 1, 1, 1}));
+            new double[] {0, 1, 2, 3, 4, 5, 6}, new double[] {1, 1, 1, 1, 1, 1, 1}));
         var envelopeStopWrapper = new EnvelopeStopWrapper(envelopeFloor, List.of());
         Assertions.assertEquals(
-                List.of(
-                        new EnvelopeTimeInterpolate.EnvelopePoint(0, 1, 0),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(1, 1, 1),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(2, 1, 2),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(3, 1, 3),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(4, 1, 4),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(5, 1, 5),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(6, 1, 6)),
-                envelopeStopWrapper.iteratePoints());
+            List.of(
+                new EnvelopeTimeInterpolate.EnvelopePoint(0, 1, 0),
+                new EnvelopeTimeInterpolate.EnvelopePoint(1, 1, 1),
+                new EnvelopeTimeInterpolate.EnvelopePoint(2, 1, 2),
+                new EnvelopeTimeInterpolate.EnvelopePoint(3, 1, 3),
+                new EnvelopeTimeInterpolate.EnvelopePoint(4, 1, 4),
+                new EnvelopeTimeInterpolate.EnvelopePoint(5, 1, 5),
+                new EnvelopeTimeInterpolate.EnvelopePoint(6, 1, 6)),
+            envelopeStopWrapper.iteratePoints());
     }
 
     @Test
     public void iteratePointsWithStops() {
         var envelopeFloor = Envelope.make(EnvelopeTestUtils.generateTimes(
-                new double[] {0, 1, 2, 3, 4, 5, 6}, new double[] {1, 1, 1, 0, 1, 1, 1}));
+            new double[] {0, 1, 2, 3, 4, 5, 6}, new double[] {1, 1, 1, 0, 1, 1, 1}));
         var envelopeStopWrapper = new EnvelopeStopWrapper(
-                envelopeFloor,
-                List.of(
-                        new TrainStop(1.5, 0, RJSReceptionSignal.OPEN),
-                        new TrainStop(3, 10, RJSReceptionSignal.SHORT_SLIP_STOP)));
+            envelopeFloor,
+            List.of(
+                new TrainStop(3, 10, RJSReceptionSignal.SHORT_SLIP_STOP),
+                new TrainStop(6, 5, RJSReceptionSignal.OPEN)
+            )
+        );
         Assertions.assertEquals(
-                List.of(
-                        new EnvelopeTimeInterpolate.EnvelopePoint(0, 1, 0),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(1, 1, 1),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(2, 1, 2),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(4, 0, 3),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(6 + 10, 1, 4),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(7 + 10, 1, 5),
-                        new EnvelopeTimeInterpolate.EnvelopePoint(8 + 10, 1, 6)),
-                envelopeStopWrapper.iteratePoints());
+            List.of(
+                new EnvelopeTimeInterpolate.EnvelopePoint(0, 1, 0),
+                new EnvelopeTimeInterpolate.EnvelopePoint(1, 1, 1),
+                new EnvelopeTimeInterpolate.EnvelopePoint(2, 1, 2),
+                new EnvelopeTimeInterpolate.EnvelopePoint(4, 0, 3),
+                new EnvelopeTimeInterpolate.EnvelopePoint(4 + 10, 0, 3),
+                new EnvelopeTimeInterpolate.EnvelopePoint(6 + 10, 1, 4),
+                new EnvelopeTimeInterpolate.EnvelopePoint(7 + 10, 1, 5),
+                new EnvelopeTimeInterpolate.EnvelopePoint(8 + 10, 1, 6),
+                new EnvelopeTimeInterpolate.EnvelopePoint(8 + 10 + 5, 1, 6)),
+            envelopeStopWrapper.iteratePoints().stream().distinct().toList()
+        );
     }
 }