diff --git a/model_data/cleaner_app.py b/model_data/cleaner_app.py index 1ccb6238..40011404 100644 --- a/model_data/cleaner_app.py +++ b/model_data/cleaner_app.py @@ -4,7 +4,6 @@ import pandas as pd import msgpack from model_data.EpcClean import EpcClean -from model_data.analysis.UvalueEstimations import UvalueEstimations from model_data.simulation_system.core.Settings import EARLIEST_EPC_DATE from pathlib import Path from utils.s3 import save_data_to_s3 diff --git a/model_data/epc_attributes/FloorAttributes.py b/model_data/epc_attributes/FloorAttributes.py index 5a901679..847b183a 100644 --- a/model_data/epc_attributes/FloorAttributes.py +++ b/model_data/epc_attributes/FloorAttributes.py @@ -65,7 +65,7 @@ class FloorAttributes(Definitions): uvalue = uvalue_match.group(1) else: uvalue = uvalue_match2.group(1) - self.description = f"average thermal transmittance {uvalue} w/m-¦K" + self.description = f'average thermal transmittance {uvalue} w/m-¦k' else: translation = self.WELSH_TEXT.get(self.description) diff --git a/model_data/tests/test_data/test_floor_attributes_cases.py b/model_data/tests/test_data/test_floor_attributes_cases.py index 3a9b27be..5738f77f 100644 --- a/model_data/tests/test_data/test_floor_attributes_cases.py +++ b/model_data/tests/test_data/test_floor_attributes_cases.py @@ -370,5 +370,11 @@ clean_floor_cases = [ 'thermal_transmittance_unit': 'w/m+é-¦k', 'is_assumed': False, 'is_to_unheated_space': False, 'is_to_external_air': False, 'is_suspended': False, 'is_solid': False, 'another_property_below': False, 'insulation_thickness': None}, + { + "original_description": "Trawsyriannedd thermol cyfartalog 0.27 W/m-¦K", 'thermal_transmittance': 0.27, + 'thermal_transmittance_unit': 'w/m-¦k', 'is_assumed': False, + 'is_to_unheated_space': False, 'is_to_external_air': False, 'is_suspended': False, 'is_solid': False, + 'another_property_below': False, 'insulation_thickness': None + } ]