Merge pull request #66 from NREL/metrics_single_train

Single train GHG and emissions metrics (metrics_single_train into main)
NREL · Jul 2, 2024 · 72f3f82 · 72f3f82
2 parents 6c83741 + edc5a0f
commit 72f3f82
Show file tree

Hide file tree

Showing 41 changed files with 2,162 additions and 671 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,7 @@ dependencies = [
     "plotly",
     "typing_extensions",
     "pyyaml",
-    "polars==0.18.7",
+    "polars==0.20.25",
     "pyarrow",
     "requests",
 ]

diff --git a/python/altrios/altrios_pyo3.pyi b/python/altrios/altrios_pyo3.pyi
@@ -5,6 +5,8 @@ from typing_extensions import Self
 from typing import Union, Tuple
 from dataclasses import dataclass
 
+# TODO: udpate to include api for `force_max` and `mu`
+
 
 class SerdeAPI(object):
     @classmethod

diff --git a/python/altrios/defaults.py b/python/altrios/defaults.py
@@ -36,7 +36,7 @@
 
 DEMAND_FILE = alt.resources_root() / "Default Demand.csv"
 FUEL_EMISSIONS_FILE = alt.resources_root() / "metrics_inputs" / "GREET-CA_Emissions_Factors.csv"
-GRID_EMISSIONS_FILE = alt.resources_root() / "metrics_inputs" / "Cambium22_MidCase_annual_gea.csv"
+GRID_EMISSIONS_FILE = alt.resources_root() / "metrics_inputs" / "Cambium23_allScenarios_annual_gea.csv"
 ELECTRICITY_PRICE_FILE = alt.resources_root() / "metrics_inputs" / "EIA_Electricity_Prices.csv"
 LIQUID_FUEL_PRICE_FILE = alt.resources_root() / "metrics_inputs" / "EIA_Liquid_Fuel_Prices.csv"
 BATTERY_PRICE_FILE = alt.resources_root() / "metrics_inputs" / "NREL_ATB_Battery_Cost_Forecasts.csv"
diff --git a/python/altrios/demos/rollout_demo.py b/python/altrios/demos/rollout_demo.py
@@ -30,7 +30,7 @@
         max_bel_share=target,
         number_of_years=1,
         results_folder=Path(__file__).parent / "results/case study/",
-        demand_file_path=File,
+        demand_file=File,
         train_planner_config=train_planner_config,
         count_unused_locomotives=False,
         write_complete_results=False,