diff --git a/recommendations/HeatingRecommender.py b/recommendations/HeatingRecommender.py index 92350738..03415d9c 100644 --- a/recommendations/HeatingRecommender.py +++ b/recommendations/HeatingRecommender.py @@ -238,28 +238,31 @@ class HeatingRecommender: description = description + (f" The cost includes the £" f"{BOILER_UPGRADE_SCHEME_ASHP_VALUE} boiler upgrade scheme grant") + new_heating_description = "Air source heat pump, radiators, electric" + new_hot_water_description = "From main system" simulation_config = { "mainheat_energy_eff_ending": "Good", "hot_water_energy_eff_ending": "Good" } description_simulation = { - "mainheat-description": "Air source heat pump, radiators, electric", - "mainheat-energy-eff": "Good", - "hot-water-energy-eff": "Good", - "hotwater-description": "From main system", + "mainheat-description": new_heating_description, + "mainheat-energy-eff": simulation_config["mainheat_energy_eff_ending"], + "hot-water-energy-eff": simulation_config["hot_water_energy_eff_ending"], + "hotwater-description": new_hot_water_description, } # Installation of a boiler improves the hot water system so we need to reflect this in # the outcome of the recommendation - heating_ending_config = MainHeatAttributes("Air source heat pump, radiators, electric").process() - hotwater_ending_config = HotWaterAttributes("From main system").process() + heating_ending_config = MainHeatAttributes(new_heating_description).process() + hotwater_ending_config = HotWaterAttributes(new_hot_water_description).process() # If the property does not currently have electric main fuel, we'll simulate the change fuel_ending_config = {} if self.property.main_fuel["fuel_type"] != "electricity": - fuel_ending_config = MainFuelAttributes("electricity (not community)").process() + new_fuel_description = "electricity (not community)" + fuel_ending_config = MainFuelAttributes(new_fuel_description).process() description_simulation = { **description_simulation, - "main-fuel": "electricity (not community)" + "main-fuel": new_fuel_description } # Check the simulation differences @@ -292,8 +295,7 @@ class HeatingRecommender: description_simulation = { **description_simulation, - "mainheatcont-description": "time and temperature zone control", - "mainheatc-energy-eff": "Very Good" + **controls_recommender.recommendation[0]["description_simulation"] } ashp_recommendation = {