diff --git a/etl/epc/generate_scenarios_data.py b/etl/epc/generate_scenarios_data.py index 15661d99..d4833baa 100644 --- a/etl/epc/generate_scenarios_data.py +++ b/etl/epc/generate_scenarios_data.py @@ -79,8 +79,8 @@ scenario_properties = [ "measures": [ [ ["cavity_wall_insulation", "loft_insulation"], - "15", - {"walls_insulation_thickness_ending": "average"}, + "11", + {}, [0, 1], ], ], @@ -92,8 +92,8 @@ scenario_properties = [ "measures": [ [ ["cavity_wall_insulation", "loft_insulation"], - "15", - {"walls_insulation_thickness_ending": "average"}, + "10", + {}, [0, 1], ], ], @@ -105,8 +105,8 @@ scenario_properties = [ "measures": [ [ ["cavity_wall_insulation", "loft_insulation"], - "15", - {"walls_insulation_thickness_ending": "average"}, + "11", + {}, [0, 1], ], ], @@ -118,8 +118,8 @@ scenario_properties = [ "measures": [ [ ["cavity_wall_insulation", "loft_insulation"], - "15", - {"walls_insulation_thickness_ending": "average"}, + "10", + {}, [0, 1], ], ], @@ -289,7 +289,7 @@ all_predictions = model_api.predict_all(df=recommendations_scoring_data, bucket= sap_impact = pd.concat( [ all_predictions["sap_change_predictions"], - recommendations_scoring_data[["uprn", "sap_starting"]], + recommendations_scoring_data[["uprn", "sap_starting", "impact"]], ], axis=1 ) diff --git a/recommendations/RoofRecommendations.py b/recommendations/RoofRecommendations.py index e8a43db0..c86c5b30 100644 --- a/recommendations/RoofRecommendations.py +++ b/recommendations/RoofRecommendations.py @@ -307,7 +307,9 @@ class RoofRecommendations: cost_result = override_costs(cost_result) if material["type"] == "loft_insulation": - new_thickness = insulation_thickness + material["depth"] + # We take the new thickness as just the thickness of the insulation, to be conservative + # and assume that any existing insulation will be replaced + new_thickness = material["depth"] # This is based on the values we have in the training data valid_numeric_values = [ @@ -332,7 +334,7 @@ class RoofRecommendations: valid_numeric_values, key=lambda x: abs(x - proposed_depth) ) - if proposed_depth >= 270: + if proposed_depth >= 300: new_efficiency = "Very Good" else: if self.property.data["walls-energy-eff"] not in ["Good", "Very Good"]: