Miscellaneous rabbit-induced cleanup

Signed-off-by: Davey Elder <iandavidelder@gmail.com>

Author: idelder

docs/source/extensions/unit_commitment.rst

@@ -105,8 +105,8 @@ parameters.  Exactly one row per :math:`(r, t)` pair is required.
    ":code:`unit_capacity`", ":math:`UC_{r,t}`", "—", "nameplate capacity per discrete unit (same units as :code:`v_capacity`); **required**"
    ":code:`min_output_fraction`", ":math:`\underline{f}_{r,t}`", "0", "minimum output as a fraction of available nameplate output per online unit; :math:`[0, 1]`"
    ":code:`max_output_fraction`", ":math:`\overline{f}_{r,t}`", "1", "maximum output as a fraction of available nameplate output per online unit; :math:`(0, 1]`"
-   ":code:`min_up_time_hours`", ":math:`T^{up}_{r,t}`", "0", "minimum number of consecutive hours a unit must remain online after starting; must be less than one full day"
-   ":code:`min_down_time_hours`", ":math:`T^{dn}_{r,t}`", "0", "minimum number of consecutive hours a unit must remain offline after stopping; must be less than one full day"
+   ":code:`min_up_time_hours`", ":math:`T^{up}_{r,t}`", "0", "minimum number of consecutive hours a unit must remain online after starting"
+   ":code:`min_down_time_hours`", ":math:`T^{dn}_{r,t}`", "0", "minimum number of consecutive hours a unit must remain offline after stopping"
    ":code:`linearized`", "—", "0", "if 1, UC variables are kept continuous (LP relaxation); if 0, they are promoted to non-negative integers (MIP)"
 
 unit_commitment_startup_cost

temoa/components/limits.py

