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

stdcm: intermediate step of the rework (train does not slow down) #2025

Merged
merged 19 commits into from
Oct 10, 2022

Conversation

eckter
Copy link
Contributor

@eckter eckter commented Oct 4, 2022

In this version we only consider paths where the train goes at full speed, this is not a complete solution to the problem as some paths need delays to be added. We can still find a different (physical) path to avoid occupied tracks.

This scales quite well and doesn't take too much time: on my laptop, an STDCM request for Quiberon - Rennes takes about 100ms, and Brest - Monaco takes about 10 seconds.

@eckter eckter requested a review from a team October 4, 2022 15:10
@eckter eckter force-pushed the ech/fix-stdcm-sim branch from fdd0fff to a7317cc Compare October 6, 2022 08:03
@eckter eckter force-pushed the ech/fix-stdcm-sim branch 11 times, most recently from 84a4b10 to dcc8bb0 Compare October 6, 2022 11:15
@eckter eckter force-pushed the ech/fix-stdcm-sim branch from dcc8bb0 to d89ee05 Compare October 6, 2022 11:22
@codecov
Copy link

codecov bot commented Oct 6, 2022

Codecov Report

Merging #2025 (abb013e) into dev (cdee566) will increase coverage by 0.05%.
The diff coverage is 95.66%.

@@             Coverage Diff              @@
##                dev    #2025      +/-   ##
============================================
+ Coverage     80.15%   80.20%   +0.05%     
+ Complexity     1631     1627       -4     
============================================
  Files           261      263       +2     
  Lines          8354     8256      -98     
  Branches        941      919      -22     
============================================
- Hits           6696     6622      -74     
+ Misses         1261     1250      -11     
+ Partials        397      384      -13     
Flag Coverage Δ
core 80.88% <95.66%> (+0.09%) ⬆️

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

Impacted Files Coverage Δ
...inding/constraints/ElectrificationConstraints.java 91.66% <ø> (ø)
...thfinding/constraints/LoadingGaugeConstraints.java 100.00% <ø> (ø)
...llowances/utils/AllowanceConvergenceException.java 66.66% <ø> (ø)
...f/osrd/infra/api/reservation/ReservationRoute.java 0.00% <ø> (-100.00%) ⬇️
.../main/java/fr/sncf/osrd/utils/geom/LineString.java 87.75% <ø> (ø)
...implementation/tracks/directed/TrackRangeView.java 89.74% <66.66%> (+0.13%) ⬆️
...osrd/envelope_sim/pipelines/MaxEffortEnvelope.java 95.16% <80.00%> (+1.94%) ⬆️
...ain/java/fr/sncf/osrd/api/stdcm/STDCMEndpoint.java 79.06% <82.35%> (-3.34%) ⬇️
...rd/api/pathfinding/RemainingDistanceEstimator.java 90.47% <90.47%> (ø)
...c/main/java/fr/sncf/osrd/api/stdcm/STDCMGraph.java 95.91% <95.91%> (ø)
... and 23 more

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

@eckter eckter force-pushed the ech/fix-stdcm-sim branch from 72c6dc8 to de8e53d Compare October 6, 2022 15:31
flomonster
flomonster previously approved these changes Oct 10, 2022
@eckter eckter force-pushed the ech/fix-stdcm-sim branch from 9e7a0d5 to abb013e Compare October 10, 2022 12:55
@eckter eckter merged commit 3bbfd4a into dev Oct 10, 2022
@eckter eckter deleted the ech/fix-stdcm-sim branch October 10, 2022 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants