-
Couldn't load subscription status.
- Fork 17
[WIP] Enable trainrun asymmetry #409
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
Closed
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b3c156a to
f265e62
Compare
cda0e43 to
f2baf88
Compare
3c2649f to
d7c4f06
Compare
Signed-off-by: Louis Greiner <[email protected]>
Signed-off-by: Louis Greiner <[email protected]>
* add isSymmetric to Trainrun Signed-off-by: Louis Greiner <[email protected]> * enable trainrunSection departure/arrival assymetry at nodes Signed-off-by: Louis Greiner <[email protected]> * trainrun: isolate symmetry check (#410) add checkAndAdjustSymmetry() in trainrunsection.helper.ts * fix onInputTravel time for asymmetry Signed-off-by: Louis Greiner <[email protected]> * fix bug on adjust time on symmetry Signed-off-by: Louis Greiner <[email protected]> * to-be-removed: fix left/right inversion for travelTime calculation Signed-off-by: Louis Greiner <[email protected]> * fix rebase Signed-off-by: Louis Greiner <[email protected]> --------- Signed-off-by: Louis Greiner <[email protected]> Co-authored-by: Yoh <[email protected]>
* add isSymmetric to Trainrun Signed-off-by: Louis Greiner <[email protected]> * enable trainrunSection departure/arrival assymetry at nodes Signed-off-by: Louis Greiner <[email protected]> * round-trip: add round trip parameter to trainrun Signed-off-by: Louis Greiner <[email protected]> * asymmetry: hide elements for return trip if one-way Signed-off-by: Louis Greiner <[email protected]> * refactor: getHiddenTagForTime for TrainrunSectionText Signed-off-by: Louis Greiner <[email protected]> * asymmetry: hide trainrunSectionsView times for one-way trips Signed-off-by: Louis Greiner <[email protected]> * to-be-removed: fix fix rebase Signed-off-by: Louis Greiner <[email protected]> * clean code from comments Signed-off-by: Louis Greiner <[email protected]> --------- Signed-off-by: Louis Greiner <[email protected]>
- move isSymmetric from TrainrunDto to trainrunServiceDto - adapt related services and helpers - in trainrunSection html template, display isSymmetric checkbox only if isRoundTrip is true Signed-off-by: Louis Greiner <[email protected]>
d7c4f06 to
f40c94e
Compare
Signed-off-by: Louis Greiner <[email protected]>
Signed-off-by: Louis Greiner <[email protected]>
Signed-off-by: Louis Greiner <[email protected]>
Signed-off-by: Louis Greiner <[email protected]>
5 tasks
|
Closing since both real PRs are well enough started:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In pair programming with @Yohh
Description
PR linked with issue on OSRD OpenRailAssociation repository : OpenRailAssociation/osrd#10576
PR work in progress, for exploration and review purposes
How to review properly
B) TrainrunSection arrival/departure time at nodes
Test all the different combinaisons of
+/- 1for the 5 different time values, and also for all locks combinaisons:leftDeparture / rightArrival / rightDeparture / leftArrival / travelTimeleftLock / travelTimeLock / rightLockleft = sourceandright = targetWarning
Since the
returnTravelTimeis a new feature in the PR, it might break the B) feature at some pointsThe symmetry is defined at the trainrun section level.
When symmetry is off, only show the

travelTime:When symmetry is off, only show the

travelTime:C) Enable one-way trip
Warning
The return times (
targetDepartureandsourceArrival) are only css-hidden, accordingly to the way NGE currently hides elementsWarning
Bug: when a trainrun is non-stopping at a node, the times for the trainrun dialog window are all hidden (because the target is not direct left/right)
Defined on a trainrun level:

The view of a section, left->right:

The view of a section, right->left:

D) Enable different travel times for round trips
Question: should we rename
travelTimeandreturnTravelTimeintoforwardTravelTimeandbackwardTravelTime? I'm not a huge fan of backward, since we don't really go backward, rather forward also, but in another direction.OR : should we rename it
upTravelTimeanddownTravelTimeto stick to the left/right paradigm ; if we stick to the source/target paradigm, we should stay withtravelTimeandreturnTravelTimeQuestion: should the
sourceArrivalandtargetDeparture(the return trip) be calculated withreturnTravelTimeor withtravelTimeThe current solution for displaying the
returnTravelTimeare:if the trainrun section is symmetric:

if the trainrun section is asymmetric, and

travelTime !== returnTravelTime:if the trainrun section is asymmetric, and

travelTime === returnTravelTime:This feature is not finished at all.
Remaining to do
Bugs:
returnTravelTimefor right->left nodes, instead oftravelTimetravelTimeinstead ofreturnTravelTimewhen left<->right nodes are invertedSpread the features for the rest of the application:
Perlenkette) doesn't take in account the above features, need to spread the changes to it:Streckengrafik) doesn't take in account the above features, need to spread the changes to it:extractTravelTime()List of features / fixes that would be nice to do if we have the time:
+/- 1 leftDepatureand+/- 1 leftArrivalchange the sametravelTime+/- 1 leftDepatureand+/- 1 leftArrivalchange a differenttravelTimetravelTimeis reduced to00.1, then propagating to the other time values with decimal60, not modifying the other time values60')Issues
Checklist
documentation/