core: editoast: front: add flag to ignore infra speed limits #10681

axrolld · 2025-02-05T08:54:31Z

Add a flag to ignore infra speed limits in a standalone simulation.

This will be useful in BASIC import to fix late trains for the moment.

Closes #10587

codecov-commenter · 2025-02-05T08:57:02Z

⚠️ Please install the to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.93%. Comparing base (fd615e7) to head (a237b67).
Report is 76 commits behind head on dev.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##              dev   #10681      +/-   ##
==========================================
+ Coverage   81.81%   81.93%   +0.11%     
==========================================
  Files        1073     1079       +6     
  Lines      106938   107376     +438     
  Branches      722      737      +15     
==========================================
+ Hits        87490    87976     +486     
+ Misses      19409    19360      -49     
- Partials       39       40       +1

Flag	Coverage Δ
editoast	`74.27% <ø> (+0.09%)`	⬆️
front	`89.47% <ø> (+0.11%)`	⬆️
gateway	`2.18% <ø> (ø)`
osrdyne	`3.28% <ø> (ø)`
railjson_generator	`87.50% <ø> (ø)`
tests	`88.14% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Alex Rolland <[email protected]>

eckter

Nice job!

eckter · 2025-02-06T16:00:59Z

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

@@ -143,5 +143,6 @@ class SimulationPowerRestrictionItem(
 )

 class TrainScheduleOptions(
-    @Json(name = "use_electrical_profiles") val useElectricalProfiles: Boolean
+    @Json(name = "use_electrical_profiles") val useElectricalProfiles: Boolean,
+    @Json(name = "ignore_infra_speed_limits") val ingoreInfraSpeedLimits: Boolean


typo

Suggested change

@Json(name = "ignore_infra_speed_limits") val ingoreInfraSpeedLimits: Boolean

@Json(name = "ignore_infra_speed_limits") val ignoreInfraSpeedLimits: Boolean

Good catch thanks !

eckter · 2025-02-06T16:01:45Z

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

@@ -143,5 +143,6 @@ class SimulationPowerRestrictionItem(
 )

 class TrainScheduleOptions(
-    @Json(name = "use_electrical_profiles") val useElectricalProfiles: Boolean
+    @Json(name = "use_electrical_profiles") val useElectricalProfiles: Boolean,
+    @Json(name = "ignore_infra_speed_limits") val ingoreInfraSpeedLimits: Boolean


We may want to invert the logic to be consistent with use_electrical_profiles. We could make it optional as well, and use them if unspecified.

eckter · 2025-02-06T16:02:25Z

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

@@ -59,6 +59,8 @@ 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


Suggested change

* computaion

* computation

eckter · 2025-02-06T16:05:10Z

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

-                    attrs,
-                    doubleArrayOf(start, end),
-                    doubleArrayOf(speed, speed)
+    if (!ignoreInfraSpeedLimits) { //if we take into account speedlimits coming from the infrastructure


I'd have preferred a way to avoid this large if block.

Maybe something like this, what do you think?

val speedLimitProperties = if (ignoreInfraSpeedLimits) distanceRangeMapOf() else path.getSpeedLimitProperties(trainTag, temporarySpeedLimitManager) for (speedLimitPropertyRange in speedLimitProperties) { // ... }

eckter · 2025-02-06T16:11:32Z

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

@@ -72,36 +74,39 @@ fun computeMRSP(
    trainTag: String?,
    temporarySpeedLimitManager: TemporarySpeedLimitManager?,
    safetySpeedRanges: DistanceRangeMap<Speed>? = null,
+    ignoreInfraSpeedLimits: Boolean = false,


The parameter isn't set.

It should be done in StandaloneSimulation.kt:71. And it should also be added to the other version of the method which takes a rolling stock as parameter (this file, line 35).

Signed-off-by: Alex Rolland <[email protected]>

woshilapin

Looks ok for editoast but something weird showed up. Since it's not part of your PR, feel free to discard it, but if it could be fixed with it, that'd be great.

woshilapin · 2025-02-06T16:24:00Z

python/osrd_schemas/osrd_schemas/train_schedule.py

+    """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
+    """

    ignore_electrical_profiles: bool = Field(


Hmm, something is fishy. In editoast, this schema is defined as use_electrical_profiles...

It was added in osrd_schemas in 65936d6#diff-d5864b67bb112b9568c11e82046affbf1336af068b01ea186f7f7e39bf39b20eR139-R142 as ignore_electrical_profiles and was added in editoast in 79c5caa#diff-64eae74a5b61bec4f050765098f382e536496ec9b5917caa1385722f99ffdf9fR157 as use_electrical_profiles.

cc @flomonster @Castavo any idea what might have happened and what is the best way to fix that (sorry, both of your names showed up in git blame)?

github-actions bot added area:railjson Work on Proposed Unified Rail Assets Data Exchange Format area:core Work on Core Service area:editoast Work on Editoast Service labels Feb 5, 2025

github-actions bot added the area:front Work on Standard OSRD Interface modules label Feb 5, 2025

woshilapin force-pushed the ard/flag-speed-limits branch from e834a62 to 37324e3 Compare February 5, 2025 11:03

axrolld force-pushed the ard/flag-speed-limits branch 3 times, most recently from 31ffe44 to 210ba0e Compare February 5, 2025 14:38

core, editoast: add flag to ignore speed limits

dd7835a

Signed-off-by: Alex Rolland <[email protected]>

axrolld force-pushed the ard/flag-speed-limits branch from 210ba0e to dd7835a Compare February 5, 2025 16:37

core: fix tests

b29487e

Signed-off-by: Alex Rolland <[email protected]>

axrolld force-pushed the ard/flag-speed-limits branch from e70e492 to b29487e Compare February 6, 2025 10:56

axrolld marked this pull request as ready for review February 6, 2025 15:40

axrolld requested review from a team as code owners February 6, 2025 15:40

axrolld requested a review from eckter February 6, 2025 15:40

axrolld changed the title ~~core: editoast: add flag to ignore infra speed limits~~ core: editoast: front: add flag to ignore infra speed limits Feb 6, 2025

axrolld requested review from woshilapin and SarahBellaha February 6, 2025 15:45

eckter reviewed Feb 6, 2025

View reviewed changes

core: add test & fixups

a237b67

Signed-off-by: Alex Rolland <[email protected]>

woshilapin approved these changes Feb 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core: editoast: front: add flag to ignore infra speed limits #10681

core: editoast: front: add flag to ignore infra speed limits #10681

axrolld commented Feb 5, 2025 •

edited

Loading

codecov-commenter commented Feb 5, 2025 •

edited

Loading

eckter left a comment

eckter Feb 6, 2025

axrolld Feb 6, 2025

eckter Feb 6, 2025

eckter Feb 6, 2025

eckter Feb 6, 2025

eckter Feb 6, 2025

woshilapin left a comment

woshilapin Feb 6, 2025

	@Json(name = "ignore_infra_speed_limits") val ingoreInfraSpeedLimits: Boolean
	@Json(name = "ignore_infra_speed_limits") val ignoreInfraSpeedLimits: Boolean

core: editoast: front: add flag to ignore infra speed limits #10681

Are you sure you want to change the base?

core: editoast: front: add flag to ignore infra speed limits #10681

Conversation

axrolld commented Feb 5, 2025 • edited Loading

codecov-commenter commented Feb 5, 2025 • edited Loading

Codecov Report

eckter left a comment

Choose a reason for hiding this comment

eckter Feb 6, 2025

Choose a reason for hiding this comment

axrolld Feb 6, 2025

Choose a reason for hiding this comment

eckter Feb 6, 2025

Choose a reason for hiding this comment

eckter Feb 6, 2025

Choose a reason for hiding this comment

eckter Feb 6, 2025

Choose a reason for hiding this comment

eckter Feb 6, 2025

Choose a reason for hiding this comment

woshilapin left a comment

Choose a reason for hiding this comment

woshilapin Feb 6, 2025

Choose a reason for hiding this comment

axrolld commented Feb 5, 2025 •

edited

Loading

codecov-commenter commented Feb 5, 2025 •

edited

Loading