@@ -798,7 +798,9 @@ def limit_emission_constraint(
     if 'unit_commitment' in model.enabled_extensions:
         from temoa.extensions.unit_commitment.components import startup
 
-        process_emissions += startup.uc_startup_emissions_rpe(model, regions, p, e)
+        process_emissions += quicksum(
+            startup.uc_startup_emissions_rpe(model, r, p, e) for r in regions
+        )
 
     embodied_emissions = quicksum(
         model.v_new_capacity[reg, t, v]

temoa/data_io/hybrid_loader.py

@@ -564,7 +564,7 @@ def _load_tech_group_members(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Loads members into the indexed set `tech_group_members`."""
-        model = TemoaModel()
+        model = self.model
         validator = self.viable_techs.members if self.viable_techs else None
         for group_name, tech in filtered_data:
             if validator is None or tech in validator:
@@ -582,7 +582,7 @@ def _load_time_season(
         """
         Loads time_season as a flat ordered set of season names.
         """
-        model = TemoaModel()
+        model = self.model
         if not filtered_data:
             logger.warning('No time_season table found. Loading a single filler season "S".')
             seasons_to_load: list[tuple[object, ...]] = [('S',)]
@@ -599,7 +599,7 @@ def _load_time_season_sequential(
         """
         Composite loader for time_season_sequential and its associated index sets.
         """
-        model = TemoaModel()
+        model = self.model
         if filtered_data:
             seg_frac_data = [
                 (row[0], row[2]) for row in filtered_data
@@ -623,7 +623,7 @@ def _load_existing_capacity(
         Handles different queries for myopic vs. standard runs and also
         populates the `tech_exist` set.
         """
-        model = TemoaModel()
+        model = self.model
         cur = self.con.cursor()
         mi = self.myopic_index
 
@@ -672,7 +672,7 @@ def _load_retired_existing_capacity(
             )
             return
 
-        model = TemoaModel()
+        model = self.model
         cur = self.con.cursor()
         mi = self.myopic_index
 
@@ -701,7 +701,7 @@ def _load_lifetime_tech(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Loads the lifetime_tech component."""
-        model = TemoaModel()
+        model = self.model
         cur = self.con.cursor()
         rows_to_load = cur.execute('SELECT region, tech, lifetime FROM lifetime_tech').fetchall()
         rt_getter = itemgetter(0, 1)
@@ -717,7 +717,7 @@ def _load_lifetime_process(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Loads the lifetime_process component."""
-        model = TemoaModel()
+        model = self.model
         cur = self.con.cursor()
         mi = self.myopic_index
 
@@ -743,7 +743,7 @@ def _load_lifetime_survival_curve(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Loads the lifetime_survival_curve component."""
-        model = TemoaModel()
+        model = self.model
         cur = self.con.cursor()
         mi = self.myopic_index
 
@@ -771,7 +771,7 @@ def _load_global_discount_rate(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Loads the required singleton global_discount_rate."""
-        model = TemoaModel()
+        model = self.model
         if filtered_data:
             data[model.global_discount_rate.name] = {None: cast('float', filtered_data[0][0])}
         else:
@@ -787,7 +787,7 @@ def _load_default_loan_rate(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Loads the optional singleton default_loan_rate."""
-        model = TemoaModel()
+        model = self.model
         if filtered_data:
             data[model.default_loan_rate.name] = {None: cast('float', filtered_data[0][0])}
 
@@ -799,7 +799,7 @@ def _load_efficiency(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Loads the main efficiency parameter, which is pre-calculated."""
-        model = TemoaModel()
+        model = self.model
         self._load_component_data(data, model.efficiency, self.efficiency_values)
 
     def _load_linked_techs(
@@ -832,7 +832,7 @@ def _load_ramping_down(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Composite loader for ramp_down_hourly and its index set `tech_downramping`."""
-        model = TemoaModel()
+        model = self.model
         self._load_component_data(data, model.ramp_down_hourly, filtered_data)
         if filtered_data:
             tech_data = sorted({(row[1],) for row in filtered_data})
@@ -848,7 +848,7 @@ def _load_ramping_up(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Composite loader for ramp_up_hourly and its index set `tech_upramping`."""
-        model = TemoaModel()
+        model = self.model
         self._load_component_data(data, model.ramp_up_hourly, filtered_data)
         if filtered_data:
             tech_data = sorted({(row[1],) for row in filtered_data})
@@ -864,7 +864,7 @@ def _load_rps_requirement(
         filtered_data: Sequence[tuple[object, ...]],
     ) -> None:
         """Handles deprecation warning for renewable_portfolio_standard."""
-        model = TemoaModel()
+        model = self.model
         self._load_component_data(data, model.renewable_portfolio_standard, filtered_data)
         if filtered_data:
             logger.warning(

temoa/extensions/economies_of_scale/core/model.py

@@ -14,9 +14,11 @@
     Var,
 )
 
-import temoa.extensions.economies_of_scale.components.cost_fixed_eos as cost_fixed_eos
-import temoa.extensions.economies_of_scale.components.cost_invest_eos as cost_invest_eos
-import temoa.extensions.economies_of_scale.components.cost_variable_eos as cost_variable_eos
+from temoa.extensions.economies_of_scale.components import (
+    cost_fixed_eos,
+    cost_invest_eos,
+    cost_variable_eos,
+)
 
 if TYPE_CHECKING:
     from temoa.core.model import TemoaModel

temoa/extensions/framework.py

@@ -43,7 +43,7 @@ def normalize_extension_ids(extension_ids: Sequence[str | object] | None) -> tup
         if not isinstance(ext_id, str):
             msg = f'Extension ids must be strings. Received: {type(ext_id).__name__}'
             logger.error(msg)
-            raise ValueError(msg)
+            raise TypeError(msg)
         cleaned = ext_id.strip().lower()
         if not cleaned:
             continue

temoa/extensions/unit_commitment/components/startup.py

@@ -21,8 +21,6 @@
 from temoa.components.costs import fixed_or_variable_cost
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable
-
     from pyomo.core.base.objective import ObjectiveData
 
     from temoa.core.model import TemoaModel
@@ -40,9 +38,7 @@
 logger = logging.getLogger(__name__)
 
 
-def uc_startup_emissions_rpe(
-    model: TemoaModel, r_g: Iterable[Region], p: Period, e: Commodity
-) -> Expression:
+def uc_startup_emissions_rpe(model: TemoaModel, r: Region, p: Period, e: Commodity) -> Expression:
     """
     Startup emissions to add to limit_emission_constraint.
     """
@@ -52,7 +48,7 @@ def uc_startup_emissions_rpe(
         * value(model.uc_unit_capacity[_r, t])
         * model.v_uc_started[_r, p, s, d, t, v]
         for _r, _e, t in model.uc_startup_emissions.sparse_keys()
-        if _r in r_g and _e == e
+        if _r == r and _e == e
         for v in model.process_vintages.get((_r, p, t), [])
         for s in model.time_season
         for d in model.time_of_day

temoa/extensions/unit_commitment/core/data_puller.py

@@ -63,8 +63,8 @@ def write_uc_results(
     records = []
 
     for uci, (online, started, stopped) in results.items():
-        # if all(abs(v) < epsilon for v in (online, started, stopped)):
-        #     continue
+        if all(abs(v) < epsilon for v in (online, started, stopped)):
+            continue
         row = {
             'scenario': scenario,
             'region': uci.r,

temoa/extensions/unit_commitment/core/model.py

@@ -14,9 +14,8 @@
     Var,
 )
 
-import temoa.extensions.unit_commitment.components.commitment as commitment
-import temoa.extensions.unit_commitment.components.startup as startup
 from temoa.components import capacity, operations
+from temoa.extensions.unit_commitment.components import commitment, startup
 
 if TYPE_CHECKING:
     from temoa.core.model import TemoaModel

tests/test_full_runs.py

@@ -243,12 +243,14 @@ def test_time_sequence_tests(
         'representative_periods': 1467.912766,
         'seasonal_timeslices': 1467.912766,
     }
+    time_sequencing = str(sequencer.config.time_sequencing)
+    expected_obj = objectives[time_sequencing]
 
     with contextlib.closing(sqlite3.connect(sequencer.config.output_database)) as con:
         cur = con.cursor()
         res = cur.execute('SELECT SUM(total_system_cost) FROM main.output_objective').fetchone()
         obj = res[0]
-        assert obj == pytest.approx(objectives[sequencer.config.time_sequencing], abs=0.00001), (
+        assert obj == pytest.approx(expected_obj, abs=0.00001), (
             'objective function value did not match expected for time sequencing test'
         )