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.

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

stdcm linear allowance #2645

Merged
merged 5 commits into from
Jan 10, 2023
Merged

stdcm linear allowance #2645

merged 5 commits into from
Jan 10, 2023

Conversation

eckter
Copy link
Contributor

@eckter eckter commented Dec 19, 2022

This PR adds linear allowance in STDCM requests (back-end only).

We don't directly change the envelopes as we create them, because we need to keep track of the original envelope to properly compute the allowance and handle route transitions.
Instead, we keep track of the speed factor as a new field. We use it whenever we compute the time it takes to go from point A to B.

@eckter eckter linked an issue Dec 19, 2022 that may be closed by this pull request
3 tasks
@eckter eckter force-pushed the ech/stdcm-linear-allowance branch 3 times, most recently from fd7fe46 to bbe92a1 Compare December 20, 2022 14:31
@codecov
Copy link

codecov bot commented Dec 20, 2022

Codecov Report

Merging #2645 (07e80ba) into dev (9d2ec15) will increase coverage by 0.18%.
The diff coverage is 96.61%.

@@             Coverage Diff              @@
##                dev    #2645      +/-   ##
============================================
+ Coverage     38.05%   38.24%   +0.18%     
- Complexity     1678     1694      +16     
============================================
  Files           576      578       +2     
  Lines         17747    17803      +56     
  Branches       2446     2451       +5     
============================================
+ Hits           6754     6809      +55     
- Misses        10607    10608       +1     
  Partials        386      386              
Flag Coverage Δ
core 83.92% <96.61%> (+0.13%) ⬆️

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

Impacted Files Coverage Δ
.../java/fr/sncf/osrd/api/stdcm/graph/STDCMUtils.java 92.85% <ø> (-0.90%) ⬇️
...ljson/parser/RJSStandaloneTrainScheduleParser.java 68.05% <ø> (ø)
...e/src/main/java/fr/sncf/osrd/utils/SwingUtils.java 0.00% <ø> (ø)
...ain/java/fr/sncf/osrd/api/stdcm/STDCMEndpoint.java 77.77% <33.33%> (-1.94%) ⬇️
...fr/sncf/osrd/api/stdcm/graph/AllowanceManager.java 91.89% <88.88%> (-0.42%) ⬇️
.../java/fr/sncf/osrd/api/stdcm/graph/STDCMGraph.java 96.55% <90.00%> (-3.45%) ⬇️
...fr/sncf/osrd/api/stdcm/graph/STDCMSimulations.java 97.50% <97.50%> (ø)
...sncf/osrd/api/stdcm/graph/STDCMPostProcessing.java 98.68% <98.68%> (ø)
...main/java/fr/sncf/osrd/api/stdcm/STDCMRequest.java 100.00% <100.00%> (ø)
...sncf/osrd/api/stdcm/graph/BacktrackingManager.java 96.77% <100.00%> (-0.67%) ⬇️
... and 8 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@eckter eckter force-pushed the ech/stdcm-linear-allowance branch from bbe92a1 to f741259 Compare December 20, 2022 15:25
@eckter eckter force-pushed the ech/stdcm-linear-allowance branch 6 times, most recently from 526f602 to 7f53e1f Compare January 2, 2023 16:40
@eckter eckter changed the title wip: stdcm linear allowance stdcm linear allowance Jan 3, 2023
@eckter eckter force-pushed the ech/stdcm-linear-allowance branch from 7f53e1f to 7371979 Compare January 3, 2023 10:43
@eckter eckter marked this pull request as ready for review January 3, 2023 10:44
@eckter eckter requested review from a team as code owners January 3, 2023 10:44
@eckter eckter force-pushed the ech/stdcm-linear-allowance branch from 7371979 to ab9cbb9 Compare January 3, 2023 14:14
@eckter eckter marked this pull request as draft January 5, 2023 09:50
@eckter eckter force-pushed the ech/stdcm-linear-allowance branch 2 times, most recently from 7d2186d to 952677c Compare January 6, 2023 10:46
@eckter eckter force-pushed the ech/stdcm-linear-allowance branch from 952677c to 199d673 Compare January 6, 2023 10:46
@eckter eckter marked this pull request as ready for review January 6, 2023 14:20
@eckter eckter requested a review from a team as a code owner January 6, 2023 14:20
@eckter eckter linked an issue Jan 9, 2023 that may be closed by this pull request
@eckter eckter merged commit 5de0138 into dev Jan 10, 2023
@eckter eckter deleted the ech/stdcm-linear-allowance branch January 10, 2023 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

back-end: stdcm: support standard allowance (linear implementation)
4 participants