junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-08 11:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

addressing feedback

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2026-02-18 17:39:40 +00:00
parent 378eb05508
commit 0e10923353
3 changed files with 19 additions and 519 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
recommendations/optimiser/GainOptimiser.py
View file

@ -94,9 +94,6 @@ class GainOptimiser:
for group_vars in self.variables:
self.m += xsum(var for var in group_vars) <= 1
self.m.max_gap = 0
self.m.integer_tol = 1e-9
def setup_slack(self):
# Remove the original cost constraint
self.m.remove(self.cost_constraint)

10
recommendations/optimiser/funding_optimiser.py
View file

@ -1114,8 +1114,14 @@ def run_optimizer(
allow_slack: bool = False
):
"""
Thin wrapper over your optimisers.
Returns: list[dict] selected_options
Thin wrapper around the StrategicOptimiser to run it on a subset of measures with an optional budget and target
gain. Handles the cases of no input measures, and extracts the outputs for ease of use.
:param input_measures: list of groups of measures (each group is a list of measure dicts)
:param budget: optional budget to constrain the optimisation
:param sub_target_gain: optional target gain to achieve from this optimisation run
:param allow_slack: whether to allow solutions that exceed the target gain (True) or only solutions that meet it
exactly (False)
:return: tuple of (picked measures, total cost, total gain) where picked measures is a list of measure dicts
"""
if not input_measures:

525
recommendations/tests/test_optimiser_functions.py
View file

