Add ERTMS-ETCS brake params and signaling to rolling-stock model #10147

bougue-pe · 2024-12-20T08:29:47Z

Note: not managing towed rolling-tock so far (may not have a max_speed, not sure how to merge brake values).

Also:

Add ETCS_LEVEL2 signaling for infra and rolling-stock (complete duplicate of TVM430 for now).
Compute ETCS_LEVEL2 ranges of the path
Fix some small bits (🔍 review by commit)
Tests:
- add tests ETCS_LEVEL2 rolling-stock (derived from fast_rolling_stock).
- add tests ETCS infra (including electrical_profile). Derived from small_infra, just switching all the signaling from BAL to
  ETCS_LEVEL2.

✅ Hand-tested only for now:

keeps ETCS params when editing RS
when removing the TODO() on core ETCS-brake part processing, it "works" as expected, with the TODO() it fails in core

fix #9708 and #9706

TODO after this PR:

add integration tests (circumvent ETCS intervals for now with a TODO) > For this PI : tests: add ETCS braking curve integration tests for stops only #10294
prioritize signaling systems for blocks of pathfinding: ETCS>TVM430>TVM300>BAL>BAPR
use the signaling system output from pathfinding everywhere (remove recoverBlockPath - only deprecated now)
merge small_infra BAL and ERTMS (and TVM?)

codecov-commenter · 2024-12-20T08:31:55Z

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

Codecov Report

Attention: Patch coverage is 44.94382% with 49 lines in your changes missing coverage. Please review.

Project coverage is 81.49%. Comparing base (cae4d30) to head (85ccac8).
Report is 22 commits behind head on dev.

Files with missing lines	Patch %	Lines
...ast_schemas/src/rolling_stock/etcs_brake_params.rs	4.54%	42 Missing ⚠️
editoast/editoast_schemas/src/rolling_stock.rs	81.81%	4 Missing ⚠️
editoast/src/core/simulation.rs	85.71%	2 Missing ⚠️
...tock/components/RollingStockSelector/sampleData.ts	0.00%	1 Missing ⚠️

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

Additional details and impacted files

@@           Coverage Diff            @@
##              dev   #10147    +/-   ##
========================================
  Coverage   81.49%   81.49%            
========================================
  Files        1058     1061     +3     
  Lines      104270   104575   +305     
  Branches      722      722            
========================================
+ Hits        84973    85226   +253     
- Misses      19256    19308    +52     
  Partials       41       41

Flag	Coverage Δ
editoast	`73.64% <45.45%> (-0.11%)`	⬇️
front	`89.24% <0.00%> (+0.03%)`	⬆️
gateway	`2.18% <ø> (ø)`
osrdyne	`3.28% <ø> (ø)`
railjson_generator	`87.50% <ø> (ø)`
tests	`87.05% <ø> (ø)`

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.

woshilapin

I've only looked at the editoast part. Looks good. I'm only worry about the "towed rolling stock" not being handled yet, which might means an incorrect feature (not an incomplete one). What's your take on that?

editoast/editoast_schemas/src/rolling_stock.rs

editoast/editoast_schemas/src/rolling_stock/etcs_brake_params.rs

editoast/src/core/simulation.rs

front/src/common/api/generatedEditoastApi.ts

eckter

Nice job!

