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

Add announcement ranges to the neutral section model #4862

Merged
merged 3 commits into from
Aug 31, 2023

Conversation

Castavo
Copy link
Contributor

@Castavo Castavo commented Aug 22, 2023

closes #4661

This PR:

  • Adds a new list of track ranges to NeutralSections
  • Uses it in order to be able to coast on some ranges but still display them in GEV as normaly electrified, as it was requested by PM team. (The electrification in GEV should be refactored some day and some of this would disappear)
  • Fixes some tiny misc stuff in front linked to electrification in GEV

This PR may seem a bit large, but most lines of changes comes from the update of editoast/test/small_infra/small_infra.json

Please especially test that STDCM works fine, I'm not an expert on this part of the app, and I have some trouble diagnosing if my changes impacted it

@Castavo Castavo force-pushed the bpt/bp-cc/annoncement-in-model branch from a6c7030 to f08c176 Compare August 22, 2023 11:39
@codecov
Copy link

codecov bot commented Aug 22, 2023

Codecov Report

Merging #4862 (49d4788) into dev (63e8347) will increase coverage by 0.01%.
The diff coverage is 79.16%.

@@             Coverage Diff              @@
##                dev    #4862      +/-   ##
============================================
+ Coverage     22.32%   22.34%   +0.01%     
- Complexity     2278     2287       +9     
============================================
  Files           864      864              
  Lines         90428    90451      +23     
  Branches       2327     2332       +5     
============================================
+ Hits          20188    20207      +19     
- Misses        68962    68964       +2     
- Partials       1278     1280       +2     
Flag Coverage Δ
core 79.71% <81.81%> (+0.01%) ⬆️
editoast 70.71% <ø> (-0.02%) ⬇️
front 10.07% <50.00%> (ø)

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

Files Changed Coverage Δ
...a/fr/sncf/osrd/railjson/schema/infra/RJSInfra.java 100.00% <ø> (ø)
...on/schema/infra/trackranges/RJSNeutralSection.java 100.00% <ø> (ø)
...ementation/tracks/undirected/SwitchBranchImpl.java 66.66% <0.00%> (-3.34%) ⬇️
editoast/src/models/infra.rs 81.39% <ø> (ø)
editoast/src/schema/neutral_section.rs 50.00% <ø> (ø)
...ront/src/applications/operationalStudies/consts.ts 78.27% <0.00%> (ø)
...rd/standalone_sim/result/ElectrificationRange.java 77.58% <50.00%> (-1.66%) ⬇️
...ncf/osrd/envelope_sim/electrification/Neutral.java 71.42% <80.00%> (+2.19%) ⬆️
...tion/tracks/undirected/UndirectedInfraBuilder.java 86.31% <91.66%> (+0.24%) ⬆️
...ncf/osrd/envelope_sim_infra/EnvelopeTrainPath.java 98.30% <100.00%> (+0.22%) ⬆️
... and 4 more

... and 1 file with indirect coverage changes

@Castavo Castavo force-pushed the bpt/bp-cc/annoncement-in-model branch 4 times, most recently from ecdde98 to da41239 Compare August 22, 2023 16:40
@Castavo Castavo marked this pull request as ready for review August 22, 2023 17:23
@Castavo Castavo requested review from a team as code owners August 22, 2023 17:23
@Castavo Castavo changed the title Bpt/bp cc/announcement in model Add announcement ranges to the neutral section model Aug 22, 2023
Copy link
Contributor

@clarani clarani left a comment

Choose a reason for hiding this comment

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

Code looks good to me, but I can't test as the backend is broken (500 when I want to create a train, see #4871)

@Castavo Castavo force-pushed the bpt/bp-cc/annoncement-in-model branch 2 times, most recently from 610613f to 3179fc9 Compare August 28, 2023 11:55
@nicolaswurtz nicolaswurtz enabled auto-merge August 29, 2023 08:47
@nicolaswurtz nicolaswurtz disabled auto-merge August 29, 2023 08:47
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.

LGTM.

@Castavo Castavo force-pushed the bpt/bp-cc/annoncement-in-model branch from 3179fc9 to 49d4788 Compare August 31, 2023 13:55
@Castavo Castavo added this pull request to the merge queue Aug 31, 2023
Merged via the queue into dev with commit daecd63 Aug 31, 2023
@Castavo Castavo deleted the bpt/bp-cc/annoncement-in-model branch August 31, 2023 15:19
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.

BP/CC : Update data model to take into account announcement panels
5 participants