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: migrate stdcm to new infra #5128

Merged
merged 6 commits into from
Oct 6, 2023
Merged

core: migrate stdcm to new infra #5128

merged 6 commits into from
Oct 6, 2023

Conversation

eckter
Copy link
Contributor

@eckter eckter commented Sep 21, 2023

Change summary:

  • Migrate train simulation code to work with the new infra interfaces
  • Migrate STDCM to work with the new infra interfaces
  • Run the STDCM pathfinding on blocks instead of routes
  • Migrate tests, using a new class to build simplified infras
  • Cleanup some legacy code (not all of it)

Note: the STDCM changes are fairly minimal (mostly renames and simple replacements). Most of the changes are STDCM dependencies, especially standalone sim. This PR can be reviewed by someone who isn't familiar with the STDCM module.

Parts of it have already been reviewed in #5017, but it sounded more realistic to squash everything before the rebase.

@codecov
Copy link

codecov bot commented Sep 21, 2023

Codecov Report

Merging #5128 (1e82e00) into dev (1bd551d) will decrease coverage by 0.28%.
The diff coverage is 85.49%.

@@             Coverage Diff              @@
##                dev    #5128      +/-   ##
============================================
- Coverage     18.88%   18.61%   -0.28%     
+ Complexity     2469     2318     -151     
============================================
  Files           860      855       -5     
  Lines        104612   104190     -422     
  Branches       2512     2408     -104     
============================================
- Hits          19761    19399     -362     
+ Misses        83483    83451      -32     
+ Partials       1368     1340      -28     
Flag Coverage Δ
core 78.97% <85.49%> (-0.26%) ⬇️

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

Files Coverage Δ
...sncf/osrd/envelope_sim/TrainPhysicsIntegrator.java 91.66% <ø> (ø)
...ava/fr/sncf/osrd/envelope_utils/RangeMapUtils.java 95.12% <ø> (ø)
...in/fr/sncf/osrd/sim_infra/api/InterlockingInfra.kt 66.66% <ø> (ø)
...otlin/fr/sncf/osrd/sim_infra/api/PathProperties.kt 100.00% <100.00%> (ø)
...in/fr/sncf/osrd/sim_infra/api/RawSignalingInfra.kt 100.00% <ø> (ø)
...lin/fr/sncf/osrd/sim_infra/impl/RawInfraBuilder.kt 90.43% <100.00%> (+0.96%) ⬆️
...kotlin/fr/sncf/osrd/sim_infra/impl/RawInfraImpl.kt 86.82% <100.00%> (+3.41%) ⬆️
...main/kotlin/fr/sncf/osrd/utils/DistanceRangeMap.kt 100.00% <ø> (ø)
...a/fr/sncf/osrd/railjson/schema/infra/RJSInfra.java 100.00% <ø> (ø)
core/src/main/java/fr/sncf/osrd/api/FullInfra.java 100.00% <100.00%> (ø)
... and 55 more

... and 21 files with indirect coverage changes

@eckter eckter force-pushed the stdcm-migration branch 2 times, most recently from cc8c994 to dbfcc41 Compare September 21, 2023 15:32
@Erashin Erashin force-pushed the stdcm-migration branch 3 times, most recently from e79792b to 844aaec Compare September 22, 2023 08:55
@eckter eckter marked this pull request as ready for review September 22, 2023 11:01
@eckter eckter requested review from a team as code owners September 22, 2023 11:01
@eckter eckter linked an issue Sep 28, 2023 that may be closed by this pull request
Copy link
Contributor

@axrolld axrolld left a comment

Choose a reason for hiding this comment

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

Physics part LGTM 🚀

@eckter eckter requested a review from multun October 3, 2023 12:26
@eckter eckter force-pushed the stdcm-migration branch 2 times, most recently from 88720ef to 86a1385 Compare October 6, 2023 08:20
@eckter eckter added this pull request to the merge queue Oct 6, 2023
@eckter eckter removed this pull request from the merge queue due to a manual request Oct 6, 2023
Erashin and others added 2 commits October 6, 2023 16:39
Change summary:
* Migrate train simulation code to work with the new infra interfaces
* Migrate STDCM to work with the new infra interfaces
* Run the STDCM pathfinding on blocks instead of routes
* Migrate tests, using a new class to build simplified infras
* Cleanup some legacy code (not all of it)
eckter added 4 commits October 6, 2023 16:39
There is already a non-empty assert in all call sites.
For STDCM preprocessing this error is triggered too often
(because of poor signaling data in imported infras),
and an empty result isn't a problem in this case
@eckter eckter enabled auto-merge October 6, 2023 14:40
@eckter eckter added this pull request to the merge queue Oct 6, 2023
Merged via the queue into dev with commit b95abdf Oct 6, 2023
@eckter eckter deleted the stdcm-migration branch October 6, 2023 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants