Merge pull request #95 from NREL/mixed-consist-plus-wang-dev

Integration of private repo changes into train planner improvements
NREL · Sep 24, 2024 · 2791f87 · 2791f87
2 parents 4b56ac7 + 31157e3
commit 2791f87
Show file tree

Hide file tree

Showing 5 changed files with 394 additions and 241 deletions.
diff --git a/python/altrios/defaults.py b/python/altrios/defaults.py
@@ -33,6 +33,7 @@
 
 LOCO_LIFESPAN = 20
 ANNUAL_LOCO_TURNOVER = 1.0/LOCO_LIFESPAN
+DEFAULT_GAP_SIZE = 0.604
 
 DEMAND_FILE = alt.resources_root() / "Default Demand.csv"
 FUEL_EMISSIONS_FILE = alt.resources_root() / "metrics_inputs" / "GREET-CA_Emissions_Factors.csv"

diff --git a/python/altrios/demos/rollout_demo.py b/python/altrios/demos/rollout_demo.py
@@ -22,8 +22,8 @@
 File = defaults.DEMAND_FILE
 #targets = [0,0.05,0.1,0.15,0.2,0.25,0.3,0.35,0.4,0.45,0.5,0.55,0.6,0.65,0.7,0.75, 0.8]
 train_planner_config = train_planner.TrainPlannerConfig(
-            cars_per_locomotive=50,
-            target_cars_per_train=90)
+    cars_per_locomotive={"Default": 50},
+    target_cars_per_train={"Default": 90})
 targets = [0.5]
 for target in targets:
     scenario_infos, metrics = rollout.simulate_prescribed_rollout(

diff --git a/python/altrios/demos/sim_manager_demo.py b/python/altrios/demos/sim_manager_demo.py
@@ -35,8 +35,8 @@
 )
 
 train_planner_config = train_planner.TrainPlannerConfig(
-            cars_per_locomotive=50,
-            target_cars_per_train=90)
+            cars_per_locomotive={"Default": 50},
+            target_cars_per_train={"Default": 90})
 
 t0_main = time.perf_counter()