core, editoast, front: fix review comments

Signed-off-by: Alex Rolland <alex.rolland@reseau.sncf.fr>

Author: Alex Rolland

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

@@ -61,8 +61,8 @@ public static StandaloneSimResult run(
                 var rollingStock = trainSchedule.rollingStock;
 
                 // MRSP & SpeedLimits
-                var mrsp = computeMRSP(trainPath, rollingStock, true, trainSchedule.tag, null, null, false);
-                var speedLimits = computeMRSP(trainPath, rollingStock, false, trainSchedule.tag, null, null, false);
+                var mrsp = computeMRSP(trainPath, rollingStock, true, trainSchedule.tag, null, null, true);
+                var speedLimits = computeMRSP(trainPath, rollingStock, false, trainSchedule.tag, null, null, true);
                 mrsp = driverBehaviour.applyToMRSP(mrsp);
                 cacheSpeedLimits.put(trainSchedule, ResultEnvelopePoint.from(speedLimits));
 

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/standalone_sim/SimulationEndpoint.kt

@@ -90,6 +90,7 @@ class SimulationEndpoint(
                     request.speedLimitTag,
                     parsePowerRestrictions(request.powerRestrictions),
                     request.options.useElectricalProfiles,
+                    request.options.useInfraSpeedLimits ?: true,
                     2.0,
                     parseRawSimulationScheduleItems(request.schedule),
                     request.initialSpeed,

core/src/main/kotlin/fr/sncf/osrd/api/api_v2/standalone_sim/SimulationRequest.kt

@@ -144,5 +144,5 @@ class SimulationPowerRestrictionItem(
 
 class TrainScheduleOptions(
     @Json(name = "use_electrical_profiles") val useElectricalProfiles: Boolean,
-    @Json(name = "ignore_infra_speed_limits") val ingoreInfraSpeedLimits: Boolean
+    @Json(name = "use_infra_speed_limits_for_simulation") val useInfraSpeedLimits: Boolean?
 )

core/src/main/kotlin/fr/sncf/osrd/envelope_sim_infra/MRSP.kt

@@ -30,6 +30,8 @@ import kotlin.math.min
  * @param addRollingStockLength whether the rolling stock length should be taken into account in the
  *   computation.
  * @param trainTag corresponding train.
+ * @param useInfraSpeedLimits whether the speed limits coming from the infrastructure should be
+ *   taken into account in the computation
  * @return the corresponding MRSP as an Envelope.
  */
 fun computeMRSP(
@@ -39,7 +41,7 @@ fun computeMRSP(
     trainTag: String?,
     temporarySpeedLimitManager: TemporarySpeedLimitManager?,
     safetySpeedRanges: DistanceRangeMap<Speed>? = null,
-    ignoreInfraSpeedLimits: Boolean = false,
+    useInfraSpeedLimits: Boolean = true,
 ): Envelope {
     return computeMRSP(
         path,
@@ -49,7 +51,7 @@ fun computeMRSP(
         trainTag,
         temporarySpeedLimitManager,
         safetySpeedRanges,
-        ignoreInfraSpeedLimits,
+        useInfraSpeedLimits,
     )
 }
 
@@ -61,11 +63,11 @@ fun computeMRSP(
  * @param rsLength length of the rolling stock (m)
  * @param addRollingStockLength whether the rolling stock length should be taken into account in the
  *   computation.
- * @param ignoreInfraSpeedLimits whether the speed limits coming from the infrastructure should be ignored in the
- *   computaion
  * @param trainTag corresponding train.
  * @param safetySpeedRanges Extra speed ranges, used for safety speeds. Note: rolling stock length
  *   is *not* added at the end of these ranges.
+ * @param useInfraSpeedLimits whether the speed limits coming from the infrastructure should be
+ *   taken into account in the computation
  * @return the corresponding MRSP as an Envelope.
  */
 fun computeMRSP(
@@ -76,39 +78,39 @@ fun computeMRSP(
     trainTag: String?,
     temporarySpeedLimitManager: TemporarySpeedLimitManager?,
     safetySpeedRanges: DistanceRangeMap<Speed>? = null,
-    ignoreInfraSpeedLimits: Boolean = false,
+    useInfraSpeedLimits: Boolean = true,
 ): Envelope {
     val builder = MRSPEnvelopeBuilder()
     val pathLength = toMeters(path.getLength())
 
     val offset = if (addRollingStockLength) rsLength else 0.0
-    val speedLimitProperties = path.getSpeedLimitProperties(trainTag, temporarySpeedLimitManager)
-    if (!ignoreInfraSpeedLimits) { //if we take into account speedlimits coming from the infrastructure
-        for (speedLimitPropertyRange in speedLimitProperties) {
-            // Compute where this limit is active from and to
-            val start = toMeters(speedLimitPropertyRange.lower)
-            val end = min(pathLength, offset + toMeters(speedLimitPropertyRange.upper))
-            val speedLimitProp = rangeMapEntryToSpeedLimitProperty(speedLimitPropertyRange)
-            val speed = toMetersPerSecond(speedLimitProp.speed)
-            val attrs =
-                mutableListOf<SelfTypeHolder?>(
-                    EnvelopeProfile.CONSTANT_SPEED,
-                    MRSPEnvelopeBuilder.LimitKind.SPEED_LIMIT
-                )
-            if (speedLimitProp.source != null) {
-                attrs.add(speedLimitProp.source)
-            }
-            if (attrs.any { it is UnknownTag }) attrs.add(HasMissingSpeedTag)
-            if (speed != 0.0) {
-                // Add the envelope part corresponding to the restricted speed section
-                builder.addPart(
-                    EnvelopePart.generateTimes(
-                        attrs,
-                        doubleArrayOf(start, end),
-                        doubleArrayOf(speed, speed)
-                    )
+    val speedLimitProperties =
+        if (useInfraSpeedLimits) path.getSpeedLimitProperties(trainTag, temporarySpeedLimitManager)
+        else distanceRangeMapOf<SpeedLimitProperty>()
+    for (speedLimitPropertyRange in speedLimitProperties) {
+        // Compute where this limit is active from and to
+        val start = toMeters(speedLimitPropertyRange.lower)
+        val end = min(pathLength, offset + toMeters(speedLimitPropertyRange.upper))
+        val speedLimitProp = rangeMapEntryToSpeedLimitProperty(speedLimitPropertyRange)
+        val speed = toMetersPerSecond(speedLimitProp.speed)
+        val attrs =
+            mutableListOf<SelfTypeHolder?>(
+                EnvelopeProfile.CONSTANT_SPEED,
+                MRSPEnvelopeBuilder.LimitKind.SPEED_LIMIT
+            )
+        if (speedLimitProp.source != null) {
+            attrs.add(speedLimitProp.source)
+        }
+        if (attrs.any { it is UnknownTag }) attrs.add(HasMissingSpeedTag)
+        if (speed != 0.0) {
+            // Add the envelope part corresponding to the restricted speed section
+            builder.addPart(
+                EnvelopePart.generateTimes(
+                    attrs,
+                    doubleArrayOf(start, end),
+                    doubleArrayOf(speed, speed)
                 )
-            }
+            )
         }
     }
 
@@ -124,7 +126,7 @@ fun computeMRSP(
     )
 
     // Add safety speeds
-    if (!ignoreInfraSpeedLimits && safetySpeedRanges != null) {
+    if (useInfraSpeedLimits && safetySpeedRanges != null) {
         for (range in safetySpeedRanges) {
             val speed = range.value
             val newAttrs =

core/src/main/kotlin/fr/sncf/osrd/standalone_sim/StandaloneSimulation.kt

@@ -59,6 +59,7 @@ fun runStandaloneSimulation(
     speedLimitTag: String?,
     powerRestrictions: DistanceRangeMap<String>,
     useElectricalProfiles: Boolean,
+    useInfraSpeedLimits: Boolean,
     timeStep: Double,
     schedule: List<SimulationScheduleItem>,
     initialSpeed: Double,
@@ -68,7 +69,16 @@ fun runStandaloneSimulation(
 ): SimulationSuccess {
     // MRSP & SpeedLimits
     val safetySpeedRanges = makeSafetySpeedRanges(infra, chunkPath, routes, schedule)
-    var mrsp = computeMRSP(pathProps, rollingStock, true, speedLimitTag, null, safetySpeedRanges)
+    var mrsp =
+        computeMRSP(
+            pathProps,
+            rollingStock,
+            true,
+            speedLimitTag,
+            null,
+            safetySpeedRanges,
+            useInfraSpeedLimits
+        )
     mrsp = driverBehaviour.applyToMRSP(mrsp)
     // We don't use speed safety ranges in the MRSP displayed in the front
     // (just like we don't add the train length)
@@ -79,6 +89,8 @@ fun runStandaloneSimulation(
             false,
             speedLimitTag,
             null,
+            null,
+            useInfraSpeedLimits,
         )
 
     // Build paths and contexts

core/src/test/kotlin/fr/sncf/osrd/standalone_sim/StandaloneSimulationTest.kt

@@ -91,6 +91,7 @@ class StandaloneSimulationTest {
                 null,
                 distanceRangeMapOf(),
                 false,
+                true,
                 2.0,
                 listOf(),
                 0.0,
@@ -236,6 +237,7 @@ class StandaloneSimulationTest {
                 null,
                 testCase.powerRestrictions,
                 false,
+                true,
                 2.0,
                 testCase.schedule,
                 testCase.startSpeed,

editoast/editoast_schemas/src/train_schedule/train_schedule_options.rs

@@ -14,10 +14,15 @@ pub struct TrainScheduleOptions {
     #[derivative(Default(value = "true"))]
     #[serde(default = "default_use_electrical_profiles")]
     use_electrical_profiles: bool,
-    #[serde(default)]
-    ignore_infra_speed_limits: bool,
+    #[derivative(Default(value = "true"))]
+    #[serde(default = "default_use_speed_limits_for_simulation")]
+    use_speed_limits_for_simulation: bool,
 }
 
 fn default_use_electrical_profiles() -> bool {
     true
 }
+
+fn default_use_speed_limits_for_simulation() -> bool {
+    true
+}

editoast/openapi.yaml

@@ -11884,8 +11884,6 @@ components:
         options:
           type: object
           properties:
-            ignore_infra_speed_limits:
-              type: boolean
             use_electrical_profiles:
               type: boolean
           additionalProperties: false
@@ -11981,8 +11979,6 @@ components:
     TrainScheduleOptions:
       type: object
       properties:
-        ignore_infra_speed_limits:
-          type: boolean
         use_electrical_profiles:
           type: boolean
       additionalProperties: false

front/src/common/api/generatedEditoastApi.ts

@@ -1151,7 +1151,7 @@ export type PostInfraRefreshApiResponse = /** status 200  */ {
 export type PostInfraRefreshApiArg = {
   force?: boolean;
   /** A comma-separated list of infra IDs to refresh
-    
+
     If not provided, all available infras will be refreshed. */
   infras?: number[];
 };
@@ -1743,12 +1743,12 @@ export type PostTimetableByIdStdcmApiArg = {
     steps: PathfindingItem[];
     temporary_speed_limit_group_id?: number | null;
     /** Margin after the train passage in milliseconds
-        
+
         Enforces that the path used by the train should be free and
         available at least that many milliseconds after its passage. */
     time_gap_after?: number;
     /** Margin before the train passage in seconds
-        
+
         Enforces that the path used by the train should be free and
         available at least that many milliseconds before its passage. */
     time_gap_before?: number;
@@ -3254,7 +3254,7 @@ export type Margins = {
   values: string[];
 };
 export type TrainScheduleOptions = {
-  ignore_infra_speed_limits?: boolean;
+  use_infra_speed_limits_for_simulation?: boolean;
   use_electrical_profiles?: boolean;
 };
 export type PathItem = PathItemLocation & {
@@ -3312,7 +3312,7 @@ export type SearchResultItem =
 export type SearchQuery = boolean | number | number | string | (SearchQuery | null)[];
 export type SearchPayload = {
   /** Whether to return the SQL query instead of executing it
-    
+
     Only available in debug builds. */
   dry?: boolean;
   /** The object kind to query - run `editoast search list` to get all possible values */
@@ -3613,7 +3613,7 @@ export type TrainScheduleBase = {
     values: string[];
   };
   options?: {
-    ignore_infra_speed_limits?: boolean;
+    use_infra_speed_limits_for_simulation?: boolean;
     use_electrical_profiles?: boolean;
   };
   path: (PathItemLocation & {

python/osrd_schemas/osrd_schemas/train_schedule.py

@@ -171,17 +171,18 @@ class PowerRestrictionRanges(RootModel):
 
 class TrainScheduleOptions(BaseModel):
     """Optional arguments :
-    - `ignore_electrical_profiles` : ignore the electrical profiles for the standalone simulation
-    - `ignore_infra_speed_limits` : ignore the speed limits coming from the infrastructure for the standalone simulation
+    - `use_electrical_profiles` : use the electrical profiles for the standalone simulation
+    - `use_infra_speed_limits_for_simulation` : use the speed limits coming from the infrastructure for
+       the standalone simulation
     """
 
-    ignore_electrical_profiles: bool = Field(
+    use_electrical_profiles: bool = Field(
         default=False,
-        description="If true, the electrical profiles are ignored in the standalone simulation",
+        description="If true, the electrical profiles are used in the standalone simulation",
     )
-    ignore_infra_speed_limits: bool = Field(
-        default=False,
-        description="If true, the speed limits of the infrastructure are ignored in the standalone simulation",
+    use_infra_speed_limits_for_simulation: bool = Field(
+        default=True,
+        description="If false, the speed limits of the infrastructure are ignored in the standalone simulation",
     )