Restructure tests

src/echo/models/thermal/storage.py

@@ -30,7 +30,7 @@ class ThermalStorage(Node):
     discharging_power_limit: NegativeFloat = (
         None  # Maximum energy flow out of the storage at each interval, in energy_flow_units
     )
-    ambient_temp: dict = None  # Ambient temp, formatted as dict with expansion-time keys
+    ambient_temp: dict | None = None  # Ambient temp, formatted as dict with expansion-time keys
     ambient_temp_ref: str | None  # Ambient temp by column name reference in profile dataframe
     ins_transmittance: NonNegativeFloat = (
         0  # Thermal transmittance U-value of Thermal Energy Storage insulation in W/sqm*C

tests/conftest.py

@@ -1,7 +1,10 @@
 import os
 
+import pyomo.environ as en
 import pytest
 
+from echo.models.scenario import EchoConcreteModel, ScenarioSettings, engine_settings_from_environment
+
 
 @pytest.fixture
 def can_optimiser_do_non_linear_optimisation() -> bool:
@@ -13,3 +16,32 @@ def can_optimiser_do_non_linear_optimisation() -> bool:
         return False
 
     return True
+
+
+@pytest.fixture
+def empty_model():
+    DEFAULT_NUMBER_OF_INTERVALS = 6
+
+    def _empty_model(number_of_intervals: int = DEFAULT_NUMBER_OF_INTERVALS) -> EchoConcreteModel:
+        model = EchoConcreteModel()
+        engine_settings = engine_settings_from_environment()
+        scenario_settings = ScenarioSettings(
+            interval_duration=30,
+            number_of_intervals=number_of_intervals,
+            number_of_expansion_intervals=1,
+        )
+        model.small_m = en.Param(initialize=engine_settings.small_m)
+        model.big_m = en.Param(initialize=engine_settings.big_m)
+        model.scenario_settings = scenario_settings
+        model.Time = en.RangeSet(0, scenario_settings.number_of_intervals - 1)
+        if scenario_settings.number_of_expansion_intervals == 0:
+            model.Expansion = en.RangeSet(0, 0)
+        else:
+            model.Expansion = en.RangeSet(0, scenario_settings.number_of_expansion_intervals - 1)
+        discount_rates = {}
+        for ep in range(0, scenario_settings.number_of_expansion_intervals):
+            discount_rates[ep] = 1 / ((1 + scenario_settings.discount_rate) ** ep)
+        model.discount_rates = en.Param(model.Expansion, initialize=discount_rates)
+        return model
+
+    return _empty_model

tests/test_new_demand_tariffs.py → tests/integration/test_demand_tariffs.py

@@ -1,39 +1,15 @@
 import numpy as np
-import pyomo.environ as en
 
 from echo.configuration import Units
 from echo.models.agnostic import FlexPort
 from echo.models.base import Node, OptimisationGraph
 from echo.models.electrical import ElectricalDemand, ElectricalGeneration
-from echo.models.scenario import EchoConcreteModel, ScenarioSettings, engine_settings_from_environment
+from echo.models.scenario import ScenarioSettings, engine_settings_from_environment
 from echo.objectives.base import ObjectiveSet
 from echo.objectives.tariff import DemandCharge, DemandTariffObjective, ExportDemandCharge, ImportDemandCharge
 from echo.optimiser import optimise
 
 
-def empty_model(number_of_intervals: int = 6):
-    model = EchoConcreteModel()
-    engine_settings = engine_settings_from_environment()
-    scenario_settings = ScenarioSettings(
-        interval_duration=30,
-        number_of_intervals=number_of_intervals,
-        number_of_expansion_intervals=1,
-    )
-    model.small_m = en.Param(initialize=engine_settings.small_m)
-    model.big_m = en.Param(initialize=engine_settings.big_m)
-    model.scenario_settings = scenario_settings
-    model.Time = en.RangeSet(0, scenario_settings.number_of_intervals - 1)
-    if scenario_settings.number_of_expansion_intervals == 0:
-        model.Expansion = en.RangeSet(0, 0)
-    else:
-        model.Expansion = en.RangeSet(0, scenario_settings.number_of_expansion_intervals - 1)
-    discount_rates = {}
-    for ep in range(0, scenario_settings.number_of_expansion_intervals):
-        discount_rates[ep] = 1 / ((1 + scenario_settings.discount_rate) ** ep)
-    model.discount_rates = en.Param(model.Expansion, initialize=discount_rates)
-    return model
-
-
 def test_system_import_demand_tariff():
     """Test that we correctly calculate the max import demand"""
 
@@ -261,7 +237,7 @@ def test_demand_tariff_read_and_implemented_correctly():
     assert round(max_demand_3[0]) == max_in_window_3 == round(optimise_results.objective.args[2].value)
 
 
-def test_demand_tariff_objective_apply_constraints_for_closure_issues():
+def test_demand_tariff_objective_apply_constraints_for_closure_issues(empty_model):
     model = empty_model(number_of_intervals=9)
 
     expansion_periods = 1

tests/test_base.py → tests/integration/test_rebuild_optimisation_graph.py

@@ -1,9 +1,8 @@
-import numpy as np
 import pytest
 
 from echo.configuration import Units
 from echo.models.agnostic import FlexPort, TellegenNode
-from echo.models.base import Node, OptimisationGraph, Port
+from echo.models.base import Node, OptimisationGraph
 from echo.models.electrical import EVV0G, EVV1G, EVV2G, ElectricalGeneration, Inverter
 from echo.models.prebuilt import FlexElectricalNode
 from echo.models.scenario import ScenarioSettings, engine_settings_from_environment
@@ -12,37 +11,6 @@
 from echo.optimiser import optimise
 
 
-def test_port_proccess_initial_value_types():
-    port = Port(port_name="port_name")
-
-    # Assert the initial value is None before it's set
-    assert port.initial_value is None
-
-    # Assert list of ints is processed
-    port.process_initial_value(initial_val=[1, 2, 3])
-    assert port.initial_value == {(0, 0): 1, (0, 1): 2, (0, 2): 3}
-
-    # Assert list of floats is processed
-    port.process_initial_value(initial_val=[1.0, 2.0, 3.0])
-    assert port.initial_value == {(0, 0): 1.0, (0, 1): 2.0, (0, 2): 3.0}
-
-    # Assert a dict of ints is processed
-    port.process_initial_value(initial_val={(0, 0): 1, (0, 1): 2, (0, 2): 3})
-    assert port.initial_value == {(0, 0): 1, (0, 1): 2, (0, 2): 3}
-
-    # Assert a dict of ints is processed
-    port.process_initial_value(initial_val={(0, 0): 1.0, (0, 1): 2.0, (0, 2): 3.0})
-    assert port.initial_value == {(0, 0): 1.0, (0, 1): 2.0, (0, 2): 3.0}
-
-    # Assert a numpy array of ints is processed
-    port.process_initial_value(initial_val=np.array([1, 2, 3]))
-    assert port.initial_value == {(0, 0): 1, (0, 1): 2, (0, 2): 3}
-
-    # Assert a numpy array of floats is processed
-    port.process_initial_value(initial_val=np.array([1.0, 2.0, 3.0]))
-    assert port.initial_value == {(0, 0): 1.0, (0, 1): 2.0, (0, 2): 3.0}
-
-
 def test_port_reference_is_made_in_edge():
     """This test whether a port on a node and on an edge are references or copies.
 

tests/test_simple_solar_curtailment.py → tests/integration/test_simple_solar_curtailment.py

@@ -8,8 +8,6 @@
 from echo.objectives.base import ObjectiveSet, TotalFlow, TotalImportFlow
 from echo.optimiser import optimise
 
-N_INTERVALS = 48
-
 
 def test_solar_generation_limited_by_inverter_size():
     expansion_periods = 1

tests/test_slack_variables.py → tests/integration/test_slack_variables.py

@@ -8,8 +8,6 @@
 from echo.objectives.base import ObjectiveSet, TotalFlow
 from echo.optimiser import optimise
 
-N_INTERVALS = 48
-
 
 def test_export_slack_var_is_minimised():
     """Connect curtailable solar to a connection pt with a flow constraint and slack vars enabled.