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

Integration of private repo changes into train planner improvements #95

Merged
merged 4 commits into from
Sep 24, 2024

Conversation

mbbruch
Copy link
Collaborator

@mbbruch mbbruch commented Sep 24, 2024

  1. train planner improvements from private repo integrated into this repo.
  2. generate_return_demand implemented as separate functions for each train type. Functions are "registered" in a dict and looked up by train type.
  3. target_cars_per_train and min_cars_per_train are dicts where each Train_Type can have a different value specified.
  4. TrainPlannerConfig is a @dataclass to make code cleaner
  5. additional edge case handling to calculate number of trains in generate_demand_trains
  6. generate_dispatch_times renamed generate_dispatch_details. It now evenly spaces out all dispatches for each OD pair, rather than doing so separately for each train type, so that simultaneous departures are avoided.
  7. The alt.TrainConfig object is updated based on the actual dispatched rail vehicles (loaded and/or empty) including the rail_vehicles vector and the n_cars_by_type dict.

@mbbruch mbbruch requested a review from FDsteven September 24, 2024 04:09
@mbbruch
Copy link
Collaborator Author

mbbruch commented Sep 24, 2024

@FDsteven , this PR integrates the private repo changes into your ongoing train planner updates branch. Please review the list of changes above + the code changes and let me know if you have any questions.

@Shawn0516 , for your awareness, this is where I am starting to port your changes into the ALTRIOS repo.

@mbbruch mbbruch merged commit 2791f87 into feature/mixed-consist Sep 24, 2024
3 checks passed
@mbbruch mbbruch deleted the mixed-consist-plus-wang-dev branch September 24, 2024 17:44
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.

2 participants