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

Added missing floor heights

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2025-05-15 17:03:15 +01:00
parent b0f75b5e5b
commit 2838beaa8a
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/engine/engine.py
View file

@ -528,7 +528,7 @@ async def model_engine(body: PlanTriggerRequest):
prepared_epc = EPCRecord( prepared_epc = EPCRecord(
epc_records=epc_records, epc_records=epc_records,
run_mode="newdata", run_mode="newdata",
cleaning_data=cleaning_data cleaning_data=cleaning_data,
) )
input_properties.append( input_properties.append(

2
etl/epc/Record.py
View file

@ -531,6 +531,8 @@ class EPCRecord:
or (self.prepared_epc["floor-height"] in DATA_ANOMALY_MATCHES) or (self.prepared_epc["floor-height"] in DATA_ANOMALY_MATCHES)
or (self.prepared_epc["number-heated-rooms"] in DATA_ANOMALY_MATCHES) or (self.prepared_epc["number-heated-rooms"] in DATA_ANOMALY_MATCHES)
): ):
# TODO - this probably shouldn't live here - but we only need to use this for specific properties
# when we meet this condition
property_dimensions = read_dataframe_from_s3_parquet( property_dimensions = read_dataframe_from_s3_parquet(
bucket_name=DATA_BUCKET, bucket_name=DATA_BUCKET,
file_key=f"property_dimensions/{self.prepared_epc['local-authority']}.parquet", file_key=f"property_dimensions/{self.prepared_epc['local-authority']}.parquet",

12
recommendations/tests/test_data/heating_recommendations_data.py
View file

@ -823,7 +823,7 @@ testing_examples = [
'mainheatc-energy-eff': 'Very Poor', 'mainheatc-env-eff': 'Very Poor', 'mainheatc-energy-eff': 'Very Poor', 'mainheatc-env-eff': 'Very Poor',
'lighting-description': 'Low energy lighting in all fixed outlets', 'lighting-energy-eff': 'Very Good', 'lighting-description': 'Low energy lighting in all fixed outlets', 'lighting-energy-eff': 'Very Good',
'lighting-env-eff': 'Very Good', 'main-fuel': 'smokeless coal', 'wind-turbine-count': 0, 'lighting-env-eff': 'Very Good', 'main-fuel': 'smokeless coal', 'wind-turbine-count': 0,
'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'floor-height': None, 'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'floor-height': 2.4,
'photo-supply': None, 'photo-supply': None,
'solar-water-heating-flag': 'N', 'mechanical-ventilation': 'natural', 'address': '1 Green Gates, Bridstow', 'solar-water-heating-flag': 'N', 'mechanical-ventilation': 'natural', 'address': '1 Green Gates, Bridstow',
'local-authority-label': 'Herefordshire, County of', 'local-authority-label': 'Herefordshire, County of',
@ -869,7 +869,7 @@ testing_examples = [
'mainheatc-energy-eff': 'Average', 'mainheatc-env-eff': 'Average', 'mainheatc-energy-eff': 'Average', 'mainheatc-env-eff': 'Average',
'lighting-description': 'Low energy lighting in 23% of fixed outlets', 'lighting-energy-eff': 'Poor', 'lighting-description': 'Low energy lighting in 23% of fixed outlets', 'lighting-energy-eff': 'Poor',
'lighting-env-eff': 'Poor', 'main-fuel': 'bulk wood pellets', 'wind-turbine-count': 0, 'lighting-env-eff': 'Poor', 'main-fuel': 'bulk wood pellets', 'wind-turbine-count': 0,
'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'floor-height': None, 'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'floor-height': 2.4,
'photo-supply': None, 'photo-supply': None,
'solar-water-heating-flag': 'N', 'mechanical-ventilation': 'natural', 'address': '143, Shortheath', 'solar-water-heating-flag': 'N', 'mechanical-ventilation': 'natural', 'address': '143, Shortheath',
'local-authority-label': 'South Derbyshire', 'constituency-label': 'South Derbyshire', 'local-authority-label': 'South Derbyshire', 'constituency-label': 'South Derbyshire',
@ -916,7 +916,7 @@ testing_examples = [
'mainheatc-env-eff': 'Poor', 'lighting-description': 'Low energy lighting in 50% of fixed outlets', 'mainheatc-env-eff': 'Poor', 'lighting-description': 'Low energy lighting in 50% of fixed outlets',
'lighting-energy-eff': 'Good', 'lighting-env-eff': 'Good', 'main-fuel': 'dual fuel - mineral + wood', 'lighting-energy-eff': 'Good', 'lighting-env-eff': 'Good', 'main-fuel': 'dual fuel - mineral + wood',
'wind-turbine-count': 0, 'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'wind-turbine-count': 0, 'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None,
'floor-height': None, 'photo-supply': None, 'solar-water-heating-flag': 'N', 'floor-height': 2.5, 'photo-supply': None, 'solar-water-heating-flag': 'N',
'mechanical-ventilation': 'natural', 'address': '3 Manor Farm Cottage, Halse', 'mechanical-ventilation': 'natural', 'address': '3 Manor Farm Cottage, Halse',
'local-authority-label': 'South Northamptonshire', 'constituency-label': 'South Northamptonshire', 'local-authority-label': 'South Northamptonshire', 'constituency-label': 'South Northamptonshire',
'posttown': 'BRACKLEY', 'construction-age-band': 'England and Wales: before 1900', 'posttown': 'BRACKLEY', 'construction-age-band': 'England and Wales: before 1900',
@ -960,7 +960,7 @@ testing_examples = [
'mainheatc-env-eff': 'Average', 'lighting-description': 'Low energy lighting in 18% of fixed outlets', 'mainheatc-env-eff': 'Average', 'lighting-description': 'Low energy lighting in 18% of fixed outlets',
'lighting-energy-eff': 'Poor', 'lighting-env-eff': 'Poor', 'main-fuel': 'electricity (not community)', 'lighting-energy-eff': 'Poor', 'lighting-env-eff': 'Poor', 'main-fuel': 'electricity (not community)',
'wind-turbine-count': 0, 'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'wind-turbine-count': 0, 'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None,
'floor-height': None, 'photo-supply': None, 'solar-water-heating-flag': 'N', 'floor-height': 2.5, 'photo-supply': None, 'solar-water-heating-flag': 'N',
'mechanical-ventilation': 'natural', 'address': '6, Nags Head Lane, Hargrave', 'mechanical-ventilation': 'natural', 'address': '6, Nags Head Lane, Hargrave',
'local-authority-label': 'East Northamptonshire', 'constituency-label': 'Corby', 'local-authority-label': 'East Northamptonshire', 'constituency-label': 'Corby',
'posttown': 'WELLINGBOROUGH', 'construction-age-band': 'England and Wales: 1930-1949', 'posttown': 'WELLINGBOROUGH', 'construction-age-band': 'England and Wales: 1930-1949',
@ -1093,7 +1093,7 @@ testing_examples = [
'mainheatc-energy-eff': 'Poor', 'mainheatc-env-eff': 'Poor', 'mainheatc-energy-eff': 'Poor', 'mainheatc-env-eff': 'Poor',
'lighting-description': 'No low energy lighting', 'lighting-energy-eff': 'Very Poor', 'lighting-description': 'No low energy lighting', 'lighting-energy-eff': 'Very Poor',
'lighting-env-eff': 'Very Poor', 'main-fuel': 'anthracite', 'wind-turbine-count': 0, 'lighting-env-eff': 'Very Poor', 'main-fuel': 'anthracite', 'wind-turbine-count': 0,
'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'floor-height': None, 'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'floor-height': 2.5,
'photo-supply': None, 'photo-supply': None,
'solar-water-heating-flag': 'N', 'mechanical-ventilation': 'natural', 'solar-water-heating-flag': 'N', 'mechanical-ventilation': 'natural',
'address': '2 Crabs Castle, Pontrilas', 'local-authority-label': 'Herefordshire, County of', 'address': '2 Crabs Castle, Pontrilas', 'local-authority-label': 'Herefordshire, County of',
@ -1228,7 +1228,7 @@ testing_examples = [
'mainheatc-energy-eff': 'Average', 'mainheatc-env-eff': 'Average', 'mainheatc-energy-eff': 'Average', 'mainheatc-env-eff': 'Average',
'lighting-description': 'No low energy lighting', 'lighting-energy-eff': 'Very Poor', 'lighting-description': 'No low energy lighting', 'lighting-energy-eff': 'Very Poor',
'lighting-env-eff': 'Very Poor', 'main-fuel': 'electricity (not community)', 'wind-turbine-count': 0, 'lighting-env-eff': 'Very Poor', 'main-fuel': 'electricity (not community)', 'wind-turbine-count': 0,
'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'floor-height': None, 'heat-loss-corridor': 'NO DATA!', 'unheated-corridor-length': None, 'floor-height': 2.5,
'photo-supply': 50.0, 'solar-water-heating-flag': None, 'mechanical-ventilation': 'natural', 'photo-supply': 50.0, 'solar-water-heating-flag': None, 'mechanical-ventilation': 'natural',
'address': '16, Woodside', 'local-authority-label': 'Wolverhampton', 'address': '16, Woodside', 'local-authority-label': 'Wolverhampton',
'constituency-label': 'Wolverhampton North East', 'posttown': 'WOLVERHAMPTON', 'constituency-label': 'Wolverhampton North East', 'posttown': 'WOLVERHAMPTON',