diff --git a/recommendations/HotwaterRecommendations.py b/recommendations/HotwaterRecommendations.py index 9c5c7045..95488d3f 100644 --- a/recommendations/HotwaterRecommendations.py +++ b/recommendations/HotwaterRecommendations.py @@ -62,7 +62,10 @@ class HotwaterRecommendations: "sap_points": None, "already_installed": already_installed, **recommendation_cost, - "simulation_config": {"hot_water_energy_eff_ending": "Average"} + "simulation_config": {"hot_water_energy_eff_ending": "Average"}, + "description_simulation": { + "hot-water-energy-eff": "Average" + } } ) return diff --git a/recommendations/Recommendations.py b/recommendations/Recommendations.py index 6e17ef54..5cca056f 100644 --- a/recommendations/Recommendations.py +++ b/recommendations/Recommendations.py @@ -337,9 +337,10 @@ class Recommendations: sap_phase_impact = property_sap_predictions.groupby("phase")["predictions"].median().reset_index() heat_phase_impact = property_heat_predictions.groupby("phase")["predictions"].median().reset_index() carbon_phase_impact = property_carbon_predictions.groupby("phase")["predictions"].median().reset_index() - lighting_cost_phase_impact = ( - property_lighting_cost_predictions.groupby("phase")[["adjusted_cost", "predictions"]].median().reset_index() - ) + # lighting_cost_phase_impact = ( + # property_lighting_cost_predictions.groupby("phase")[["adjusted_cost", "predictions"]].median( + # ).reset_index() + # ) heating_cost_phase_impact = ( property_heating_cost_predictions.groupby("phase")[["adjusted_cost", "predictions"]].median().reset_index() ) @@ -349,32 +350,6 @@ class Recommendations: ].median().reset_index() ) - # The heat demand change is the difference between the starting heat demand and the value at the final phase - # expected_heat_demand = property_instance.floor_area * ( - # heat_phase_impact[heat_phase_impact["phase"] == max(heat_phase_impact["phase"])]["predictions"].values[0] - # ) - # starting_heat_demand = ( - # float(property_instance.data["energy-consumption-current"]) * property_instance.floor_area - # ) - # - # # This is the unadjusted resulting heat demand - # predicted_heat_demand_change = starting_heat_demand - expected_heat_demand - # - # # TODO: This isn't quite right as this is based on EVERY possible measure, not just the ones that are - # # actually implemented - # expected_adjusted_energy = AnnualBillSavings.adjust_energy_to_metered( - # epc_energy_consumption=expected_heat_demand, - # current_epc_rating=property_instance.data["current-energy-rating"], - # total_floor_area=property_instance.floor_area - # ) - # - # adjusted_heat_demand_change = ( - # property_instance.current_adjusted_energy - expected_adjusted_energy - # ) - # - # # TODO: We should determine if the home is gas & electricity or just electricity - # expected_energy_bill = AnnualBillSavings.calculate_annual_bill(expected_adjusted_energy) - phase_lighting_costs = {} phase_kwh_figures = {} for recommendations_by_type in property_recommendations: @@ -752,6 +727,14 @@ class Recommendations: rec["heat_demand"] is None) or (rec["energy_cost_savings"] is None): raise ValueError("sap points, co2 or heat demand is missing") + # We sum up the total savings for the property and that is our expected energy bill + # expected_energy_bill = sum( + # [ + # rec["energy_cost_savings"] for rec in property_recommendations + # if rec["type"] != "mechanical_ventilation" + # ] + # ) + return ( property_recommendations, expected_adjusted_energy,