@ -291,7 +291,9 @@ class TestIncreasingEpcE2e:
class TestStrategicOptimiser:
def test_budget_and_target_gain(self):
@pytest.fixture
def components(self):
components = [
[
{'id': '0_phase=0', 'cost': 819.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
@ -419,6 +421,9 @@ class TestStrategicOptimiser:
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74}
]
]
return components
def test_budget_and_target_gain_strategy_case_1_try_min_cost_with_constraints(self, components):
budget = 5000
target_gain = 11.5
@ -436,134 +441,7 @@ class TestStrategicOptimiser:
assert opt.solution_cost == 4398.75
assert opt.solution_gain == 12
def test_budget_and_target_gain_2(self):
components = [
[
{'id': '0_phase=0', 'cost': 819.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 819.0, 'raw_cost': 819.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0},
{'id': '1_phase=0', 'cost': 702.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 702.0, 'raw_cost': 702.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0},
{'id': '2_phase=0', 'cost': 585.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 585.0, 'raw_cost': 585.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0}],
[{'id': '4_phase=2', 'cost': 3656.25, 'gain': 2.0, 'type': 'suspended_floor_insulation',
'innovation_uplift': 0, 'cost_minus_uplift': 3656.25, 'raw_cost': 3656.25, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False,
'array_size': 0}],
[{'id': '5_phase=3', 'cost': 17.5, 'gain': 1.0, 'type': 'low_energy_lighting', 'innovation_uplift': 0,
'cost_minus_uplift': 17.5, 'raw_cost': 17.5, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}],
[{'id': '6_phase=4', 'cost': 140, 'gain': 3.4, 'type': 'roomstat_programmer_trvs', 'innovation_uplift': 0,
'cost_minus_uplift': 140, 'raw_cost': 140, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0},
{'id': '7_phase=4', 'cost': 874.5680000000001, 'gain': 4.2, 'type': 'time_temperature_zone_control',
'innovation_uplift': 0, 'cost_minus_uplift': 874.5680000000001, 'raw_cost': 874.5680000000001,
'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0,
'already_installed': False, 'has_battery': False, 'array_size': 0}],
[{'id': '9_phase=6', 'cost': 5420.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5420.0, 'raw_cost': 5420.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.6},
{'id': '10_phase=6', 'cost': 6210.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6210.0, 'raw_cost': 6210.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.6,
'battery_gain': 3},
{'id': '11_phase=6', 'cost': 6820.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6820.0, 'raw_cost': 6820.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.6,
'battery_gain': 3},
{'id': '12_phase=6', 'cost': 7202.0, 'gain': 14.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7202.0, 'raw_cost': 7202.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.915},
{'id': '13_phase=6', 'cost': 6495.0, 'gain': 14.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6495.0, 'raw_cost': 6495.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.92},
{'id': '14_phase=6', 'cost': 7285.0, 'gain': 17.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7285.0, 'raw_cost': 7285.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.92,
'battery_gain': 3},
{'id': '15_phase=6', 'cost': 7895.0, 'gain': 17.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7895.0, 'raw_cost': 7895.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.92,
'battery_gain': 3},
{'id': '16_phase=6', 'cost': 5520.0, 'gain': 15.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5520.0, 'raw_cost': 5520.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 4.0},
{'id': '17_phase=6', 'cost': 6310.0, 'gain': 18.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6310.0, 'raw_cost': 6310.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 4.0,
'battery_gain': 3},
{'id': '18_phase=6', 'cost': 6920.0, 'gain': 18.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6920.0, 'raw_cost': 6920.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 4.0,
'battery_gain': 3},
{'id': '19_phase=6', 'cost': 5320.0, 'gain': 12.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5320.0, 'raw_cost': 5320.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.2},
{'id': '20_phase=6', 'cost': 6110.0, 'gain': 14.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6110.0, 'raw_cost': 6110.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.2,
'battery_gain': 2},
{'id': '21_phase=6', 'cost': 6720.0, 'gain': 14.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6720.0, 'raw_cost': 6720.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.2,
'battery_gain': 2},
{'id': '22_phase=6', 'cost': 6932.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6932.0, 'raw_cost': 6932.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.48},
{'id': '23_phase=6', 'cost': 6295.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6295.0, 'raw_cost': 6295.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.48},
{'id': '24_phase=6', 'cost': 7085.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7085.0, 'raw_cost': 7085.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.48,
'battery_gain': 3},
{'id': '25_phase=6', 'cost': 7695.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7695.0, 'raw_cost': 7695.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.48,
'battery_gain': 3},
{'id': '26_phase=6', 'cost': 5220.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5220.0, 'raw_cost': 5220.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.8},
{'id': '27_phase=6', 'cost': 6662.0, 'gain': 12.3, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6662.0, 'raw_cost': 6662.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.045},
{'id': '28_phase=6', 'cost': 6095.0, 'gain': 12.3, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6095.0, 'raw_cost': 6095.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.05},
{'id': '29_phase=6', 'cost': 5160.0, 'gain': 9.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5160.0, 'raw_cost': 5160.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.4},
{'id': '30_phase=6', 'cost': 6392.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6392.0, 'raw_cost': 6392.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.61},
{'id': '31_phase=6', 'cost': 5910.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5910.0, 'raw_cost': 5910.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.61},
{'id': '32_phase=6', 'cost': 5100.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5100.0, 'raw_cost': 5100.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.0},
{'id': '33_phase=6', 'cost': 6098.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6098.0, 'raw_cost': 6098.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.175},
{'id': '34_phase=6', 'cost': 5725.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5725.0, 'raw_cost': 5725.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.18},
{'id': '35_phase=6', 'cost': 5040.0, 'gain': 6.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5040.0, 'raw_cost': 5040.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.6},
{'id': '36_phase=6', 'cost': 5828.0, 'gain': 7.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5828.0, 'raw_cost': 5828.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74},
{'id': '37_phase=6', 'cost': 5540.0, 'gain': 7.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5540.0, 'raw_cost': 5540.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74}
]
]
def test_budget_and_target_gain_expecting_case_1_solve_max_gain_under_budget_strategy(self, components):
budget = 4000
target_gain = 11.5
@ -582,134 +460,7 @@ class TestStrategicOptimiser:
assert opt.solution_cost == 1477.0680000000002
assert opt.solution_gain == 10.8
def test_just_gain(self):
components = [
[
{'id': '0_phase=0', 'cost': 819.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 819.0, 'raw_cost': 819.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0},
{'id': '1_phase=0', 'cost': 702.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 702.0, 'raw_cost': 702.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0},
{'id': '2_phase=0', 'cost': 585.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 585.0, 'raw_cost': 585.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0}],
[{'id': '4_phase=2', 'cost': 3656.25, 'gain': 2.0, 'type': 'suspended_floor_insulation',
'innovation_uplift': 0, 'cost_minus_uplift': 3656.25, 'raw_cost': 3656.25, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False,
'array_size': 0}],
[{'id': '5_phase=3', 'cost': 17.5, 'gain': 1.0, 'type': 'low_energy_lighting', 'innovation_uplift': 0,
'cost_minus_uplift': 17.5, 'raw_cost': 17.5, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}],
[{'id': '6_phase=4', 'cost': 140, 'gain': 3.4, 'type': 'roomstat_programmer_trvs', 'innovation_uplift': 0,
'cost_minus_uplift': 140, 'raw_cost': 140, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0},
{'id': '7_phase=4', 'cost': 874.5680000000001, 'gain': 4.2, 'type': 'time_temperature_zone_control',
'innovation_uplift': 0, 'cost_minus_uplift': 874.5680000000001, 'raw_cost': 874.5680000000001,
'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0,
'already_installed': False, 'has_battery': False, 'array_size': 0}],
[{'id': '9_phase=6', 'cost': 5420.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5420.0, 'raw_cost': 5420.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.6},
{'id': '10_phase=6', 'cost': 6210.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6210.0, 'raw_cost': 6210.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.6,
'battery_gain': 3},
{'id': '11_phase=6', 'cost': 6820.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6820.0, 'raw_cost': 6820.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.6,
'battery_gain': 3},
{'id': '12_phase=6', 'cost': 7202.0, 'gain': 14.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7202.0, 'raw_cost': 7202.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.915},
{'id': '13_phase=6', 'cost': 6495.0, 'gain': 14.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6495.0, 'raw_cost': 6495.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.92},
{'id': '14_phase=6', 'cost': 7285.0, 'gain': 17.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7285.0, 'raw_cost': 7285.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.92,
'battery_gain': 3},
{'id': '15_phase=6', 'cost': 7895.0, 'gain': 17.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7895.0, 'raw_cost': 7895.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.92,
'battery_gain': 3},
{'id': '16_phase=6', 'cost': 5520.0, 'gain': 15.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5520.0, 'raw_cost': 5520.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 4.0},
{'id': '17_phase=6', 'cost': 6310.0, 'gain': 18.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6310.0, 'raw_cost': 6310.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 4.0,
'battery_gain': 3},
{'id': '18_phase=6', 'cost': 6920.0, 'gain': 18.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6920.0, 'raw_cost': 6920.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 4.0,
'battery_gain': 3},
{'id': '19_phase=6', 'cost': 5320.0, 'gain': 12.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5320.0, 'raw_cost': 5320.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.2},
{'id': '20_phase=6', 'cost': 6110.0, 'gain': 14.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6110.0, 'raw_cost': 6110.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.2,
'battery_gain': 2},
{'id': '21_phase=6', 'cost': 6720.0, 'gain': 14.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6720.0, 'raw_cost': 6720.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.2,
'battery_gain': 2},
{'id': '22_phase=6', 'cost': 6932.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6932.0, 'raw_cost': 6932.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.48},
{'id': '23_phase=6', 'cost': 6295.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6295.0, 'raw_cost': 6295.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.48},
{'id': '24_phase=6', 'cost': 7085.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7085.0, 'raw_cost': 7085.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.48,
'battery_gain': 3},
{'id': '25_phase=6', 'cost': 7695.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7695.0, 'raw_cost': 7695.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.48,
'battery_gain': 3},
{'id': '26_phase=6', 'cost': 5220.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5220.0, 'raw_cost': 5220.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.8},
{'id': '27_phase=6', 'cost': 6662.0, 'gain': 12.3, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6662.0, 'raw_cost': 6662.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.045},
{'id': '28_phase=6', 'cost': 6095.0, 'gain': 12.3, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6095.0, 'raw_cost': 6095.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.05},
{'id': '29_phase=6', 'cost': 5160.0, 'gain': 9.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5160.0, 'raw_cost': 5160.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.4},
{'id': '30_phase=6', 'cost': 6392.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6392.0, 'raw_cost': 6392.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.61},
{'id': '31_phase=6', 'cost': 5910.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5910.0, 'raw_cost': 5910.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.61},
{'id': '32_phase=6', 'cost': 5100.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5100.0, 'raw_cost': 5100.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.0},
{'id': '33_phase=6', 'cost': 6098.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6098.0, 'raw_cost': 6098.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.175},
{'id': '34_phase=6', 'cost': 5725.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5725.0, 'raw_cost': 5725.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.18},
{'id': '35_phase=6', 'cost': 5040.0, 'gain': 6.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5040.0, 'raw_cost': 5040.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.6},
{'id': '36_phase=6', 'cost': 5828.0, 'gain': 7.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5828.0, 'raw_cost': 5828.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74},
{'id': '37_phase=6', 'cost': 5540.0, 'gain': 7.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5540.0, 'raw_cost': 5540.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74}
]
]
def test_just_gain_expecting_case_3_solve_min_cost_for_target_strategy(self, components):
budget = None
target_gain = 11.5
@ -726,134 +477,7 @@ class TestStrategicOptimiser:
assert opt.solution_cost == 4398.75
assert opt.solution_gain == 12
def test_just_gain2(self):
components = [
[
{'id': '0_phase=0', 'cost': 819.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 819.0, 'raw_cost': 819.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0},
{'id': '1_phase=0', 'cost': 702.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 702.0, 'raw_cost': 702.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0},
{'id': '2_phase=0', 'cost': 585.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 585.0, 'raw_cost': 585.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0}],
[{'id': '4_phase=2', 'cost': 3656.25, 'gain': 2.0, 'type': 'suspended_floor_insulation',
'innovation_uplift': 0, 'cost_minus_uplift': 3656.25, 'raw_cost': 3656.25, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False,
'array_size': 0}],
[{'id': '5_phase=3', 'cost': 17.5, 'gain': 1.0, 'type': 'low_energy_lighting', 'innovation_uplift': 0,
'cost_minus_uplift': 17.5, 'raw_cost': 17.5, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}],
[{'id': '6_phase=4', 'cost': 140, 'gain': 3.4, 'type': 'roomstat_programmer_trvs', 'innovation_uplift': 0,
'cost_minus_uplift': 140, 'raw_cost': 140, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0},
{'id': '7_phase=4', 'cost': 874.5680000000001, 'gain': 4.2, 'type': 'time_temperature_zone_control',
'innovation_uplift': 0, 'cost_minus_uplift': 874.5680000000001, 'raw_cost': 874.5680000000001,
'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0,
'already_installed': False, 'has_battery': False, 'array_size': 0}],
[{'id': '9_phase=6', 'cost': 5420.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5420.0, 'raw_cost': 5420.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.6},
{'id': '10_phase=6', 'cost': 6210.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6210.0, 'raw_cost': 6210.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.6,
'battery_gain': 3},
{'id': '11_phase=6', 'cost': 6820.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6820.0, 'raw_cost': 6820.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.6,
'battery_gain': 3},
{'id': '12_phase=6', 'cost': 7202.0, 'gain': 14.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7202.0, 'raw_cost': 7202.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.915},
{'id': '13_phase=6', 'cost': 6495.0, 'gain': 14.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6495.0, 'raw_cost': 6495.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.92},
{'id': '14_phase=6', 'cost': 7285.0, 'gain': 17.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7285.0, 'raw_cost': 7285.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.92,
'battery_gain': 3},
{'id': '15_phase=6', 'cost': 7895.0, 'gain': 17.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7895.0, 'raw_cost': 7895.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.92,
'battery_gain': 3},
{'id': '16_phase=6', 'cost': 5520.0, 'gain': 15.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5520.0, 'raw_cost': 5520.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 4.0},
{'id': '17_phase=6', 'cost': 6310.0, 'gain': 18.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6310.0, 'raw_cost': 6310.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 4.0,
'battery_gain': 3},
{'id': '18_phase=6', 'cost': 6920.0, 'gain': 18.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6920.0, 'raw_cost': 6920.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 4.0,
'battery_gain': 3},
{'id': '19_phase=6', 'cost': 5320.0, 'gain': 12.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5320.0, 'raw_cost': 5320.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.2},
{'id': '20_phase=6', 'cost': 6110.0, 'gain': 14.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6110.0, 'raw_cost': 6110.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.2,
'battery_gain': 2},
{'id': '21_phase=6', 'cost': 6720.0, 'gain': 14.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6720.0, 'raw_cost': 6720.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.2,
'battery_gain': 2},
{'id': '22_phase=6', 'cost': 6932.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6932.0, 'raw_cost': 6932.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.48},
{'id': '23_phase=6', 'cost': 6295.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6295.0, 'raw_cost': 6295.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.48},
{'id': '24_phase=6', 'cost': 7085.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7085.0, 'raw_cost': 7085.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.48,
'battery_gain': 3},
{'id': '25_phase=6', 'cost': 7695.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7695.0, 'raw_cost': 7695.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.48,
'battery_gain': 3},
{'id': '26_phase=6', 'cost': 5220.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5220.0, 'raw_cost': 5220.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.8},
{'id': '27_phase=6', 'cost': 6662.0, 'gain': 12.3, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6662.0, 'raw_cost': 6662.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.045},
{'id': '28_phase=6', 'cost': 6095.0, 'gain': 12.3, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6095.0, 'raw_cost': 6095.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.05},
{'id': '29_phase=6', 'cost': 5160.0, 'gain': 9.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5160.0, 'raw_cost': 5160.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.4},
{'id': '30_phase=6', 'cost': 6392.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6392.0, 'raw_cost': 6392.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.61},
{'id': '31_phase=6', 'cost': 5910.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5910.0, 'raw_cost': 5910.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.61},
{'id': '32_phase=6', 'cost': 5100.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5100.0, 'raw_cost': 5100.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.0},
{'id': '33_phase=6', 'cost': 6098.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6098.0, 'raw_cost': 6098.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.175},
{'id': '34_phase=6', 'cost': 5725.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5725.0, 'raw_cost': 5725.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.18},
{'id': '35_phase=6', 'cost': 5040.0, 'gain': 6.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5040.0, 'raw_cost': 5040.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.6},
{'id': '36_phase=6', 'cost': 5828.0, 'gain': 7.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5828.0, 'raw_cost': 5828.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74},
{'id': '37_phase=6', 'cost': 5540.0, 'gain': 7.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5540.0, 'raw_cost': 5540.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74}
]
]
def test_just_gain_of_20_expecting_case_3_solve_min_cost_for_target_strategy(self, components):
budget = None
target_gain = 20
@ -870,134 +494,7 @@ class TestStrategicOptimiser:
assert opt.solution_cost == 5962.5
assert opt.solution_gain == 20.2
def test_just_budget(self):
components = [
[
{'id': '0_phase=0', 'cost': 819.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 819.0, 'raw_cost': 819.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0},
{'id': '1_phase=0', 'cost': 702.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 702.0, 'raw_cost': 702.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0},
{'id': '2_phase=0', 'cost': 585.0, 'gain': 5.6, 'type': 'loft_insulation', 'innovation_uplift': 0,
'cost_minus_uplift': 585.0, 'raw_cost': 585.0, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False,
'has_battery': False, 'array_size': 0}],
[{'id': '4_phase=2', 'cost': 3656.25, 'gain': 2.0, 'type': 'suspended_floor_insulation',
'innovation_uplift': 0, 'cost_minus_uplift': 3656.25, 'raw_cost': 3656.25, 'partial_project_funding': 0,
'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False,
'array_size': 0}],
[{'id': '5_phase=3', 'cost': 17.5, 'gain': 1.0, 'type': 'low_energy_lighting', 'innovation_uplift': 0,
'cost_minus_uplift': 17.5, 'raw_cost': 17.5, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}],
[{'id': '6_phase=4', 'cost': 140, 'gain': 3.4, 'type': 'roomstat_programmer_trvs', 'innovation_uplift': 0,
'cost_minus_uplift': 140, 'raw_cost': 140, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0},
{'id': '7_phase=4', 'cost': 874.5680000000001, 'gain': 4.2, 'type': 'time_temperature_zone_control',
'innovation_uplift': 0, 'cost_minus_uplift': 874.5680000000001, 'raw_cost': 874.5680000000001,
'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0,
'already_installed': False, 'has_battery': False, 'array_size': 0}],
[{'id': '9_phase=6', 'cost': 5420.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5420.0, 'raw_cost': 5420.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.6},
{'id': '10_phase=6', 'cost': 6210.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6210.0, 'raw_cost': 6210.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.6,
'battery_gain': 3},
{'id': '11_phase=6', 'cost': 6820.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6820.0, 'raw_cost': 6820.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.6,
'battery_gain': 3},
{'id': '12_phase=6', 'cost': 7202.0, 'gain': 14.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7202.0, 'raw_cost': 7202.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.915},
{'id': '13_phase=6', 'cost': 6495.0, 'gain': 14.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6495.0, 'raw_cost': 6495.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.92},
{'id': '14_phase=6', 'cost': 7285.0, 'gain': 17.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7285.0, 'raw_cost': 7285.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.92,
'battery_gain': 3},
{'id': '15_phase=6', 'cost': 7895.0, 'gain': 17.5, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7895.0, 'raw_cost': 7895.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.92,
'battery_gain': 3},
{'id': '16_phase=6', 'cost': 5520.0, 'gain': 15.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5520.0, 'raw_cost': 5520.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 4.0},
{'id': '17_phase=6', 'cost': 6310.0, 'gain': 18.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6310.0, 'raw_cost': 6310.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 4.0,
'battery_gain': 3},
{'id': '18_phase=6', 'cost': 6920.0, 'gain': 18.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6920.0, 'raw_cost': 6920.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 4.0,
'battery_gain': 3},
{'id': '19_phase=6', 'cost': 5320.0, 'gain': 12.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5320.0, 'raw_cost': 5320.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.2},
{'id': '20_phase=6', 'cost': 6110.0, 'gain': 14.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6110.0, 'raw_cost': 6110.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.2,
'battery_gain': 2},
{'id': '21_phase=6', 'cost': 6720.0, 'gain': 14.1, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6720.0, 'raw_cost': 6720.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.2,
'battery_gain': 2},
{'id': '22_phase=6', 'cost': 6932.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6932.0, 'raw_cost': 6932.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.48},
{'id': '23_phase=6', 'cost': 6295.0, 'gain': 13.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6295.0, 'raw_cost': 6295.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.48},
{'id': '24_phase=6', 'cost': 7085.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7085.0, 'raw_cost': 7085.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.48,
'battery_gain': 3},
{'id': '25_phase=6', 'cost': 7695.0, 'gain': 16.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 7695.0, 'raw_cost': 7695.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': True, 'array_size': 3.48,
'battery_gain': 3},
{'id': '26_phase=6', 'cost': 5220.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5220.0, 'raw_cost': 5220.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.8},
{'id': '27_phase=6', 'cost': 6662.0, 'gain': 12.3, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6662.0, 'raw_cost': 6662.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.045},
{'id': '28_phase=6', 'cost': 6095.0, 'gain': 12.3, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6095.0, 'raw_cost': 6095.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 3.05},
{'id': '29_phase=6', 'cost': 5160.0, 'gain': 9.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5160.0, 'raw_cost': 5160.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.4},
{'id': '30_phase=6', 'cost': 6392.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6392.0, 'raw_cost': 6392.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.61},
{'id': '31_phase=6', 'cost': 5910.0, 'gain': 10.2, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5910.0, 'raw_cost': 5910.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.61},
{'id': '32_phase=6', 'cost': 5100.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5100.0, 'raw_cost': 5100.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.0},
{'id': '33_phase=6', 'cost': 6098.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 6098.0, 'raw_cost': 6098.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.175},
{'id': '34_phase=6', 'cost': 5725.0, 'gain': 8.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5725.0, 'raw_cost': 5725.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 2.18},
{'id': '35_phase=6', 'cost': 5040.0, 'gain': 6.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5040.0, 'raw_cost': 5040.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.6},
{'id': '36_phase=6', 'cost': 5828.0, 'gain': 7.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5828.0, 'raw_cost': 5828.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74},
{'id': '37_phase=6', 'cost': 5540.0, 'gain': 7.0, 'type': 'solar_pv', 'innovation_uplift': 0,
'cost_minus_uplift': 5540.0, 'raw_cost': 5540.0, 'partial_project_funding': 0, 'partial_project_score': 0,
'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 1.74}
]
]
def test_just_budget_expecting_case_2_solve_max_gain_under_budget_strategy(self, components):
budget = 10000
target_gain = None
@ -1009,7 +506,7 @@ class TestStrategicOptimiser:
opt.solve()
# Should be case 3 - minimise cost for target gain
# Should be case 2 - minimise cost for target gain
assert opt.strategy_used.value == "case_2_solve_max_gain_under_budget"
assert opt.solution_cost == 7787.068
assert opt.solution_gain == 28.8