-
Notifications
You must be signed in to change notification settings - Fork 51
core: add ETCS SVL logic to ETCS braking simulator #10402
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
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## dev #10402 +/- ##
========================================
Coverage 80.66% 80.67%
========================================
Files 1098 1101 +3
Lines 111787 112573 +786
Branches 744 747 +3
========================================
+ Hits 90176 90813 +637
- Misses 21568 21717 +149
Partials 43 43
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
5bfa910
to
8350dfe
Compare
5fd6dac
to
e93a30e
Compare
29d84bb
to
6212f99
Compare
ec6da6b
to
390b821
Compare
a8a8bb4
to
ce5a895
Compare
ce5a895
to
7af533a
Compare
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Outdated
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/Constants.kt
Outdated
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/Constants.kt
Outdated
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Outdated
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Outdated
Show resolved
Hide resolved
7af533a
to
1e7ce69
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bougue-pe : fixed in e3dbe47 and 1e7ce69.
cb65815
to
19652df
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👏 Nice, thank you very much for the work !
Only nits and not-mandatory comments (or even just ideas for the future): no problem resolving them by yourself once decided/replied 👍
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Outdated
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Outdated
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Show resolved
Hide resolved
19652df
to
fb7fde5
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good job on the tests
I only skimmed through the core changes, I trust PE's review on this
core/envelope-sim/src/main/java/fr/sncf/osrd/envelope_sim/EnvelopeSimPath.java
Outdated
Show resolved
Hide resolved
fb7fde5
to
574a3e7
Compare
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Show resolved
Hide resolved
core/envelope-sim/src/main/kotlin/fr/sncf/osrd/envelope_sim/etcs/ETCSBrakingCurves.kt
Show resolved
Hide resolved
Signed-off-by: Erashin <[email protected]>
574a3e7
to
408d683
Compare
Fixes #10404.
Add SVL logic to ETCS braking simulator.
How: compute svl and eoa indications, compute minimum curve, and compare it against overlay.
Limit: approximate braking curves' calculation when SvL is after the end of the path, due to the missing tractive effort and slopes post path.