mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-06-08 11:17:27 +00:00
added fabric first test
This commit is contained in:
Khalim Conn-Kowlessar
parent
7709ec0de8
commit
1ac3128929
2 changed files with 151 additions and 1 deletions
|
|
@ -165,7 +165,6 @@ class StrategicOptimiser:
|
|||
min_gain=self.target_gain,
|
||||
verbose=self.verbose
|
||||
)
|
||||
|
||||
opt.setup()
|
||||
opt.solve()
|
||||
|
||||
|
|
|
|||
|
|
@ -998,3 +998,154 @@ class TestOptimiseWithScenarios:
|
|||
# All results should include loft & CWI
|
||||
assert "loft_insulation" in res
|
||||
assert "cavity_wall_insulation+mechanical_ventilation" in res
|
||||
|
||||
def test_fabric_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': 1, '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': 1, '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': 1, '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': 1, '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}]
|
||||
]
|
||||
|
||||
solutions = optimise_with_scenarios(
|
||||
p=property_instance,
|
||||
input_measures=input_measures,
|
||||
budget=None,
|
||||
target_gain=7.5,
|
||||
enforce_heat_pump_insulation=True,
|
||||
enforce_fabric_first=True,
|
||||
already_installed_sap=0, # To be passed to output
|
||||
)
|
||||
|
||||
assert solutions.shape[0] == 1
|
||||
items = solutions["items"].values[0]
|
||||
types = [x["type"] for x in items]
|
||||
|
||||
assert types == ['cavity_wall_insulation+mechanical_ventilation', 'loft_insulation', 'solar_pv']
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue