diff --git a/model_data/simulation_system/generate_rdsap_change.py b/model_data/simulation_system/generate_rdsap_change.py index 7c4c6029..a8251992 100644 --- a/model_data/simulation_system/generate_rdsap_change.py +++ b/model_data/simulation_system/generate_rdsap_change.py @@ -482,10 +482,6 @@ def app(): data_by_urpn_df = process_and_prune_desriptions(data_by_urpn_df, cleaned_lookup) # Apply u-values - ######################## - # Walls - ######################## - for col in ["walls_clean_description", "walls_clean_description_ENDING"]: data_by_urpn_df[col] = data_by_urpn_df[col].str.replace("(assumed)", "").str.rstrip() @@ -493,6 +489,9 @@ def app(): columns=["walls_clean_description", "walls_clean_description_ENDING"] ) + def clean_missings(): + pass + if pd.isnull(data_by_urpn_df).sum().sum(): raise ValueError("Null values found in dataset after process_and_prune_desriptions") diff --git a/recommendations/rdsap_tables.py b/recommendations/rdsap_tables.py index 6abbea8b..71c52354 100644 --- a/recommendations/rdsap_tables.py +++ b/recommendations/rdsap_tables.py @@ -103,31 +103,31 @@ england_wales_age_band_lookup = { default_wall_thickness = [ { "type": "stone", "A": 500, "B": 500, "C": 500, "D": 500, "E": 450, "F": 420, "G": 420, "H": 420, - "I": 450, "J_K_L": 450 + "I": 450, "J": 450, "K": 450, "L": 450 }, { "type": "solid brick", "A": 220, "B": 220, "C": 220, "D": 220, "E": 240, "F": 250, "G": 270, "H": 270, - "I": 300, "J_K_L": 300 + "I": 300, "J": 300, "K": 300, "L": 300 }, { "type": "cavity", "A": 250, "B": 250, "C": 250, "D": 250, "E": 250, "F": 260, "G": 270, "H": 270, - "I": 300, "J_K_L": 300 + "I": 300, "J": 300, "K": 300, "L": 300 }, { "type": "timber frame", "A": 150, "B": 150, "C": 150, "D": 250, "E": 270, "F": 270, "G": 270, "H": 270, - "I": 300, "J_K_L": 300 + "I": 300, "J": 300, "K": 300, "L": 300 }, { "type": "cob", "A": 540, "B": 540, "C": 540, "D": 540, "E": 540, "F": 540, "G": 560, "H": 560, "I": 590, - "J_K_L": 590 + "J": 590, "K": 590, "L": 590 }, { "type": "system build", "A": 250, "B": 250, "C": 250, "D": 250, "E": 250, "F": 300, "G": 300, "H": 300, - "I": 300, "J_K_L": 300 + "I": 300, "J": 300, "K": 300, "L": 300 }, { "type": "park home", "A": None, "B": None, "C": None, "D": None, "E": None, "F": 50, "G": 50, - "H": None, "I": 75, "J_K_L": 100 + "H": None, "I": 75, "J": 100, "K": 100, "L": 100 }, ] diff --git a/recommendations/recommendation_utils.py b/recommendations/recommendation_utils.py index 9ffab939..1b6ed8cd 100644 --- a/recommendations/recommendation_utils.py +++ b/recommendations/recommendation_utils.py @@ -466,8 +466,8 @@ def extract_insulation_thickness(insulation_thickness_str): :param insulation_thickness_str: :return: """ - if insulation_thickness_str == "none": - return 0 + if insulation_thickness_str in ["none", "average", "below average", "above average", None]: + return None return int(insulation_thickness_str.replace("mm", ""))