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

stdcm: use spacing requirements instead of route occupancies #5163

Merged
merged 2 commits into from
Oct 12, 2023
Merged

stdcm: use spacing requirements instead of route occupancies #5163

merged 2 commits into from
Oct 12, 2023

Conversation

eckter
Copy link
Contributor

@eckter eckter commented Sep 29, 2023 •
edited by Khoyo
Loading

  • Use spacing requirements
  • Update test values
  • Update openapi file

The zone ids used for resource usage is now a property of the zone, it's still generated from its detectors.

Fixes #5148.
Fixes #5149.
Fixes #5150.
Fixes #5151.

@eckter eckter changed the base branch from dev to stdcm-migration September 29, 2023 14:26
@eckter eckter linked an issue Sep 29, 2023 that may be closed by this pull request
stdcm: core: use spacing requirement data to build block occupancies #5150
Closed
3 tasks
@eckter eckter force-pushed the ech/use-block-occupancy branch from 12e0955 to f678685 Compare October 3, 2023 14:20
@codecov
Copy link

codecov bot commented Oct 3, 2023 •
edited
Loading

Codecov Report

Merging #5163 (c321c20) into dev (444b5e9) will decrease coverage by 0.03%.
Report is 8 commits behind head on dev.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##                dev    #5163      +/-   ##
============================================
- Coverage     18.75%   18.72%   -0.03%     
+ Complexity     2322     2309      -13     
============================================
  Files           853      853              
  Lines        103524   103463      -61     
  Branches       2402     2394       -8     
============================================
- Hits          19413    19376      -37     
+ Misses        82771    82749      -22     
+ Partials       1340     1338       -2
Flag Coverage Δ
core 78.89% <100.00%> (-0.10%) ⬇️

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

Files Coverage Δ
...in/fr/sncf/osrd/sim_infra/api/InterlockingInfra.kt 80.00% <ø> (+13.33%) ⬆️
...tlin/fr/sncf/osrd/sim_infra/impl/BlockInfraImpl.kt 88.15% <100.00%> (+1.79%) ⬆️
...lin/fr/sncf/osrd/sim_infra/impl/RawInfraBuilder.kt 90.43% <100.00%> (ø)
...kotlin/fr/sncf/osrd/sim_infra/impl/RawInfraImpl.kt 87.15% <100.00%> (+0.32%) ⬆️
...tlin/fr/sncf/osrd/sim_infra/utils/BlockRecovery.kt 82.27% <100.00%> (-11.40%) ⬇️
...ain/java/fr/sncf/osrd/api/stdcm/STDCMEndpoint.java 73.58% <ø> (+6.39%) ⬆️
...main/java/fr/sncf/osrd/api/stdcm/STDCMRequest.java 100.00% <100.00%> (ø)
...f/osrd/standalone_sim/ScheduleMetadataExtractor.kt 93.43% <ø> (-0.05%) ⬇️
...r/sncf/osrd/standalone_sim/result/ResultTrain.java 92.85% <ø> (-0.25%) ⬇️
...main/java/fr/sncf/osrd/stdcm/graph/STDCMGraph.java 97.05% <100.00%> (ø)
... and 5 more

... and 3 files with indirect coverage changes

@eckter eckter marked this pull request as ready for review October 3, 2023 14:29
@eckter eckter requested a review from a team as a code owner October 3, 2023 14:29
@eckter eckter marked this pull request as draft October 5, 2023 08:30
@eckter eckter force-pushed the stdcm-migration branch 2 times, most recently from 1e21b2d to 1e82e00 Compare October 6, 2023 14:40
Base automatically changed from stdcm-migration to dev October 6, 2023 15:26
@eckter eckter force-pushed the ech/use-block-occupancy branch from f678685 to 58499e7 Compare October 9, 2023 08:54
@eckter eckter force-pushed the ech/use-block-occupancy branch from e050754 to 008faa7 Compare October 10, 2023 12:59
@eckter eckter marked this pull request as ready for review October 10, 2023 14:46
@eckter eckter requested a review from a team as a code owner October 10, 2023 14:46
@eckter eckter changed the title core: stdcm: use spacing requirements instead of route occupancies stdcm: use spacing requirements instead of route occupancies Oct 10, 2023
Erashin
Erashin approved these changes Oct 11, 2023
View reviewed changes
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.

LGTM

@eckter eckter force-pushed the ech/use-block-occupancy branch 2 times, most recently from 801d9d9 to 59a4941 Compare October 11, 2023 09:36
flomonster
flomonster approved these changes Oct 12, 2023
View reviewed changes
Copy link
Contributor

@flomonster flomonster left a comment

Choose a reason for hiding this comment

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

Reviewed editoast

@eckter eckter added this pull request to the merge queue Oct 12, 2023
@eckter eckter removed this pull request from the merge queue due to a manual request Oct 12, 2023
@eckter eckter added this pull request to the merge queue Oct 12, 2023
@eckter eckter force-pushed the ech/use-block-occupancy branch from 59a4941 to c321c20 Compare October 12, 2023 11:16
Merged via the queue into dev with commit 17a36ce Oct 12, 2023
@eckter eckter deleted the ech/use-block-occupancy branch October 12, 2023 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Khoyo Khoyo Khoyo approved these changes

@multun multun multun approved these changes

@flomonster flomonster flomonster approved these changes

@Erashin Erashin Erashin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@eckter @Khoyo @multun @flomonster @Erashin