core: remove coastFromBeginning to avoid space search discontinuities during mareco allowance calculations

Author: Erashin

core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/allowances/mareco_impl/CoastingGenerator.java

@@ -10,32 +10,8 @@
 import fr.sncf.osrd.envelope.part.constraints.EnvelopeConstraint;
 import fr.sncf.osrd.envelope.part.constraints.SpeedConstraint;
 import fr.sncf.osrd.envelope_sim.*;
-import fr.sncf.osrd.envelope_sim.overlays.EnvelopeCoasting;
-import fr.sncf.osrd.reporting.exceptions.OSRDError;
-import fr.sncf.osrd.reporting.exceptions.ErrorType;
 
 public final class CoastingGenerator {
-    /** Generate a coasting envelope part which starts at startPos */
-    public static EnvelopePart coastFromBeginning(
-            Envelope envelope,
-            EnvelopeSimContext context,
-            double startPos
-    ) {
-        var partBuilder = new EnvelopePartBuilder();
-        partBuilder.setAttr(EnvelopeProfile.COASTING);
-        var constrainedBuilder = new ConstrainedEnvelopePartBuilder(
-                partBuilder,
-                new SpeedConstraint(0, FLOOR),
-                new EnvelopeConstraint(envelope, CEILING)
-        );
-        var speed = envelope.interpolateSpeed(startPos);
-        EnvelopeCoasting.coast(context, startPos, speed, constrainedBuilder, 1);
-        if (constrainedBuilder.lastIntersection == 0)
-            throw new OSRDError(ErrorType.ImpossibleSimulationError); // We reached a stop while coasting
-        if (partBuilder.isEmpty())
-            return null;
-        return partBuilder.build();
-    }
 
     /** Generate a coasting envelope part which ends at endPos and never goes below lowSpeedLimit */
     public static EnvelopePart coastFromEnd(
@@ -59,14 +35,12 @@ public static EnvelopePart coastFromEnd(
         double speed = envelope.interpolateSpeed(position);
         var initInter = constrainedBuilder.initEnvelopePart(position, speed, -1);
         assert initInter;
-        boolean reachedLowLimit = false;
         while (true) {
             var step = TrainPhysicsIntegrator.step(context, position, speed, Action.COAST, -1);
             position += step.positionDelta;
             speed = step.endSpeed;
             if (speed < lowSpeedLimit) {
                 speed = lowSpeedLimit;
-                reachedLowLimit = true;
             }
 
             if (!constrainedBuilder.addStep(position, speed, step.timeDelta))
@@ -78,11 +52,6 @@ public static EnvelopePart coastFromEnd(
 
         assert constrainedBuilder.getLastPos() < endPos;
 
-        if (!reachedLowLimit && constrainedBuilder.getLastPos() != envelope.getBeginPos())
-            return backwardPartBuilder.build();
-
-        var resultCoast = coastFromBeginning(envelope, context, constrainedBuilder.getLastPos());
-        assert resultCoast == null || resultCoast.getEndPos() <= endPos + context.timeStep * speed;
-        return resultCoast;
+        return backwardPartBuilder.build();
     }
 }

core/envelope-sim/src/test/java/fr/sncf/osrd/envelope_sim/AllowanceTests.java

@@ -17,6 +17,7 @@
 import com.carrotsearch.hppc.DoubleArrayList;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import fr.sncf.osrd.envelope.Envelope;
+import fr.sncf.osrd.envelope.EnvelopeDebug;
 import fr.sncf.osrd.envelope.EnvelopeShape;
 import fr.sncf.osrd.envelope.EnvelopeTransitions;
 import fr.sncf.osrd.envelope_sim.allowances.AbstractAllowanceWithRanges;
@@ -553,10 +554,11 @@ public void testMarecoAcceleratingSlopes() {
         // If the test fails here, plot the curves to check if the curve makes sense and adapt the shape.
         // It is not supposed to be an absolute shape, but at least to be triggered if MARECO doesn't take into
         // account the accelerating slopes
+        EnvelopeDebug.plot(marecoEnvelope);
         check(marecoEnvelope, new EnvelopeShape[][]{
                 {INCREASING}, {CONSTANT}, {DECREASING, INCREASING}, {CONSTANT}, {INCREASING}, {CONSTANT},
                 {DECREASING, INCREASING}, {CONSTANT}, {DECREASING, INCREASING}, {CONSTANT},
-                {DECREASING, INCREASING, DECREASING, INCREASING, DECREASING, INCREASING},
+                {DECREASING, INCREASING, DECREASING, INCREASING, DECREASING, CONSTANT},
                 {DECREASING}, {INCREASING}, {CONSTANT}, {INCREASING}, {INCREASING}, {CONSTANT},
                 {DECREASING, INCREASING}, {CONSTANT}, {DECREASING, INCREASING, DECREASING},
                 {CONSTANT}, {DECREASING, INCREASING}, {CONSTANT}, {DECREASING, INCREASING, DECREASING}, {DECREASING}

core/envelope-sim/src/test/java/fr/sncf/osrd/envelope_sim/TrainPhysicsIntegratorTest.java

@@ -3,15 +3,8 @@
 import static fr.sncf.osrd.envelope_sim.SimpleContextBuilder.makeSimpleContext;
 import static fr.sncf.osrd.envelope_sim.TrainPhysicsIntegrator.getWeightForce;
 import static fr.sncf.osrd.envelope_sim.TrainPhysicsIntegrator.newtonStep;
-import static fr.sncf.osrd.envelope_sim.allowances.mareco_impl.CoastingGenerator.coastFromBeginning;
 import static org.junit.jupiter.api.Assertions.*;
 
-import fr.sncf.osrd.envelope.Envelope;
-import fr.sncf.osrd.envelope.part.ConstrainedEnvelopePartBuilder;
-import fr.sncf.osrd.envelope.part.EnvelopePartBuilder;
-import fr.sncf.osrd.envelope.part.constraints.EnvelopePartConstraintType;
-import fr.sncf.osrd.envelope.part.constraints.SpeedConstraint;
-import fr.sncf.osrd.envelope_sim.overlays.EnvelopeDeceleration;
 import org.junit.jupiter.api.Test;
 
 
@@ -112,25 +105,9 @@ public void testAccelerateAndCoast() {
         for (int i = 0; i < 60; i++) {
             step = TrainPhysicsIntegrator.step(context, position, speed, Action.COAST, +1);
             position += step.positionDelta;
-            var prevSpeed = step.startSpeed;
             speed = step.endSpeed;
         }
         // it should be stopped
         assertEquals(speed, 0.0);
     }
-
-    @Test
-    public void testEmptyCoastFromBeginning() {
-        var context = makeSimpleContext(100000, 0, TIME_STEP);
-        var builder = new EnvelopePartBuilder();
-        var constrainedBuilder = new ConstrainedEnvelopePartBuilder(
-                builder,
-                new SpeedConstraint(0, EnvelopePartConstraintType.FLOOR)
-        );
-        EnvelopeDeceleration.decelerate(context, 0, 10, constrainedBuilder, 1);
-        var acceleration = Envelope.make(builder.build());
-        // starting a coasting phase in a braking phase must result in a null EnvelopePart
-        var failedCoast = coastFromBeginning(acceleration, context, 0);
-        assertNull(failedCoast);
-    }
 }

core/envelope-sim/src/testFixtures/java/fr/sncf/osrd/envelope/EnvelopeShape.java

@@ -1,5 +1,6 @@
 package fr.sncf.osrd.envelope;
 
+import static fr.sncf.osrd.envelope_sim.TrainPhysicsIntegrator.areSpeedsEqual;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import fr.sncf.osrd.envelope.part.EnvelopePart;
@@ -14,7 +15,7 @@ public enum EnvelopeShape {
     public static EnvelopeShape fromStep(EnvelopePart part, int stepIndex) {
         var beginSpeed = part.getBeginSpeed(stepIndex);
         var endSpeed = part.getEndSpeed(stepIndex);
-        if (beginSpeed == endSpeed)
+        if (areSpeedsEqual(beginSpeed, endSpeed))
             return CONSTANT;
         else if (beginSpeed < endSpeed)
             return INCREASING;

core/src/main/kotlin/fr/sncf/osrd/sim_infra_adapter/RawInfraAdapter.kt

@@ -276,7 +276,6 @@ fun adaptRawInfra(infra: SignalingInfra): SimInfraAdapter {
                     signalsPerTrack,
                     builder
                 )
-                builder
 
                 // check if the zone is a release zone
                 if (releaseIndex < oldReleasePoints.size && oldEndDet.detector!! == oldReleasePoints[releaseIndex]) {