From 115209c84c88291962ebc1c3766e16f49ba8bb50 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Wed, 4 Mar 2026 12:44:25 +0000 Subject: [PATCH] condensed tests --- backend/app/plan/schemas.py | 4 + .../optimiser/funding_optimiser.py | 18 +- .../tests/test_optimiser_functions.py | 430 +++--------------- 3 files changed, 68 insertions(+), 384 deletions(-) diff --git a/backend/app/plan/schemas.py b/backend/app/plan/schemas.py index 7c352eba..0357f5d7 100644 --- a/backend/app/plan/schemas.py +++ b/backend/app/plan/schemas.py @@ -12,6 +12,10 @@ WALL_INSULATION_MEASURES = ["internal_wall_insulation", "external_wall_insulatio ROOF_INSULATION_MEASURES = [ "loft_insulation", "flat_roof_insulation", "room_roof_insulation", "sloping_ceiling_insulation" ] +WALL_INSULATION_WITH_VENTILATION_MEASURES = [ + "internal_wall_insulation+mechanical_ventilation", "external_wall_insulation+mechanical_ventilation", + "cavity_wall_insulation+mechanical_ventilation" +] # Both all and roof insulaiton measures are eligible for ECO4. These are the remaining fabric and heating measures # This is based on th measures we have recommendations for diff --git a/recommendations/optimiser/funding_optimiser.py b/recommendations/optimiser/funding_optimiser.py index 4f1c26bd..a91c05bd 100644 --- a/recommendations/optimiser/funding_optimiser.py +++ b/recommendations/optimiser/funding_optimiser.py @@ -14,10 +14,9 @@ from typing import Mapping, Union from itertools import product from backend.app.plan.schemas import ( - WALL_INSULATION_MEASURES, ROOF_INSULATION_MEASURES, ECO4_ELIGIBILE_FABRIC_MEASURES + WALL_INSULATION_MEASURES, ROOF_INSULATION_MEASURES, ECO4_ELIGIBILE_FABRIC_MEASURES, + WALL_INSULATION_WITH_VENTILATION_MEASURES ) -from recommendations.optimiser.CostOptimiser import CostOptimiser -from recommendations.optimiser.GainOptimiser import GainOptimiser from recommendations.optimiser.StrategicOptimiser import StrategicOptimiser from utils.logger import setup_logger from backend.Funding import Funding @@ -689,10 +688,10 @@ def optimise_with_scenarios( # - Only once the fabric has been upgraded, do we consider heating upgrades # This should be wall insulation, roof insulation, floor insulation and windows - fabric_measures = WALL_INSULATION_MEASURES + ROOF_INSULATION_MEASURES + ECO4_ELIGIBILE_FABRIC_MEASURES + [ - "internal_wall_insulation+mechanical_ventilation", "external_wall_insulation+mechanical_ventilation", - "cavity_wall_insulation+mechanical_ventilation" - ] + fabric_measures = ( + WALL_INSULATION_MEASURES + ROOF_INSULATION_MEASURES + ECO4_ELIGIBILE_FABRIC_MEASURES + + WALL_INSULATION_WITH_VENTILATION_MEASURES + ) fabric_only_measures = [ [opt for opt in group if opt["type"] in fabric_measures] for group in optimisation_measures @@ -754,10 +753,7 @@ def optimise_with_scenarios( if enforce_heat_pump_insulation: # Wall measures could be IWI, EWI or CWI remaining_wall_measures = [ - x for x in all_measure_types if x in WALL_INSULATION_MEASURES + [ - "internal_wall_insulation+mechanical_ventilation", "external_wall_insulation+mechanical_ventilation", - "cavity_wall_insulation+mechanical_ventilation" - ] + x for x in all_measure_types if x in WALL_INSULATION_MEASURES + WALL_INSULATION_WITH_VENTILATION_MEASURES ] remaining_roof_measures = [x for x in all_measure_types if x in ROOF_INSULATION_MEASURES] diff --git a/recommendations/tests/test_optimiser_functions.py b/recommendations/tests/test_optimiser_functions.py index 3c17dfb4..40fa56b6 100644 --- a/recommendations/tests/test_optimiser_functions.py +++ b/recommendations/tests/test_optimiser_functions.py @@ -589,248 +589,29 @@ class TestOptimiseWithScenarios: def test_zero_gain(self, property_instance): input_measures = [ - [{'id': '0_phase=0', 'cost': 16901.01977922431, 'gain': np.float64(2.0), - 'type': 'internal_wall_insulation+mechanical_ventilation', 'innovation_uplift': 0, - 'cost_minus_uplift': 16901.01977922431, 'raw_cost': 16341.019779224309, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 0}], - [{'id': '1_phase=1', 'cost': 1197.0, 'gain': 0, 'type': 'loft_insulation', - 'innovation_uplift': 0, 'cost_minus_uplift': 1197.0, 'raw_cost': 1197.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=1', 'cost': 1026.0, 'gain': 0, 'type': 'loft_insulation', - 'innovation_uplift': 0, 'cost_minus_uplift': 1026.0, 'raw_cost': 1026.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 0}, - {'id': '3_phase=1', 'cost': 855.0, 'gain': 0, 'type': 'loft_insulation', - 'innovation_uplift': 0, 'cost_minus_uplift': 855.0, 'raw_cost': 855.0, - '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': 5343.75, 'gain': 1, 'type': 'suspended_floor_insulation', - 'innovation_uplift': 0, 'cost_minus_uplift': 5343.75, 'raw_cost': 5343.75, - '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': 1009.5600000000001, 'gain': np.float64(0.9000000000000057), - 'type': 'time_temperature_zone_control', 'innovation_uplift': 0, - 'cost_minus_uplift': 1009.5600000000001, 'raw_cost': 1009.5600000000001, - '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': 18979.9, 'gain': np.float64(6.9), 'type': 'air_source_heat_pump', - 'innovation_uplift': 0, 'cost_minus_uplift': 18979.9, 'raw_cost': 18979.9, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 0}], - [{'id': '8_phase=5', 'cost': 5420.0, 'gain': np.float64(9.0), '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': '9_phase=5', 'cost': 6210.0, 'gain': np.float64(9.0), '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}, - {'id': '10_phase=5', 'cost': 6820.0, 'gain': np.float64(9.0), '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}, - {'id': '11_phase=5', 'cost': 7202.0, 'gain': np.float64(10.0), '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': '12_phase=5', 'cost': 6495.0, 'gain': np.float64(10.0), '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': '13_phase=5', 'cost': 7285.0, 'gain': np.float64(10.0), '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}, - {'id': '14_phase=5', 'cost': 7895.0, 'gain': np.float64(10.0), '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}, - {'id': '15_phase=5', 'cost': 5520.0, 'gain': np.float64(10.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': '16_phase=5', 'cost': 6310.0, 'gain': np.float64(10.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}, - {'id': '17_phase=5', 'cost': 6920.0, 'gain': np.float64(10.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}, - {'id': '18_phase=5', 'cost': 5840.0, 'gain': np.float64(13.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 5840.0, 'raw_cost': 5840.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 5.2}, - {'id': '19_phase=5', 'cost': 6630.0, 'gain': np.float64(13.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 6630.0, 'raw_cost': 6630.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 5.2}, - {'id': '20_phase=5', 'cost': 7240.0, 'gain': np.float64(13.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7240.0, 'raw_cost': 7240.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 5.2}, - {'id': '21_phase=5', 'cost': 8630.0, 'gain': np.float64(14.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8630.0, 'raw_cost': 8630.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 5.655}, - {'id': '22_phase=5', 'cost': 7660.0, 'gain': np.float64(14.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7660.0, 'raw_cost': 7660.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 5.66}, - {'id': '23_phase=5', 'cost': 8470.0, 'gain': np.float64(14.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8470.0, 'raw_cost': 8470.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 5.66}, - {'id': '24_phase=5', 'cost': 9090.0, 'gain': np.float64(14.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 9090.0, 'raw_cost': 9090.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 5.66}, - {'id': '25_phase=5', 'cost': 7240.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7240.0, 'raw_cost': 7240.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.79}, - {'id': '26_phase=5', 'cost': 8050.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8050.0, 'raw_cost': 8050.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.79}, - {'id': '27_phase=5', 'cost': 8660.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8660.0, 'raw_cost': 8660.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.79}, - {'id': '28_phase=5', 'cost': 5740.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 5740.0, 'raw_cost': 5740.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.8}, - {'id': '29_phase=5', 'cost': 6530.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 6530.0, 'raw_cost': 6530.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.8}, - {'id': '30_phase=5', 'cost': 7140.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7140.0, 'raw_cost': 7140.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.8}, - {'id': '31_phase=5', 'cost': 8360.0, 'gain': np.float64(13.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8360.0, 'raw_cost': 8360.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 5.22}, - {'id': '32_phase=5', 'cost': 7470.0, 'gain': np.float64(13.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7470.0, 'raw_cost': 7470.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 5.22}, - {'id': '33_phase=5', 'cost': 8280.0, 'gain': np.float64(13.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8280.0, 'raw_cost': 8280.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 5.22}, - {'id': '34_phase=5', 'cost': 8890.0, 'gain': np.float64(13.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8890.0, 'raw_cost': 8890.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 5.22}, - {'id': '35_phase=5', 'cost': 5892.21, 'gain': np.float64(13.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 5892.21, 'raw_cost': 5892.21, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 5.34}, - {'id': '36_phase=5', 'cost': 5320.0, 'gain': np.float64(8.0), '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': '37_phase=5', 'cost': 6110.0, 'gain': np.float64(8.0), '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}, - {'id': '38_phase=5', 'cost': 6720.0, 'gain': np.float64(8.0), '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}, - {'id': '39_phase=5', 'cost': 6932.0, 'gain': np.float64(9.0), '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': '40_phase=5', 'cost': 6295.0, 'gain': np.float64(9.0), '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': '41_phase=5', 'cost': 7085.0, 'gain': np.float64(9.0), '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}, - {'id': '42_phase=5', 'cost': 7695.0, 'gain': np.float64(9.0), '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}, - {'id': '43_phase=5', 'cost': 5640.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 5640.0, 'raw_cost': 5640.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.4}, - {'id': '44_phase=5', 'cost': 6430.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 6430.0, 'raw_cost': 6430.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.4}, - {'id': '45_phase=5', 'cost': 7040.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7040.0, 'raw_cost': 7040.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.4}, - {'id': '46_phase=5', 'cost': 8090.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8090.0, 'raw_cost': 8090.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.785}, - {'id': '47_phase=5', 'cost': 7240.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7240.0, 'raw_cost': 7240.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.79}, - {'id': '48_phase=5', 'cost': 8050.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8050.0, 'raw_cost': 8050.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.79}, - {'id': '49_phase=5', 'cost': 8660.0, 'gain': np.float64(12.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8660.0, 'raw_cost': 8660.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.79}, - {'id': '50_phase=5', 'cost': 5520.0, 'gain': np.float64(10.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': '51_phase=5', 'cost': 6310.0, 'gain': np.float64(10.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}, - {'id': '52_phase=5', 'cost': 6920.0, 'gain': np.float64(10.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}, - {'id': '53_phase=5', 'cost': 7820.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7820.0, 'raw_cost': 7820.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.35}, - {'id': '54_phase=5', 'cost': 6675.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 6675.0, 'raw_cost': 6675.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.35}, - {'id': '55_phase=5', 'cost': 7485.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7485.0, 'raw_cost': 7485.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.35}, - {'id': '56_phase=5', 'cost': 8095.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 8095.0, 'raw_cost': 8095.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.35}, - {'id': '57_phase=5', 'cost': 5640.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 5640.0, 'raw_cost': 5640.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.4}, - {'id': '58_phase=5', 'cost': 6430.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 6430.0, 'raw_cost': 6430.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.4}, - {'id': '59_phase=5', 'cost': 7040.0, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 7040.0, 'raw_cost': 7040.0, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': True, 'array_size': 4.4}, - {'id': '60_phase=5', 'cost': 5692.21, 'gain': np.float64(11.0), 'type': 'solar_pv', - 'innovation_uplift': 0, 'cost_minus_uplift': 5692.21, 'raw_cost': 5692.21, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 4.45}]] + [ + {'already_installed': False, 'id': '0_phase=0', + 'type': 'internal_wall_insulation+mechanical_ventilation', + 'gain': np.float64(2.0), 'cost': 16901.01977922431} + ], + [ + {'already_installed': False, 'id': '1_phase=1', 'type': 'loft_insulation', 'gain': 0, 'cost': 1197.0}, + ], + [ + {'already_installed': False, 'id': '5_phase=3', 'type': 'suspended_floor_insulation', 'gain': 1, + 'cost': 5343.75}], + [ + {'already_installed': False, 'id': '6_phase=4', 'type': 'time_temperature_zone_control', + 'gain': np.float64(0.9000000000000057), 'cost': 1009.5600000000001}, + {'already_installed': False, 'id': '7_phase=4', 'type': 'air_source_heat_pump', 'gain': np.float64(6.9), + 'cost': 18979.9}], + [ + {'already_installed': False, 'id': '8_phase=5', 'type': 'solar_pv', 'gain': np.float64(9.0), + 'cost': 5420.0, "has_battery": False}, + {'already_installed': False, 'id': '9_phase=5', 'type': 'solar_pv', 'gain': np.float64(9.0), + 'cost': 6210.0, "has_battery": False}, + ] + ] solutions = optimise_with_scenarios( p=property_instance, @@ -846,137 +627,40 @@ class TestOptimiseWithScenarios: def test_ashp_needing_cwi_first(self, property_instance): input_measures = [ - [{'id': '0_phase=0', 'cost': 1653.5495595376553, 'gain': 1, - 'type': 'cavity_wall_insulation+mechanical_ventilation', 'innovation_uplift': 0, - 'cost_minus_uplift': 1653.5495595376553, 'raw_cost': 1093.5495595376553, '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': 1535.3279855335845, 'gain': 1, - 'type': 'cavity_wall_insulation+mechanical_ventilation', 'innovation_uplift': 0, - 'cost_minus_uplift': 1535.3279855335845, 'raw_cost': 975.3279855335845, - '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': 1801.326527042744, 'gain': 1, - 'type': 'cavity_wall_insulation+mechanical_ventilation', 'innovation_uplift': 0, - 'cost_minus_uplift': 1801.326527042744, 'raw_cost': 1241.326527042744, 'partial_project_funding': 0, - 'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, - 'array_size': 0}, - {'id': '3_phase=0', 'cost': 1505.7725920325668, 'gain': 1, - 'type': 'cavity_wall_insulation+mechanical_ventilation', 'innovation_uplift': 0, - 'cost_minus_uplift': 1505.7725920325668, 'raw_cost': 945.7725920325668, - 'partial_project_funding': 0, 'partial_project_score': 0, 'uplift_project_score': 0, - 'already_installed': False, 'has_battery': False, 'array_size': 0}], - [{'id': '4_phase=1', 'cost': 766.5, 'gain': 0, 'type': 'loft_insulation', 'innovation_uplift': 0, - 'cost_minus_uplift': 766.5, 'raw_cost': 766.5, 'partial_project_funding': 0, 'partial_project_score': 0, - 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}, - {'id': '5_phase=1', 'cost': 657.0, 'gain': 0, 'type': 'loft_insulation', 'innovation_uplift': 0, - 'cost_minus_uplift': 657.0, 'raw_cost': 657.0, 'partial_project_funding': 0, 'partial_project_score': 0, - 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}, - {'id': '6_phase=1', 'cost': 547.5, 'gain': 0, 'type': 'loft_insulation', 'innovation_uplift': 0, - 'cost_minus_uplift': 547.5, 'raw_cost': 547.5, 'partial_project_funding': 0, 'partial_project_score': 0, - 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}], - [{'id': '8_phase=3', 'cost': 7.0, 'gain': 0, 'type': 'low_energy_lighting', 'innovation_uplift': 0, - 'cost_minus_uplift': 7.0, 'raw_cost': 7.0, 'partial_project_funding': 0, 'partial_project_score': 0, - 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}], - [{'id': '9_phase=4', 'cost': 1009.5600000000001, 'gain': np.float64(0.3), - 'type': 'time_temperature_zone_control', 'innovation_uplift': 0, 'cost_minus_uplift': 1009.5600000000001, - 'raw_cost': 1009.5600000000001, 'partial_project_funding': 0, 'partial_project_score': 0, - 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, 'array_size': 0}, - {'id': '10_phase=4', 'cost': 18979.9, 'gain': np.float64(7.5), 'type': 'air_source_heat_pump', - 'innovation_uplift': 0, 'cost_minus_uplift': 18979.9, 'raw_cost': 18979.9, 'partial_project_funding': 0, - 'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, - 'array_size': 0}], - [{'id': '11_phase=5', 'cost': 150.0, 'gain': np.float64(3.3), 'type': 'secondary_heating', - 'innovation_uplift': 0, 'cost_minus_uplift': 150.0, 'raw_cost': 150.0, 'partial_project_funding': 0, - 'partial_project_score': 0, 'uplift_project_score': 0, 'already_installed': False, 'has_battery': False, - 'array_size': 0}], - [{'id': '12_phase=6', 'cost': 5420.0, 'gain': np.float64(15.4), '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': '13_phase=6', 'cost': 6210.0, 'gain': np.float64(15.4), '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}, - {'id': '14_phase=6', 'cost': 6820.0, 'gain': np.float64(15.4), '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}, - {'id': '15_phase=6', 'cost': 7202.0, 'gain': np.float64(15.9), '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': '16_phase=6', 'cost': 6495.0, 'gain': np.float64(15.9), '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': '17_phase=6', 'cost': 7285.0, 'gain': np.float64(15.9), '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}, - {'id': '18_phase=6', 'cost': 7895.0, 'gain': np.float64(15.9), '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}, - {'id': '19_phase=6', 'cost': 5520.0, 'gain': np.float64(16.7), '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': '20_phase=6', 'cost': 6310.0, 'gain': np.float64(16.7), '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}, - {'id': '21_phase=6', 'cost': 6920.0, 'gain': np.float64(16.7), '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}, - {'id': '22_phase=6', 'cost': 5320.0, 'gain': np.float64(13.6), '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': '23_phase=6', 'cost': 6110.0, 'gain': np.float64(13.6), '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}, - {'id': '24_phase=6', 'cost': 6720.0, 'gain': np.float64(13.6), '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}, - {'id': '25_phase=6', 'cost': 6932.0, 'gain': np.float64(15.4), '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': '26_phase=6', 'cost': 6295.0, 'gain': np.float64(15.4), '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': '27_phase=6', 'cost': 7085.0, 'gain': np.float64(15.4), '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}, - {'id': '28_phase=6', 'cost': 7695.0, 'gain': np.float64(15.4), '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}, - {'id': '29_phase=6', 'cost': 5220.0, 'gain': np.float64(12.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': '30_phase=6', 'cost': 6662.0, 'gain': np.float64(12.8), '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': '31_phase=6', 'cost': 6095.0, 'gain': np.float64(12.8), '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': '32_phase=6', 'cost': 5160.0, 'gain': np.float64(10.1), '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': '33_phase=6', 'cost': 6392.0, 'gain': np.float64(10.1), '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': '34_phase=6', 'cost': 5910.0, 'gain': np.float64(10.1), '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': '35_phase=6', 'cost': 5100.0, 'gain': np.float64(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': '36_phase=6', 'cost': 6098.0, 'gain': np.float64(9.1), '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': '37_phase=6', 'cost': 5725.0, 'gain': np.float64(9.1), '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': '38_phase=6', 'cost': 5040.0, 'gain': np.float64(7.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': '39_phase=6', 'cost': 5828.0, 'gain': np.float64(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': '40_phase=6', 'cost': 5540.0, 'gain': np.float64(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}] + [ + {'id': '0_phase=0', 'cost': 1653.5495595376553, 'gain': 1, + 'type': 'cavity_wall_insulation+mechanical_ventilation', 'already_installed': False}, + {'id': '1_phase=0', 'cost': 1535.3279855335845, 'gain': 1, + 'type': 'cavity_wall_insulation+mechanical_ventilation', 'already_installed': False}, + {'id': '2_phase=0', 'cost': 1801.326527042744, 'gain': 1, + 'type': 'cavity_wall_insulation+mechanical_ventilation', 'already_installed': False}, + {'id': '3_phase=0', 'cost': 1505.7725920325668, 'gain': 1, + 'type': 'cavity_wall_insulation+mechanical_ventilation', 'already_installed': False} + ], + [ + {'id': '4_phase=1', 'cost': 766.5, 'gain': 0, 'type': 'loft_insulation', 'already_installed': False}, + {'id': '5_phase=1', 'cost': 657.0, 'gain': 0, 'type': 'loft_insulation', 'already_installed': False}, + {'id': '6_phase=1', 'cost': 547.5, 'gain': 0, 'type': 'loft_insulation', 'already_installed': False} + ], + [ + {'id': '8_phase=3', 'cost': 7.0, 'gain': 0, 'type': 'low_energy_lighting', 'already_installed': False} + ], + [ + {'id': '9_phase=4', 'cost': 1009.5600000000001, 'gain': np.float64(0.3), + 'type': 'time_temperature_zone_control', 'already_installed': False}, + {'id': '10_phase=4', 'cost': 18979.9, 'gain': np.float64(7.5), 'type': 'air_source_heat_pump', + 'already_installed': False} + ], + [ + {'id': '11_phase=5', 'cost': 150.0, 'gain': np.float64(3.3), 'type': 'secondary_heating', + 'already_installed': False} + ], + [ + {'id': '12_phase=6', 'cost': 5420.0, 'gain': np.float64(15.4), 'type': 'solar_pv', + 'already_installed': False, "has_battery": False}, + {'id': '13_phase=6', 'cost': 6210.0, 'gain': np.float64(15.4), 'type': 'solar_pv', + 'already_installed': False, "has_battery": False} + ] ] solutions = optimise_with_scenarios(