fixup! core: add etcs svl logic

Author: Erashin

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/Constants.kt

@@ -17,7 +17,7 @@ const val qNvinhsmicperm = false
  * National Default Value: permission to follow release speed at 40km/h near the EoA. See Subset
  * 026: table in Appendix A.3.2.
  */
-const val releaseSpeed = 40.0 / 3.6 // m/s
+const val nationalReleaseSpeed = 40.0 / 3.6 // m/s
 
 /**
  * Estimated acceleration during tBerem, worst case scenario (aEst2 is between 0 and 0.4), expressed

core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt

@@ -80,7 +80,7 @@ fun addBrakingCurvesAtEOAs(
                 )
                 assert(
                     indicationCurveSvl.beginSpeed <= maxSpeedEnvelope &&
-                        indicationCurveSvl.endSpeed >= releaseSpeed
+                        indicationCurveSvl.endSpeed >= nationalReleaseSpeed
                 )
                 builder.addPart(indicationCurveSvl)
                 envelopeWithEoaBrakingCurves = builder.build()
@@ -252,8 +252,8 @@ private fun computeSvlIndicationCurve(
     if (fullIndicationCurveSvl.beginPos >= targetPosition) return null
     val fullIndCurveSvlWithMaintain: Envelope
     val releaseSpeedPosition =
-        if (fullIndicationCurveSvl.maxSpeed >= releaseSpeed)
-            fullIndicationCurveSvl.interpolatePosition(releaseSpeed)
+        if (fullIndicationCurveSvl.maxSpeed >= nationalReleaseSpeed)
+            fullIndicationCurveSvl.interpolatePosition(nationalReleaseSpeed)
         else fullIndicationCurveSvl.beginPos
     if (releaseSpeedPosition >= targetPosition) {
         fullIndCurveSvlWithMaintain =
@@ -265,7 +265,7 @@ private fun computeSvlIndicationCurve(
             EnvelopePart.generateTimes(
                 listOf(EnvelopeProfile.CONSTANT_SPEED),
                 doubleArrayOf(releaseSpeedPosition, targetPosition),
-                doubleArrayOf(releaseSpeed, releaseSpeed)
+                doubleArrayOf(nationalReleaseSpeed, nationalReleaseSpeed)
             )
         fullIndCurveSvlWithMaintain =
             if (releaseSpeedPosition == fullIndicationCurveSvl.beginPos) {
@@ -276,7 +276,7 @@ private fun computeSvlIndicationCurve(
                         fullIndicationCurveSvl.beginPos,
                         fullIndicationCurveSvl.beginSpeed,
                         releaseSpeedPosition,
-                        releaseSpeed
+                        nationalReleaseSpeed
                     ),
                     maintainReleaseSpeedCurve
                 )
@@ -477,7 +477,6 @@ private fun keepBrakingCurveUnderOverlay(
                 mergedArray + currentArray.drop(1).toDoubleArray()
             }
     val timeDeltas = fullBrakingCurve.flatMap { it.cloneTimes().asList() }
-    val nbPoints = positions.size
 
     val partBuilder = EnvelopePartBuilder()
     partBuilder.setAttr(EnvelopeProfile.BRAKING)
@@ -487,23 +486,33 @@ private fun keepBrakingCurveUnderOverlay(
             PositionConstraint(max(beginPos, fullBrakingCurve.beginPos), overlay.endPos),
             EnvelopeConstraint(overlay, EnvelopePartConstraintType.CEILING)
         )
-    // Find the last point of the braking curve which is located below the overlay envelope, and
-    // init the overlay builder there.
-    var lastIndex = nbPoints - 1
+    val lastIndex = getIndexOfLastPointBeneathOverlay(positions, speeds, overlay)
+    // To create a braking curve with overlay builder, we need at least 2 positions.
+    if (lastIndex <= 0) return null
+    overlayBuilder.initEnvelopePart(positions[lastIndex], speeds[lastIndex], -1.0)
+    for (i in lastIndex - 1 downTo 0) {
+        if (!overlayBuilder.addStep(positions[i], speeds[i], timeDeltas[i])) break
+    }
+    return partBuilder.build()
+}
+
+/** Find the index of the last point which is located beneath the overlay envelope, -1 if none exist. */
+private fun getIndexOfLastPointBeneathOverlay(
+    positions: DoubleArray,
+    speeds: DoubleArray,
+    overlay: Envelope
+): Int {
+    var lastIndex = positions.size - 1
     while (
+        lastIndex >= 0 &&
         speeds[lastIndex] >
             overlay
                 .get(overlay.findRightDir(positions[lastIndex], -1.0))
                 .interpolateSpeed(positions[lastIndex])
     ) {
         lastIndex--
-        if (lastIndex == 0) return null
-    }
-    overlayBuilder.initEnvelopePart(positions[lastIndex], speeds[lastIndex], -1.0)
-    for (i in lastIndex - 1 downTo 0) {
-        if (!overlayBuilder.addStep(positions[i], speeds[i], timeDeltas[i])) break
     }
-    return partBuilder.build()
+    return lastIndex
 }
 
 private data class BecParams(val dBec: Double, val vBec: Double, val speed: Double) {

tests/tests/test_train_schedule.py

@@ -20,6 +20,7 @@ def kph2ms(kmh_speed: float) -> float:
 SPEED_LIMIT_112 = kph2ms(111.9996)
 SAFE_SPEED_30 = kph2ms(29.9988)
 SHORT_SLIP_SPEED_10 = kph2ms(10.0008)
+RELEASE_SPEED_40 = kph2ms(40)
 
 
 def _update_simulation_with_mareco_allowances(editoast_url, train_Schedule_id):
@@ -393,10 +394,10 @@ def test_etcs_schedule_result_stop_with_eoa_and_svl_at_same_location(etcs_scenar
     # Check that the release part (where the speed stays at 40km/h) starts and ends at the expected offsets.
     offset_start_release_speed = 40_827_882
     speed_at_start_release_speed = _get_current_or_next_speed_at(simulation_final_output, offset_start_release_speed)
-    _assert_equal_speeds(speed_at_start_release_speed, kph2ms(40))
+    _assert_equal_speeds(speed_at_start_release_speed, RELEASE_SPEED_40)
     offset_end_release_speed = 40_892_792
     speed_at_end_release_speed = _get_current_or_next_speed_at(simulation_final_output, offset_end_release_speed)
-    _assert_equal_speeds(speed_at_end_release_speed, kph2ms(40))
+    _assert_equal_speeds(speed_at_end_release_speed, RELEASE_SPEED_40)
 
 
 def test_etcs_schedule_result_stop_with_eoa_and_svl_at_different_locations(