Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core: update stdcm with temporary speed limits #9837

Merged
merged 1 commit into from
Nov 28, 2024
Merged

core: update stdcm with temporary speed limits #9837

merged 1 commit into from
Nov 28, 2024

Conversation

Sh099078
Copy link
Contributor

@Sh099078 Sh099078 commented Nov 25, 2024 •
edited
Loading

Fixes #8707

Add a list of temporary speed limits in the incoming STDCM requests and apply them to the pathfinding

@github-actions github-actions bot added area:core Work on Core Service area:front Work on Standard OSRD Interface modules area:editoast Work on Editoast Service labels Nov 25, 2024
@codecov-commenter
Copy link

codecov-commenter commented Nov 25, 2024 •
edited
Loading

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 38.17%. Comparing base (2520f67) to head (e3fe49d).
Report is 7 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    #9837      +/-   ##
==========================================
- Coverage   38.18%   38.17%   -0.01%     
==========================================
  Files         996      996              
  Lines       92033    92033              
  Branches     1192     1192              
==========================================
- Hits        35140    35136       -4     
- Misses      56437    56441       +4     
  Partials      456      456
Flag Coverage Δ
editoast 73.31% <ø> (-0.02%) ⬇️
front 20.18% <ø> (ø)
gateway 2.18% <ø> (ø)
osrdyne 3.28% <ø> (ø)
railjson_generator 87.49% <ø> (ø)
tests 87.00% <ø> (ø)

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.

@github-actions github-actions bot removed area:front Work on Standard OSRD Interface modules area:editoast Work on Editoast Service labels Nov 25, 2024
@Sh099078 Sh099078 force-pushed the lf/core_add_ltv branch 4 times, most recently from e3a3b09 to 6e9b39a Compare November 26, 2024 10:37
@Sh099078 Sh099078 marked this pull request as ready for review November 26, 2024 10:40
@Sh099078 Sh099078 requested a review from a team as a code owner November 26, 2024 10:40
@Sh099078 Sh099078 requested a review from eckter November 26, 2024 10:40
eckter
eckter reviewed Nov 27, 2024
View reviewed changes
Copy link
Contributor

@eckter eckter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice job!

Having the TemporarySpeedLimitManager inside the PathProperties is quite an invasive change, having to pass it around everywhere. I think I would have preferred if it were handled in the same way as train tags: the path properties only contains "static" data, and we input extra dynamic data when computing the MRSP. We'd still have to pass it around but only up to STDCMSimulations, not all the way down to path properties.

.../kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/impl/TemporarySpeedLimitManager.kt Outdated Show resolved Hide resolved
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/stdcm/STDCMEndpointV2.kt Outdated Show resolved Hide resolved
@Sh099078 Sh099078 requested a review from eckter November 27, 2024 23:20
eckter
eckter approved these changes Nov 28, 2024
View reviewed changes
Copy link
Contributor

@eckter eckter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, nice work! (don't overwork yourself though 👀)

There's some minor stuff to fix here and there, but no large scale change

core/src/main/java/fr/sncf/osrd/standalone_sim/StandaloneSim.java Outdated Show resolved Hide resolved
.../kt-osrd-sim-infra/src/main/kotlin/fr/sncf/osrd/sim_infra/impl/TemporarySpeedLimitManager.kt Outdated Show resolved Hide resolved
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/stdcm/STDCMEndpointV2.kt Outdated Show resolved Hide resolved
core/src/main/kotlin/fr/sncf/osrd/api/pathfinding/PathPropUtils.kt Outdated Show resolved Hide resolved
core/src/main/kotlin/fr/sncf/osrd/stdcm/graph/EngineeringAllowanceManager.kt Outdated Show resolved Hide resolved
core/src/main/kotlin/fr/sncf/osrd/stdcm/infra_exploration/InfraExplorer.kt Outdated Show resolved Hide resolved
@Sh099078 Sh099078 force-pushed the lf/core_add_ltv branch 3 times, most recently from 07f3397 to 5a36131 Compare November 28, 2024 12:30
@Sh099078 @Khoyo
core: add temporary speed limits to STDCM
e3fe49d 
Co-authored-by: Younes Khoudli <[email protected]>
Signed-off-by: Loup Federico <[email protected]>
@Sh099078 Sh099078 enabled auto-merge November 28, 2024 12:32
@Sh099078 Sh099078 added this pull request to the merge queue Nov 28, 2024
@Sh099078 Sh099078 self-assigned this Nov 28, 2024
Merged via the queue into dev with commit 1891f5b Nov 28, 2024
27 checks passed
@Sh099078 Sh099078 deleted the lf/core_add_ltv branch November 28, 2024 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eckter eckter eckter approved these changes

Assignees

@Sh099078 Sh099078

Labels
area:core Work on Core Service
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

core: update STDCM to include LTVs
3 participants
@Sh099078 @codecov-commenter @eckter