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

Added cleaning data pull to property class

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2023-10-09 13:26:31 +08:00
parent dbf5f63e44
commit 0b12e59d7f
5 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
backend/Property.py
View file

@ -49,6 +49,7 @@ class Property(Definitions):
self.address1 = address1
self.data = data
self.old_data = None
self.property_dimensions = None
self.uprn = None
self.full_sap_epc = None
@ -490,6 +491,23 @@ class Property(Definitions):
# Pull out spatial features
self.set_spatial(spatial)
def _filter_property_dimensions(self, property_dimensions):
"""
Will filter the property dimensions dataframe to only include the relevant rows for the property
:param property_dimensions:
:return: filtered property dimensions dataframe
"""
result = property_dimensions[(property_dimensions["PROPERTY_TYPE"] == self.data["property-type"])]
if self.age_band:
result = result[(result["CONSTRUCTION_AGE_BAND"] == self.age_band)]
if self.data["built-form"] not in self.DATA_ANOMALY_MATCHES:
result = result[(result["BUILT_FORM"] == self.data["built-form"])]
return result[["NUMBER_HABITABLE_ROOMS", "TOTAL_FLOOR_AREA"]].mean()
def set_basic_property_dimensions(self):
"""
This method sets the number of floors of the property, using a simple approach based on an estimate for
@ -505,23 +523,33 @@ class Property(Definitions):
self.floor_area = float(self.data["total-floor-area"])
number_of_rooms = float(self.data["number-habitable-rooms"])
if not self.data["number-habitable-rooms"] or (
self.data["floor-height"] == "" or self.data["floor-height"] in self.DATA_ANOMALY_MATCHES
):
property_dimensions = read_dataframe_from_s3_parquet(
bucket_name=DATA_BUCKET, file_key=f"property_dimensions/{self.data['local-authority']}.parquet"
)
self.property_dimensions = self._filter_property_dimensions(property_dimensions)
if not self.data["number-habitable-rooms"]:
self.number_of_rooms = float(self.property_dimensions["NUMBER_HABITABLE_ROOMS"].round())
else:
self.number_of_rooms = float(self.data["number-habitable-rooms"])
if self.data["property-type"] == "House":
self.number_of_floors = estimate_floors(self.floor_area, number_of_rooms)
self.number_of_floors = estimate_floors(self.floor_area, self.number_of_rooms)
elif self.data["property-type"] == "Flat":
self.number_of_floors = 1
else:
raise NotImplementedError("Implement me")
if self.data["floor-height"] == "" or self.data["floor-height"] in self.DATA_ANOMALY_MATCHES:
self.floor_height = 2.3
print("This is where we should fill with cleaned data")
self.floor_height = float(self.property_dimensions["FLOOR_HEIGHT"].round())
else:
self.floor_height = float(self.data["floor-height"])
self.perimeter = estimate_perimeter(
self.floor_area / self.number_of_floors, number_of_rooms / self.number_of_floors
self.floor_area / self.number_of_floors, self.number_of_rooms / self.number_of_floors
)
self.insulation_wall_area = estimate_wall_area(

1
backend/app/db/models/materials.py
View file

@ -12,6 +12,7 @@ class MaterialType(enum.Enum):
solid_floor_insulation = "solid_floor_insulation"
external_wall_insulation = "external_wall_insulation"
internal_wall_insulation = "internal_wall_insulation"
cavity_wall_insulation = "cavity_wall_insulation"
class DepthUnit(enum.Enum):

12
backend/app/plan/router.py
View file

@ -97,18 +97,6 @@ async def trigger_plan(body: PlanTriggerRequest):
if not input_properties:
return Response(status_code=204)
local_property_data = []
for p in input_properties:
local_property_data.append(
{
"id": p.id,
"uprn": p.uprn,
"data": p.data,
"full_sap_epc": p.full_sap_epc,
"old_data": p.old_data,
}
)
logger.info("Getting EPC, and spatial data")
for p in input_properties:
p.search_address_epc()

4
etl/property_dimensions/app.py
View file

@ -33,10 +33,12 @@ def app():
data = data[~pd.isnull(data["CONSTRUCTION_AGE_BAND"])]
data = data[~data["CONSTRUCTION_AGE_BAND"].isin(Definitions.DATA_ANOMALY_MATCHES)]
data = data[~pd.isnull(data["TOTAL_FLOOR_AREA"])]
data = data[~pd.isnull(data["NUMBER_HABITABLE_ROOMS"])]
data = data[~pd.isnull(data["FLOOR_HEIGHT"])]
df = (
data.groupby(GROUPBY)
.agg({"NUMBER_HABITABLE_ROOMS": "median", "TOTAL_FLOOR_AREA": "mean"})
.agg({"NUMBER_HABITABLE_ROOMS": "median", "TOTAL_FLOOR_AREA": "mean", "FLOOR_HEIGHT": "mean"})
.reset_index()
)

12
recommendations/WallRecommendations.py
View file

@ -137,8 +137,12 @@ class WallRecommendations(Definitions):
Width of a cavity:
There are various sources online that suggest the width of a cavity wall is around 50mm. The retrofit course
indicates that most cavities are 50-75mm. Many sources online indicate that 50mm is the standard figure
therefore we'll use 50mm as the base assumption
indicates that most cavities are 50-75mm. Many sources online indicate that 50mm is the standard MINIMUM figure
therefore we'll use 75mm as the base assumption
This document:
https://www.buildingcentre.co.uk/media/_file/pdf/22220_pdf27.pdf
Indicates that they could be 50-85mm wide
:param u_value: u_value of the starting wall
:param insulation_thickness: describes the insulation level of the wall. If "below average", we have a partially
@ -146,9 +150,9 @@ class WallRecommendations(Definitions):
"""
cavity_wall_fills = [m for m in self.materials if m["type"] == "cavity_wall_insulation"]
cavity_width = 50
cavity_width = 75
if insulation_thickness == "below average":
cavity_width = 50 * (1 - PARTIALLY_FILLED_PERCENTAGE_ASSUMPTION)
cavity_width = cavity_width * (1 - PARTIALLY_FILLED_PERCENTAGE_ASSUMPTION)
# Test the different fill options
lowest_selected_u_value = None