junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-08 11:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ensure panel performance meets minimum number of panels in the case of a double roof segment

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-09-24 16:47:21 +01:00
parent 4a216fb423
commit 7236ff2ed2
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend/apis/GoogleSolarApi.py
View file

@ -491,6 +491,7 @@ class GoogleSolarApi:
panel_performance["n_panels"] = panel_performance["n_panels_halved"] panel_performance["n_panels"] = panel_performance["n_panels_halved"]
panel_performance = panel_performance.drop(columns=["n_panels_halved"]) panel_performance = panel_performance.drop(columns=["n_panels_halved"])
panel_performance = panel_performance[panel_performance["n_panels"] >= min_panels]
self.panel_performance = panel_performance self.panel_performance = panel_performance

20
recommendations/WallRecommendations.py
View file

@ -69,6 +69,7 @@ class WallRecommendations(Definitions):
"Timber frame, as built, no insulation": "Timber frame, with external insulation", "Timber frame, as built, no insulation": "Timber frame, with external insulation",
'Timber frame, as built, partial insulation': 'Timber frame, with external insulation', 'Timber frame, as built, partial insulation': 'Timber frame, with external insulation',
"Sandstone or limestone, as built, no insulation": "Sandstone or limestone, with external insulation", "Sandstone or limestone, as built, no insulation": "Sandstone or limestone, with external insulation",
"Sandstone, as built, no insulation": "Sandstone, with external insulation",
} }
# These are the ending descriptions we consider for walls with internal insulation # These are the ending descriptions we consider for walls with internal insulation
@ -83,6 +84,7 @@ class WallRecommendations(Definitions):
"Timber frame, as built, no insulation": "Timber frame, with internal insulation", "Timber frame, as built, no insulation": "Timber frame, with internal insulation",
'Timber frame, as built, partial insulation': 'Timber frame, with internal insulation', 'Timber frame, as built, partial insulation': 'Timber frame, with internal insulation',
"Sandstone or limestone, as built, no insulation": "Sandstone or limestone, with internal insulation", "Sandstone or limestone, as built, no insulation": "Sandstone or limestone, with internal insulation",
"Sandstone, as built, no insulation": "Sandstone, with internal insulation",
} }
def __init__( def __init__(
@ -486,6 +488,10 @@ class WallRecommendations(Definitions):
material=material.to_dict(), material=material.to_dict(),
) )
already_installed = material["type"] in self.property.already_installed
if already_installed:
cost_result = override_costs(cost_result)
if material["type"] == "internal_wall_insulation": if material["type"] == "internal_wall_insulation":
if iwi_non_invasive_recommendations.get("cost") is not None: if iwi_non_invasive_recommendations.get("cost") is not None:
@ -496,13 +502,6 @@ class WallRecommendations(Definitions):
sap_points = iwi_non_invasive_recommendations.get("sap_points", None) sap_points = iwi_non_invasive_recommendations.get("sap_points", None)
survey = iwi_non_invasive_recommendations.get("survey", False) survey = iwi_non_invasive_recommendations.get("survey", False)
already_installed = (
"internal_wall_insulation"
in self.property.already_installed
)
if already_installed:
cost_result = override_costs(cost_result)
new_description = self.get_internal_external_wall_description( new_description = self.get_internal_external_wall_description(
self.INTERNALLY_INSULATED_WALL_DESCRIPTIONS, new_u_value self.INTERNALLY_INSULATED_WALL_DESCRIPTIONS, new_u_value
) )
@ -512,13 +511,6 @@ class WallRecommendations(Definitions):
sap_points = ewi_non_invasive_recommendations.get("sap_points", None) sap_points = ewi_non_invasive_recommendations.get("sap_points", None)
survey = ewi_non_invasive_recommendations.get("survey", False) survey = ewi_non_invasive_recommendations.get("survey", False)
already_installed = (
"external_wall_insulation"
in self.property.already_installed
)
if already_installed:
cost_result = override_costs(cost_result)
new_description = self.get_internal_external_wall_description( new_description = self.get_internal_external_wall_description(
self.EXTERNALLY_INSULATED_WALL_DESCRIPTIONS, new_u_value self.EXTERNALLY_INSULATED_WALL_DESCRIPTIONS, new_u_value
) )