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

core: stdcm: apply mareco to the final envelope #2913

Merged
merged 1 commit into from
Jan 17, 2023

Conversation

eckter
Copy link
Contributor

@eckter eckter commented Jan 17, 2023

We try to apply the standard allowance as one mareco computation over the whole path. If it causes conflicts, we split the mareco ranges so that the passage time at the points of conflict stays the same as the one we expected when exploring the graph.

It comes with a few extra tools in EnvelopeDebug, to plot space-time charts.

@eckter eckter requested a review from a team as a code owner January 17, 2023 09:56
@eckter eckter changed the title core: stdcm: apply mareco to the end envelope core: stdcm: apply mareco to the final envelope Jan 17, 2023
@codecov
Copy link

codecov bot commented Jan 17, 2023

Codecov Report

Merging #2913 (75346ae) into dev (1f2b551) will increase coverage by 0.04%.
The diff coverage is 88.00%.

@@             Coverage Diff              @@
##                dev    #2913      +/-   ##
============================================
+ Coverage     38.28%   38.33%   +0.04%     
- Complexity     1701     1708       +7     
============================================
  Files           587      588       +1     
  Lines         18045    18069      +24     
  Branches       2486     2494       +8     
============================================
+ Hits           6909     6926      +17     
- Misses        10737    10739       +2     
- Partials        399      404       +5     
Flag Coverage Δ
core 83.87% <88.00%> (-0.06%) ⬇️

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

Impacted Files Coverage Δ
...fr/sncf/osrd/api/stdcm/graph/STDCMPathfinding.java 97.87% <ø> (ø)
...f/osrd/api/stdcm/graph/STDCMStandardAllowance.java 87.50% <87.50%> (ø)
...sncf/osrd/api/stdcm/graph/STDCMPostProcessing.java 98.07% <100.00%> (-0.61%) ⬇️
.../osrd/envelope_sim/allowances/LinearAllowance.java 95.00% <0.00%> (-5.00%) ⬇️

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

@multun multun merged commit b571575 into dev Jan 17, 2023
@multun multun deleted the ech/stdcm-mareco-allowance branch January 17, 2023 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants