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

Refactor core to enforce isolation of envelope and envelope-sim code #3129

Merged
merged 9 commits into from
Feb 21, 2023

Conversation

Castavo
Copy link
Contributor

@Castavo Castavo commented Feb 8, 2023

closes #3086

This PR makes envelope and envelope-sim packages a gradle sub-project (like osrd-railjson) in order to better isolate this part of core.

For that I had to make the package reporting it's own sub-project too.

P.S. I added an extra change (in this commit) to rename EnvelopePath to EnvelopeSimPath (to match EnvelopeSimContext)

@codecov
Copy link

codecov bot commented Feb 10, 2023

Codecov Report

Merging #3129 (841e039) into dev (e697622) will increase coverage by 2.28%.
The diff coverage is 87.50%.

@@             Coverage Diff              @@
##                dev    #3129      +/-   ##
============================================
+ Coverage     40.96%   43.25%   +2.28%     
- Complexity     1711     1874     +163     
============================================
  Files           630      708      +78     
  Lines         18731    20697    +1966     
  Branches       2344     2579     +235     
============================================
+ Hits           7674     8953    +1279     
- Misses        10643    11261     +618     
- Partials        414      483      +69     
Flag Coverage Δ
core 79.18% <87.50%> (-4.59%) ⬇️

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

Impacted Files Coverage Δ
.../src/main/java/fr/sncf/osrd/envelope/Envelope.java 89.25% <ø> (ø)
...in/java/fr/sncf/osrd/envelope/EnvelopeBuilder.java 72.00% <ø> (ø)
...ain/java/fr/sncf/osrd/envelope/EnvelopeCursor.java 83.69% <ø> (ø)
...in/java/fr/sncf/osrd/envelope/EnvelopePhysics.java 86.31% <ø> (ø)
...main/java/fr/sncf/osrd/envelope/EnvelopePoint.java 100.00% <ø> (ø)
...n/java/fr/sncf/osrd/envelope/EnvelopeSpeedCap.java 90.90% <ø> (ø)
...ava/fr/sncf/osrd/envelope/MRSPEnvelopeBuilder.java 91.11% <ø> (ø)
.../fr/sncf/osrd/envelope/OverlayEnvelopeBuilder.java 90.69% <ø> (ø)
...java/fr/sncf/osrd/envelope/SearchableEnvelope.java 91.66% <ø> (ø)
.../envelope/part/ConstrainedEnvelopePartBuilder.java 88.33% <ø> (ø)
... and 132 more

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

@Castavo Castavo force-pushed the bpt/refactor-envelope-classes branch 2 times, most recently from 8271a42 to 71ce4f8 Compare February 13, 2023 14:58
@Castavo Castavo marked this pull request as ready for review February 16, 2023 11:00
@Castavo Castavo requested review from a team and multun as code owners February 16, 2023 11:00
@Castavo Castavo changed the title core: make envelope, envelope_sim and reporting sub-projects Refactor core to enforce isolation of envelope and envelope-sim code Feb 16, 2023
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.

🚀

@Castavo Castavo force-pushed the bpt/refactor-envelope-classes branch from 7283291 to 94a8f62 Compare February 20, 2023 15:16
core/envelope-sim/build.gradle Outdated Show resolved Hide resolved
core/envelope-sim/build.gradle Outdated Show resolved Hide resolved
core/kt-osrd-sim-interlocking/build.gradle Show resolved Hide resolved
@multun multun merged commit 0e32a9f into dev Feb 21, 2023
@multun multun deleted the bpt/refactor-envelope-classes branch February 21, 2023 11:15
younesschrifi pushed a commit that referenced this pull request Feb 27, 2023
closes #3086 

- make `envelope` and `envelope-sim` gradle sub-projects, like `osrd-railjson`
- rename `EnvelopePath` to `EnvelopeSimPath` to match`EnvelopeSimContext`
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.

Refactor simulation classes
4 participants