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: stop computing engineering allowances during exploration #7090

Merged
merged 3 commits into from
Apr 5, 2024

Conversation

eckter
Copy link
Contributor

@eckter eckter commented Apr 4, 2024

Fix #6985

The main change is that we don't actually compute engineering allowance during the exploration anymore. But that highlights all the subtle bugs we have around, especially in the post-processing, so it also includes some bugfixes.

Copy link

codecov bot commented Apr 4, 2024

Codecov Report

Attention: Patch coverage is 90.84507% with 13 lines in your changes are missing coverage. Please review.

Project coverage is 28.28%. Comparing base (174ef9a) to head (adca401).
Report is 1 commits behind head on dev.

Files Patch % Lines
...cf/osrd/stdcm/graph/EngineeringAllowanceManager.kt 90.90% 4 Missing and 3 partials ⚠️
.../sncf/osrd/stdcm/graph/PostProcessingSimulation.kt 84.61% 2 Missing and 2 partials ⚠️
.../src/main/java/fr/sncf/osrd/conflicts/Conflicts.kt 60.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                dev    #7090      +/-   ##
============================================
- Coverage     28.31%   28.28%   -0.04%     
+ Complexity     2250     2229      -21     
============================================
  Files          1090     1090              
  Lines        136477   136492      +15     
  Branches       2745     2737       -8     
============================================
- Hits          38647    38608      -39     
- Misses        96233    96290      +57     
+ Partials       1597     1594       -3     
Flag Coverage Δ
core 79.62% <90.78%> (-0.47%) ⬇️
editoast 74.80% <ø> (-0.03%) ⬇️
front 8.95% <ø> (ø)
gateway 2.45% <ø> (ø)
railjson_generator 87.15% <ø> (ø)
tests 83.98% <100.00%> (+0.91%) ⬆️

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.

@eckter eckter force-pushed the ech/remove-stdcm-binary-search branch 2 times, most recently from ae53f73 to 83ce5fa Compare April 4, 2024 13:10
Copy link
Contributor

@Erashin Erashin left a comment

Choose a reason for hiding this comment

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

Up to this point, LGTM. The 20_000 value after which we consider that any given margin can be added is an annoying but required value here.

@eckter eckter marked this pull request as ready for review April 5, 2024 08:49
@eckter eckter requested review from a team as code owners April 5, 2024 08:49
@eckter eckter requested review from Erashin and bloussou April 5, 2024 08:49
i.e. if we use a resource from t=42 to t=84, the conflict
time can't start before t=42, even if the resource
has been scheduled for longer
@eckter eckter force-pushed the ech/remove-stdcm-binary-search branch from 83ce5fa to bad2105 Compare April 5, 2024 09:07
Copy link
Contributor

@bloussou bloussou left a comment

Choose a reason for hiding this comment

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

Ok for the tests parts :)

@eckter eckter added this pull request to the merge queue Apr 5, 2024
Merged via the queue into dev with commit 5d56285 Apr 5, 2024
22 checks passed
@eckter eckter deleted the ech/remove-stdcm-binary-search branch April 5, 2024 15:47
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.

core: stdcm: refactor the engineering allowances to only check if they're possible
3 participants