Skip to content

Enable car-km counting #82

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
Merged
merged 73 commits into from
Feb 11, 2025
Merged

Enable car-km counting #82

merged 73 commits into from
Feb 11, 2025

Conversation

mbbruch
Copy link
Collaborator

@mbbruch mbbruch commented Jul 17, 2024

Inside the TrainSimBuilder, adds the total number of cars to the TrainState object.
Also adds a function to get total car-kilometers from the speed_limit_train_sim object.

@mbbruch mbbruch requested a review from calbaker July 17, 2024 22:50
@mbbruch mbbruch marked this pull request as draft July 17, 2024 23:45
Bruchon, Matthew and others added 27 commits July 26, 2024 14:36
separate counts for empty and loaded
f922fb4
Made drag coeff a function instead of list
797ddae
Merge branch 'main' into car_counting
b5692ab
@FDsteven
Completed intermodal empty car generations
5d0bab8
@FDsteven
Completed return demand based on the three different train types
3e7338e
@FDsteven
Enabled mixed consist, consolidated final traind demand df
4b56ac7
Corrected the drag function implementation
df8239a
Added gap size to defaults and proposed minor edits in train_planner.py
7089701
Corrected case for 'Loaded' suffix
6f6e0b2
changed to dataclass for readability
b2aa1d4
removed some of the non-generic stuff
e094532
integrating private repo changes
8399956
floordiv tweak
92a20f4
loco_pool generation fix
df40d23
Corrected return type for drag_coeff_function field
9197e89
revert default value
f168fec
Update utilities.py
31157e3
Merge branch 'fix/drag_coeff_func' into car_counting
66ed655
Merge branch 'mixed-consist-plus-wang-dev' into car_counting
7ac968c
car counting metrics working
7d5cdcd
metrics text fix
c59fd8d
initial LIFTS check-in
37eb8b7
polars version updates, initial lifts integration
2d94977
moved LIFTS to subdir
a8794d3
in-progress check-in
cf35408
update
c914562
Merge branch 'main' into car_counting
e9aa573
Chad Baker and others added 21 commits January 21, 2025 13:31
Merge branch 'main' into car_counting
32931b6 
# Conflicts:
#	pyproject.toml
#	python/altrios/train_planner.py
fixed build errors
2ebe756
regenerated variable_path_list_expected.txt
a583125
not sure why this changed
8b7d396
removed deprecated hard-coded braking parameters
52d64c3
fixed errors related to deleting hardcoded parameters
52e568d
Incorporated Geordie's changes into the code
ff4cd5c
Update sim_manager.py
ff8d0c0
incorporated change from Geordie
972f9a2
Merge branch 'car_counting' of github.com:NREL/altrios into car_counting
52ae0d3
Merge branch 'main' into car_counting
a915d1c 
# Conflicts:
#	python/altrios/train_planner.py
ported all ./ALTRIOS changes from PS repo
c424ab6
fixed demo_variable_paths.py
51cf10c
fixed set_speed_train_sim_demo.py
450abfe
fixed speed_limit_train_sim_demo.py
4da6d4c
exposed SavedSim in python
bd88093
brought in changes from downstream project repo
5a89ea8
cleaned up to_dataframe and removed deprecated methods
4d9239f
removed cross contamination
deb0591
all tests pass
4eeaeb8
bespoke dictionary flattening works great and all tests pass
fa10555
@mbbruch mbbruch marked this pull request as ready for review February 11, 2025 18:57
@calbaker calbaker merged commit 610c0e5 into main Feb 11, 2025
4 checks passed
@calbaker calbaker deleted the car_counting branch February 11, 2025 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@calbaker calbaker calbaker approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mbbruch @calbaker @FDsteven