junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-30 13:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated scenario data

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-10-08 15:07:04 +01:00
parent e1593445ac
commit ab05082829
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
etl/epc/generate_scenarios_data.py
View file

@ -79,8 +79,8 @@ scenario_properties = [
"measures": [ "measures": [
[ [
["cavity_wall_insulation", "loft_insulation"], ["cavity_wall_insulation", "loft_insulation"],
"15", "11",
{"walls_insulation_thickness_ending": "average"}, {},
[0, 1], [0, 1],
], ],
], ],
@ -92,8 +92,8 @@ scenario_properties = [
"measures": [ "measures": [
[ [
["cavity_wall_insulation", "loft_insulation"], ["cavity_wall_insulation", "loft_insulation"],
"15", "10",
{"walls_insulation_thickness_ending": "average"}, {},
[0, 1], [0, 1],
], ],
], ],
@ -105,8 +105,8 @@ scenario_properties = [
"measures": [ "measures": [
[ [
["cavity_wall_insulation", "loft_insulation"], ["cavity_wall_insulation", "loft_insulation"],
"15", "11",
{"walls_insulation_thickness_ending": "average"}, {},
[0, 1], [0, 1],
], ],
], ],
@ -118,8 +118,8 @@ scenario_properties = [
"measures": [ "measures": [
[ [
["cavity_wall_insulation", "loft_insulation"], ["cavity_wall_insulation", "loft_insulation"],
"15", "10",
{"walls_insulation_thickness_ending": "average"}, {},
[0, 1], [0, 1],
], ],
], ],
@ -289,7 +289,7 @@ all_predictions = model_api.predict_all(df=recommendations_scoring_data, bucket=
sap_impact = pd.concat( sap_impact = pd.concat(
[ [
all_predictions["sap_change_predictions"], all_predictions["sap_change_predictions"],
recommendations_scoring_data[["uprn", "sap_starting"]], recommendations_scoring_data[["uprn", "sap_starting", "impact"]],
], ],
axis=1 axis=1
) )

6
recommendations/RoofRecommendations.py
View file

@ -307,7 +307,9 @@ class RoofRecommendations:
cost_result = override_costs(cost_result) cost_result = override_costs(cost_result)
if material["type"] == "loft_insulation": 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 # This is based on the values we have in the training data
valid_numeric_values = [ valid_numeric_values = [
@ -332,7 +334,7 @@ class RoofRecommendations:
valid_numeric_values, key=lambda x: abs(x - proposed_depth) valid_numeric_values, key=lambda x: abs(x - proposed_depth)
) )
if proposed_depth >= 270: if proposed_depth >= 300:
new_efficiency = "Very Good" new_efficiency = "Very Good"
else: else:
if self.property.data["walls-energy-eff"] not in ["Good", "Very Good"]: if self.property.data["walls-energy-eff"] not in ["Good", "Very Good"]: