core: do not merge: plot all etcs curves

Signed-off-by: Erashin <[email protected]>
OpenRailAssociation · Jan 21, 2025 · 1087b92 · 1087b92
1 parent 74a2bcb
commit 1087b92
Showing 1 changed file with 42 additions and 8 deletions.
diff --git a/core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt b/core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
@@ -1,6 +1,7 @@
 package fr.sncf.osrd.envelope_sim.etcs
 
 import fr.sncf.osrd.envelope.Envelope
+import fr.sncf.osrd.envelope.EnvelopeDebug.PlotBuilder
 import fr.sncf.osrd.envelope.OverlayEnvelopeBuilder
 import fr.sncf.osrd.envelope.part.ConstrainedEnvelopePartBuilder
 import fr.sncf.osrd.envelope.part.EnvelopePart
@@ -160,7 +161,7 @@ fun addBrakingCurvesAtLOAs(
         assert(ebiCurve.endSpeed == targetSpeed)
 
         val fullIndicationCurve =
-            computeIndicationBrakingCurveFromRef(context, ebiCurve, BrakingCurveType.EBI, guiCurve)
+            computeIndicationBrakingCurveFromRef(context, ebiCurve, BrakingCurveType.EBI, guiCurve, ebdCurve)
         assert(fullIndicationCurve.endPos <= targetPosition)
         assert(fullIndicationCurve.endSpeed == targetSpeed)
 
@@ -309,7 +310,8 @@ private fun computeIndicationBrakingCurveFromRef(
     context: EnvelopeSimContext,
     refBrakingCurve: EnvelopePart,
     refBrakingCurveType: BrakingCurveType,
-    guiCurve: EnvelopePart
+    guiCurve: EnvelopePart,
+    ebdCurve: EnvelopePart? = null,
 ): EnvelopePart {
     val rollingStock = context.rollingStock
     val tBs =
@@ -323,7 +325,11 @@ private fun computeIndicationBrakingCurveFromRef(
         }
 
     val pointCount = refBrakingCurve.pointCount()
-    val newPositions = DoubleArray(pointCount)
+    val sbiPositions = DoubleArray(pointCount)
+    val warningPositions = DoubleArray(pointCount)
+    val psPositions = DoubleArray(pointCount)
+    val adjustedPsPositions = DoubleArray(pointCount)
+    val indicationPositions = DoubleArray(pointCount)
     val newSpeeds = DoubleArray(pointCount)
     for (i in 0 until refBrakingCurve.pointCount()) {
         val speed = refBrakingCurve.getPointSpeed(i)
@@ -332,14 +338,37 @@ private fun computeIndicationBrakingCurveFromRef(
         val adjustedPermittedSpeedPosition =
             getAdjustedPermittedSpeedPosition(permittedSpeedPosition, speed, guiCurve)
         val indicationPosition = getIndicationPosition(adjustedPermittedSpeedPosition, speed, tBs)
-        newPositions[i] = indicationPosition
+        sbiPositions[i] = sbiPosition
+        warningPositions[i] = getWarningPosition(sbiPosition, speed)
+        psPositions[i] = permittedSpeedPosition
+        adjustedPsPositions[i] = adjustedPermittedSpeedPosition
+        indicationPositions[i] = indicationPosition
         newSpeeds[i] = speed
     }
 
-    val brakingCurve =
-        EnvelopePart.generateTimes(listOf(EnvelopeProfile.BRAKING), newPositions, newSpeeds)
-
-    return brakingCurve
+    val sbiBrakingCurve =
+        EnvelopePart.generateTimes(listOf(EnvelopeProfile.BRAKING), sbiPositions, newSpeeds)
+    val warningBrakingCurve =
+        EnvelopePart.generateTimes(listOf(EnvelopeProfile.BRAKING), warningPositions, newSpeeds)
+    val psBrakingCurve =
+        EnvelopePart.generateTimes(listOf(EnvelopeProfile.BRAKING), psPositions, newSpeeds)
+    val adjustedPsBrakingCurve =
+        EnvelopePart.generateTimes(listOf(EnvelopeProfile.BRAKING), adjustedPsPositions, newSpeeds)
+    val indicationBrakingCurve =
+        EnvelopePart.generateTimes(listOf(EnvelopeProfile.BRAKING), indicationPositions, newSpeeds)
+
+    val plotBuilder = PlotBuilder()
+    val refBrakingCurveName = if (refBrakingCurveType == BrakingCurveType.EBI) "EBI" else "SBD"
+    if (ebdCurve != null) plotBuilder.add(Envelope.make(ebdCurve), "EBD")
+    plotBuilder.add(Envelope.make(refBrakingCurve), refBrakingCurveName)
+    plotBuilder.add(Envelope.make(sbiBrakingCurve), "SBI")
+    plotBuilder.add(Envelope.make(warningBrakingCurve), "Warning")
+    plotBuilder.add(Envelope.make(psBrakingCurve), "PS")
+    plotBuilder.add(Envelope.make(adjustedPsBrakingCurve), "AdjustedPS")
+    plotBuilder.add(Envelope.make(indicationBrakingCurve), "IND")
+    plotBuilder.plot()
+
+    return indicationBrakingCurve
 }
 
 /**
@@ -443,6 +472,11 @@ private fun getSbiPosition(ebiOrSbdPosition: Double, speed: Double, tbs: Double)
     return getPreviousPosition(ebiOrSbdPosition, speed, tbs)
 }
 
+/** See Subset 026: §3.13.9.3.4.1. */
+private fun getWarningPosition(sbiPosition: Double, speed: Double): Double {
+    return getPreviousPosition(sbiPosition, speed, tWarning)
+}
+
 /** See Subset 026: §3.13.9.3.5.1. */
 private fun getPermittedSpeedPosition(sbiPosition: Double, speed: Double): Double {
     return getPreviousPosition(sbiPosition, speed, tDriver)