For the test infra, we may not need something as complex as a clone of small_infra. Maybe an infra with a few tracks, a switch and a few slopes would be enough and easier to maintain. (But it's fine as it is if you prefer it this way)
-> Adding a non-ERTMS section would be nice.

core/kt-fast-collections-generator/src/main/kotlin/collections/ArrayList.kt

core/kt-osrd-sncf-signaling/src/main/kotlin/fr/sncf/osrd/signaling/etcs_level2/ETCS_LEVEL2.kt

...srd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/rollingstock/RJSEtcsBrakeParams.java

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

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

...srd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/rollingstock/RJSEtcsBrakeParams.java

editoast/src/models/rolling_stock_model.rs

woshilapin

Thank you for the improvements. The editoast part looks good!

eckter

LGTM

Great job there! 👍

Erashin

Gj! We'll need to report the todo things in our meta issue.

emersion

LGTM for the frontend part!

achrafmohye

the front LGTM 👍

Also add tests ETCS_LEVEL2 rolling-stock (derived from fast_rolling_stock). Note: not managing towed rolling-tock so far (may not have a max_speed, not sure how to merge brake values). Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

Complete duplicate of TVM430 for now. Also add tests ETCS infra (including electrical_profile). Derived from small_infra, just switching all the signaling from BAL to ETCS_LEVEL2. Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

Note: In StandaloneSimulationTest, using `getRouteBlocks` is another valid option for now, but it uses `recoverBlocks` and we want to get rid of it eventually. Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

recovering blocks from route can lead to different results than the pathfinding (especially for signaling system) Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

Also: remove easy parts and minor improvements Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

This implies offsetting ETCS ranges (the dangerPoints were already OK) Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

As it's only used as output and serde serializes optional fields Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

bougue-pe requested review from eckter and Erashin December 20, 2024 08:29

bougue-pe requested review from a team as code owners December 20, 2024 08:29

bougue-pe changed the title ~~Add ETCS brake params and signaling to rolling-stock model~~ Add ERTMS-ETCS brake params and signaling to rolling-stock model Dec 20, 2024

bougue-pe requested review from Wadjetz, louisgreiner and woshilapin December 20, 2024 08:36

woshilapin reviewed Dec 20, 2024

View reviewed changes

emersion reviewed Dec 20, 2024

View reviewed changes

front/src/common/api/generatedEditoastApi.ts Show resolved Hide resolved

eckter reviewed Dec 20, 2024

View reviewed changes

...srd-railjson/src/main/java/fr/sncf/osrd/railjson/schema/rollingstock/RJSEtcsBrakeParams.java Show resolved Hide resolved

Wadjetz reviewed Jan 2, 2025

View reviewed changes

editoast/src/models/rolling_stock_model.rs Show resolved Hide resolved

bougue-pe force-pushed the peb/editoast/add_etcs_brake_params_to_rs_model branch 2 times, most recently from e28a6af to fe27737 Compare January 7, 2025 14:54

bougue-pe mentioned this pull request Jan 7, 2025

editoast: remove 'validator' dependency #10273

Draft

4 tasks

bougue-pe force-pushed the peb/editoast/add_etcs_brake_params_to_rs_model branch from fe27737 to d1ab72f Compare January 8, 2025 08:50

woshilapin approved these changes Jan 8, 2025

View reviewed changes

eckter approved these changes Jan 8, 2025

View reviewed changes

bougue-pe requested a review from emersion January 8, 2025 11:02

Erashin approved these changes Jan 8, 2025

View reviewed changes

bougue-pe requested a review from achrafmohye January 8, 2025 13:26

bougue-pe removed the request for review from louisgreiner January 8, 2025 13:26

emersion approved these changes Jan 8, 2025

View reviewed changes

achrafmohye approved these changes Jan 8, 2025

View reviewed changes

bougue-pe added 10 commits January 8, 2025 18:52

core: add ETCS_LEVEL2 signaling

30e9413

Complete duplicate of TVM430 for now. Also add tests ETCS infra (including electrical_profile). Derived from small_infra, just switching all the signaling from BAL to ETCS_LEVEL2. Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

core: remove duplicate code

78ee385

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

core: compute ETCS_LEVEL2 ranges of the path

bc7e4f1

Note: In StandaloneSimulationTest, using `getRouteBlocks` is another valid option for now, but it uses `recoverBlocks` and we want to get rid of it eventually. Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

core: deprecate use of recoverBlockPath

5e68d2e

recovering blocks from route can lead to different results than the pathfinding (especially for signaling system) Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

core: fix harvesting of slowdown parts (LoA) for ETCS brake

f3e37bf

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

editoast: mark validator dependency to be removed

e61e709

Also: remove easy parts and minor improvements Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

core: move TravelledPath with Path and comment their (expected) use

ccfd784

Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

core: use TravelledPath offsets for ETCSContext

421b1e1

This implies offsetting ETCS ranges (the dangerPoints were already OK) Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

editoast: require optional fields for LightRollingStock

85ccac8

As it's only used as output and serde serializes optional fields Signed-off-by: Pierre-Etienne Bougué <bougue.pe@proton.me>

Khoyo approved these changes Jan 9, 2025

View reviewed changes

bougue-pe force-pushed the peb/editoast/add_etcs_brake_params_to_rs_model branch from fb63ad4 to 85ccac8 Compare January 9, 2025 08:49

bougue-pe mentioned this pull request Jan 9, 2025

tests: add ETCS braking curve integration tests for stops only #10294

Open

bougue-pe added this pull request to the merge queue Jan 9, 2025

Merged via the queue into dev with commit 9757f4e Jan 9, 2025
27 checks passed

bougue-pe deleted the peb/editoast/add_etcs_brake_params_to_rs_model branch January 9, 2025 09:49

Erashin linked an issue Jan 10, 2025 that may be closed by this pull request

core: add mock infra and rolling-stock to be used for ETCS testing/demo #9706

Open

bougue-pe mentioned this pull request Jan 16, 2025

editoast, front: allow providing etcs_brake_params to rolling-stock web api #10422

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ERTMS-ETCS brake params and signaling to rolling-stock model #10147

Add ERTMS-ETCS brake params and signaling to rolling-stock model #10147

bougue-pe commented Dec 20, 2024 •

edited

Loading

codecov-commenter commented Dec 20, 2024 •

edited

Loading

woshilapin left a comment

eckter left a comment •

edited

Loading

woshilapin left a comment

eckter left a comment

Erashin left a comment

emersion left a comment

achrafmohye left a comment

Add ERTMS-ETCS brake params and signaling to rolling-stock model #10147

Add ERTMS-ETCS brake params and signaling to rolling-stock model #10147

Conversation

bougue-pe commented Dec 20, 2024 • edited Loading

TODO after this PR:

codecov-commenter commented Dec 20, 2024 • edited Loading

Codecov Report

woshilapin left a comment

Choose a reason for hiding this comment

eckter left a comment • edited Loading

Choose a reason for hiding this comment

woshilapin left a comment

Choose a reason for hiding this comment

eckter left a comment

Choose a reason for hiding this comment

Erashin left a comment

Choose a reason for hiding this comment

emersion left a comment

Choose a reason for hiding this comment

achrafmohye left a comment

Choose a reason for hiding this comment

bougue-pe commented Dec 20, 2024 •

edited

Loading

codecov-commenter commented Dec 20, 2024 •

edited

Loading

eckter left a comment •

edited

Loading