Enable car-km counting

.gitignore

@@ -1217,3 +1217,10 @@ code\ meetings
 altrios/resources/networks/Scenic - ALTRIOS Confidential.yaml
 altrios/dispatch/*.json
 activate.sh
+*.xlsx
+altrios/*.txt
+truck_work_log.txt
+vehicle_average_times.txt
+avg_time_per_train.txt
+crane_work_log.txt
+hostler_work_log.txt

applications/calibration/zanzeff_bel_cal.py

@@ -55,7 +55,7 @@ def get_bel_trip_mods(df: pd.DataFrame) -> pd.DataFrame:
     """
     # df['dt [s]'] = pd.to_datetime(df['PacificTime']).dt.tz_convert('UTC')
     df['timestamp'] = pd.to_datetime(df['PacificTime']).dt.to_pydatetime()
-    df['time [s]'] = cval.get_delta_seconds(df['timestamp']).cumsum()
+    df['time [s]'] = cval.get_delta_seconds(df['timestamp']).cum_sum()
 
     df3000 = df[['PacificTime', 'time [s]']].copy()
     df3000['Tractive Power [W]'] = (

applications/calibration/zanzeff_conv_loco_cal.py

@@ -33,7 +33,7 @@ def get_conv_trip_mods(df: pd.DataFrame) -> pd.DataFrame:
     df = df.drop_duplicates('PacificTime').copy()
     df['timestamp'] = pd.to_datetime(
         df['PacificTime']).dt.to_pydatetime()
-    df['time [s]'] = cval.get_delta_seconds(df['timestamp']).cumsum()
+    df['time [s]'] = cval.get_delta_seconds(df['timestamp']).cum_sum()
 
 
 
@@ -69,7 +69,7 @@ def get_conv_trip_mods(df: pd.DataFrame) -> pd.DataFrame:
     df39xx["Fuel Energy [J]"] = (df39xx["Fuel Power [W]"] *
                                     cval.get_delta_seconds(
                                         df39xx['timestamp'])
-                                    ).cumsum().copy()
+                                    ).cum_sum().copy()
     df39xx["engine_on"] = df['Engine Speed (RPM) BNSF ' + str(trailing_loc)] > 100
     return df39xx
 

applications/calibration/zanzeff_set_speed_train_cal.py

@@ -44,7 +44,7 @@ def get_train_sim_df_mods(
     df_train_sim.drop_duplicates(subset='PacificTime', inplace=True)
 
     df_train_sim['time [s]'] = cval.get_delta_seconds(
-        df_train_sim['PacificTime']).cumsum()
+        df_train_sim['PacificTime']).cum_sum()
     df_train_sim['Total Tractive Force [N]'] = df_train_sim[[
         'Tractive Effort Feedback BNSF 3940',
         'Tractive Effort Feedback BNSF 3965',
@@ -56,13 +56,13 @@ def get_train_sim_df_mods(
     df_train_sim['Total Cumu. Tractive Energy [J]'] = (
         df_train_sim['Total Tractive Power [W]'] *
         df_train_sim['time [s]'].diff().fillna(0.0)
-    ).cumsum()
+    ).cum_sum()
 
     df_train_sim['Total Pos. Cumu. Tractive Energy [J]'] = (
        (df_train_sim['Total Tractive Power [W]'] *
         df_train_sim['time [s]'].diff().fillna(0.0)) 
         .where(df_train_sim['Total Tractive Power [W]'] > 0, 0.0)
-        .cumsum()
+        .cum_sum()
     )
 
     speed = savgol_filter(

pyproject.toml

@@ -43,10 +43,11 @@ dependencies = [
     "plotly",
     "typing_extensions",
     "pyyaml",
-    "polars==0.20.25",
+    "polars >= 1.20.0",
     "pyarrow",
     "requests",
     "PyYAML==6.0.2",
+    "simpy"
 ]
 
 [project.urls]

python/altrios/altrios_pyo3.pyi

@@ -819,6 +819,7 @@ class SpeedLimitTrainSim(SerdeAPI):
     origs: List[Location]
     dests: List[Location]
     loco_con: Consist
+    n_cars_by_type: Dict[str, int]
     state: TrainState
     # train_res: TrainRes # not accessible in Python
     path_tpc: PathTpc
@@ -833,6 +834,7 @@ class SpeedLimitTrainSim(SerdeAPI):
     def __init__(
         cls,
         loco_con: Consist,
+        n_cars_by_type: Dict[str, int],
         state: TrainState,
         train_res_file: Optional[str],
         path_tpc_file: Optional[str],
@@ -931,6 +933,7 @@ class RailVehicle(SerdeAPI):
     braking_ratio_empty: float
     braking_ratio_loaded: float
     car_type: str
+    freight_type: str
     davis_b_seconds_per_meter: float
     cd_area_empty_square_meters: float
     cd_area_loaded_square_meters: float

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"

python/altrios/demos/rollout_demo.py

@@ -1,7 +1,8 @@
 # %%
 import altrios as alt
-from altrios import rollout, defaults, train_planner
+from altrios import rollout, defaults
 
+from altrios.train_planner import planner, planner_config
 import numpy as np
 import matplotlib.pyplot as plt
 import seaborn as sns
@@ -21,9 +22,9 @@
 plot_dir.mkdir(exist_ok=True)
 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)
+train_planner_config = planner_config.TrainPlannerConfig(
+    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(

python/altrios/demos/sim_manager_demo.py

@@ -1,8 +1,11 @@
 # %%
 from altrios import sim_manager
-from altrios import utilities, defaults, train_planner
+from altrios import utilities, defaults
 import altrios as alt
+from altrios.lifts import lifts_simulator
+from altrios.train_planner import planner_config
 import numpy as np
+import polars as pl
 import matplotlib.pyplot as plt
 import time
 import seaborn as sns
@@ -34,9 +37,9 @@
     f"Elapsed time to import rail vehicles, locations, and network: {t1_import - t0_import:.3g} s"
 )
 
-train_planner_config = train_planner.TrainPlannerConfig(
-            cars_per_locomotive=50,
-            target_cars_per_train=90)
+train_planner_config = planner_config.TrainPlannerConfig(
+            cars_per_locomotive={"Default": 50},
+            target_cars_per_train={"Default": 90})
 
 t0_main = time.perf_counter()
 
@@ -56,6 +59,11 @@
     debug=True,
 )
 
+train_consist_plan_csv = pl.read_csv('C:/Users/mbruchon/Downloads/simulation_operation/lifts/results/train_consist_plan.csv')
+container_data = lifts_simulator.run_simulation(
+    train_consist_plan = train_consist_plan_csv, 
+    terminal = "Allouez")
+
 t1_main = time.perf_counter()
 print(f"Elapsed time to run `sim_manager.main()`: {t1_main-t0_main:.3g} s")
 

python/altrios/lifts/__init__.py

@@ -0,0 +1,2 @@
+from pkg_resources import get_distribution
+__version__ = get_distribution("altrios").version