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

core: BP/CC implementation V2 #4459

Merged
merged 1 commit into from
Aug 11, 2023
Merged

core: BP/CC implementation V2 #4459

merged 1 commit into from
Aug 11, 2023

Conversation

Castavo
Copy link
Contributor

@Castavo Castavo commented Jun 29, 2023 •
edited by clarani
Loading

In this PR:

  • the simulation takes into account the delay to raise the pantograph to extend the zone where the train must coast

closes #4337

@Castavo Castavo force-pushed the cni/bp-cc/update-sim branch from 76939ab to 2e13883 Compare June 30, 2023 14:22
@codecov
Copy link

codecov bot commented Jun 30, 2023 •
edited
Loading

Codecov Report

Merging #4459 (96fb6e7) into dev (fd05e19) will increase coverage by 0.01%.
The diff coverage is 86.84%.

@@             Coverage Diff              @@
##                dev    #4459      +/-   ##
============================================
+ Coverage     20.07%   20.09%   +0.01%     
- Complexity     2238     2245       +7     
============================================
  Files           875      875              
  Lines         89347    89371      +24     
  Branches       2298     2303       +5     
============================================
+ Hits          17938    17959      +21     
  Misses        70130    70130              
- Partials       1279     1282       +3
Flag Coverage Δ
core 78.99% <86.84%> (+0.02%) ⬆️

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

Files Changed Coverage Δ
...cf/osrd/railjson/parser/RJSRollingStockParser.java 46.80% <ø> (ø)
...src/main/java/fr/sncf/osrd/train/RollingStock.java 92.70% <83.33%> (-1.96%) ⬇️
.../fr/sncf/osrd/envelope_sim/EnvelopeSimContext.java 100.00% <100.00%> (ø)
.../railjson/schema/rollingstock/RJSRollingStock.java 100.00% <100.00%> (ø)
...inding/constraints/ElectrificationConstraints.java 92.85% <100.00%> (ø)
...ava/fr/sncf/osrd/standalone_sim/StandaloneSim.java 94.80% <100.00%> (ø)

@Castavo Castavo force-pushed the cni/bp-cc/update-sim branch from 2e13883 to dda69b1 Compare June 30, 2023 16:27
@multun multun marked this pull request as ready for review July 5, 2023 09:06
@multun multun requested review from a team as code owners July 5, 2023 09:06
@flomonster flomonster force-pushed the cni/bp-cc/update-sim branch 2 times, most recently from ea96b1c to b36fcf5 Compare July 6, 2023 07:43
@multun multun marked this pull request as draft July 6, 2023 08:14
@clarani clarani changed the title Cni/bp cc/update sim core: BP/CC implementation V2 Jul 6, 2023
@multun multun force-pushed the cni/bp-cc/update-sim branch from b36fcf5 to 4cd573f Compare July 18, 2023 09:00
@Castavo Castavo self-assigned this Jul 25, 2023
@Castavo Castavo force-pushed the cni/bp-cc/update-sim branch from 4cd573f to 67df15d Compare July 25, 2023 16:18
@Castavo Castavo added area:core Work on Core Service kind:feature-task Work related to a feature epic labels Jul 26, 2023
@Castavo Castavo force-pushed the cni/bp-cc/update-sim branch from 67df15d to 96fb6e7 Compare August 9, 2023 09:04
@Castavo Castavo marked this pull request as ready for review August 9, 2023 10:11
flomonster
flomonster approved these changes Aug 9, 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.

LGTM (only review editoast part)

@Castavo Castavo added this pull request to the merge queue Aug 9, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 9, 2023
@Castavo Castavo added this pull request to the merge queue Aug 11, 2023
Merged via the queue into dev with commit 488b282 Aug 11, 2023
@Castavo Castavo deleted the cni/bp-cc/update-sim branch August 11, 2023 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tguisnet Tguisnet Tguisnet approved these changes

@flomonster flomonster flomonster approved these changes

@multun multun multun approved these changes

Assignees

@Castavo Castavo

Labels
area:core Work on Core Service kind:feature-task Work related to a feature epic
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

core: Update running-time calculation for BP/CC
5 participants
@Castavo @multun @flomonster @Tguisnet @clarani