diff --git a/backend/Property.py b/backend/Property.py index 19f15b02..d3dd8395 100644 --- a/backend/Property.py +++ b/backend/Property.py @@ -298,11 +298,6 @@ class Property: if recommendation["type"] == "cavity_wall_insulation": output["is_filled_cavity_ending"] = True - # TODO: perhaps detrimental - # When making a recommendation for the wall, we will also update the ventilation - # if output["mechanical_ventilation_ending"] == 'natural': - # output["mechanical_ventilation_ending"] = 'mechanical, extract only' - else: if output["walls_thermal_transmittance_ending"] is None: raise ValueError("We should not have a None value for the u value") diff --git a/etl/customers/gla_croydon_demo/asset_list.py b/etl/customers/gla_croydon_demo/asset_list.py index 777cba83..7dde8926 100644 --- a/etl/customers/gla_croydon_demo/asset_list.py +++ b/etl/customers/gla_croydon_demo/asset_list.py @@ -34,8 +34,7 @@ def app(): low_memory=False ) - z = epc_data.groupby(["MAINHEAT_DESCRIPTION", "MAINHEATCONT_DESCRIPTION", "MAIN_FUEL"]).size().reset_index( - name="count") + z = epc_data.groupby(["WALLS_DESCRIPTION", "WALLS_ENERGY_EFF"]).size().reset_index(name="count") z = z[z["MAINHEAT_DESCRIPTION"] == "Boiler and radiators, mains gas"] # Filter on entries where we have a UPRN diff --git a/recommendations/HeatingRecommender.py b/recommendations/HeatingRecommender.py index f602ecab..aec1f419 100644 --- a/recommendations/HeatingRecommender.py +++ b/recommendations/HeatingRecommender.py @@ -104,8 +104,13 @@ class HeatingRecommender: **recommendation_simulation_config, **controls_recommendations[0]["simulation_config"] } + controls_description = controls_recommendations[0]['description'] + # Make the first letter of the description lowercase + controls_description = ( + controls_description[0].lower() + controls_description[1:] + ) - recommendation_description = f"{description} and {controls_recommendations[0]['description']}" + recommendation_description = f"{description} and {controls_description}" recommendation = { "phase": phase, diff --git a/recommendations/HotwaterRecommendations.py b/recommendations/HotwaterRecommendations.py index 667f5f69..7f77597f 100644 --- a/recommendations/HotwaterRecommendations.py +++ b/recommendations/HotwaterRecommendations.py @@ -22,8 +22,9 @@ class HotwaterRecommendations: # This first iteration of the recommender will provide very basic recommendation # We recommend heating controls based on the main heating system - # If there is not system present, we do not recommend anything, since we will have a separate recommendation - # suggesting system upgrades (e.g. boiler replacement) + + # If there is no system present, but access to the mains, we + if ( (self.property.hotwater["heater_type"] in ["electric immersion"]) & (self.property.data["hot-water-energy-eff"] == "Very Poor") &