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: incremental spacing resource generation #5040

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Conversation

Khoyo
Copy link
Contributor

@Khoyo Khoyo commented Sep 13, 2023

Switch the spacing resource generation to an incremental generator, in
preparation for the STDCM integration. Currently, it is only called in
one go by the standalone simulation.

Co-Authored-By: Victor "multun" Collod [email protected]
Co-Authored-By: Younes "khoyo" Khoudli [email protected]

@Khoyo Khoyo requested a review from a team as a code owner September 13, 2023 14:35
@Khoyo Khoyo force-pushed the incremental-resource-gen branch from 9fd6f3a to 4e7e161 Compare September 13, 2023 15:32
@codecov
Copy link

codecov bot commented Sep 13, 2023

Codecov Report

Merging #5040 (d1788fd) into dev (e546802) will increase coverage by 0.09%.
The diff coverage is 75.25%.

@@             Coverage Diff              @@
##                dev    #5040      +/-   ##
============================================
+ Coverage     22.83%   22.92%   +0.09%     
+ Complexity     2461     2450      -11     
============================================
  Files           849      853       +4     
  Lines         90118    90290     +172     
  Branches       2448     2482      +34     
============================================
+ Hits          20576    20702     +126     
- Misses        68204    68227      +23     
- Partials       1338     1361      +23     
Flag Coverage Δ
core 79.45% <75.25%> (-0.10%) ⬇️

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

Files Changed Coverage Δ
.../fr/sncf/osrd/sim_infra/impl/PathPropertiesImpl.kt 91.66% <ø> (ø)
...in/kotlin/fr/sncf/osrd/utils/indexing/StaticIdx.kt 50.00% <ø> (ø)
...c/main/kotlin/fr/sncf/osrd/utils/units/Distance.kt 54.83% <ø> (ø)
...r/sncf/osrd/standalone_sim/result/ResultTrain.java 91.30% <0.00%> (-4.16%) ⬇️
...ain/java/fr/sncf/osrd/conflicts/IncrementalPath.kt 65.97% <65.97%> (ø)
...fr/sncf/osrd/conflicts/SpacingResourceGenerator.kt 74.28% <74.28%> (ø)
...conflicts/IncrementalRequirementEnvelopeAdapter.kt 95.83% <95.83%> (ø)
...in/fr/sncf/osrd/sim_infra/api/InterlockingInfra.kt 66.66% <100.00%> (+6.66%) ⬆️
...n/fr/sncf/osrd/sim_infra/impl/BlockInfraBuilder.kt 92.30% <100.00%> (+2.30%) ⬆️
...tlin/fr/sncf/osrd/sim_infra/impl/BlockInfraImpl.kt 86.44% <100.00%> (-0.45%) ⬇️
... and 2 more

Switch the spacing resource generation to an incremental generator, in
preparation for the STDCM integration. Currently, it is only called in
one go by the standalone simulation.

Co-Authored-By: Victor "multun" Collod <[email protected]>
Co-Authored-By: Younes "khoyo" Khoudli <[email protected]>
@Khoyo Khoyo force-pushed the incremental-resource-gen branch from 4e7e161 to d1788fd Compare September 13, 2023 18:16
@multun multun added this pull request to the merge queue Sep 14, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 14, 2023
@multun multun added this pull request to the merge queue Sep 14, 2023
Merged via the queue into dev with commit 04b21aa Sep 14, 2023
@multun multun deleted the incremental-resource-gen branch September 14, 2023 15:34
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.

2 participants