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

updating bills costing methodology to transform costs to today

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-07-09 12:33:38 +01:00
parent 68e9b83c9f
commit 5274b9b713
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
backend/Property.py
View file

@ -697,15 +697,19 @@ class Property:
# Convert to cost
if self.heating_energy_source == "Electricity":
adjusted_heating_cost = adjusted_heating_kwh * AnnualBillSavings.ELECTRICITY_PRICE_CAP
unadjusted_heating_cost = heating_prediction * AnnualBillSavings.ELECTRICITY_PRICE_CAP
elif self.heating_energy_source == "Natural Gas":
adjusted_heating_cost = adjusted_heating_kwh * AnnualBillSavings.GAS_PRICE_CAP
unadjusted_heating_cost = heating_prediction * AnnualBillSavings.GAS_PRICE_CAP
else:
raise NotImplementedError("Not implemented cost for this fuel type")
if self.hot_water_energy_source == "Electricity":
adjusted_hot_water_cost = adjusted_hot_water_kwh * AnnualBillSavings.ELECTRICITY_PRICE_CAP
unadjusted_hot_water_cost = hot_water_prediction * AnnualBillSavings.ELECTRICITY_PRICE_CAP
elif self.hot_water_energy_source == "Natural Gas":
adjusted_hot_water_cost = adjusted_hot_water_kwh * AnnualBillSavings.GAS_PRICE_CAP
unadjusted_hot_water_cost = hot_water_prediction * AnnualBillSavings.GAS_PRICE_CAP
else:
raise NotImplementedError("Not implemented cost for this fuel type")
@ -725,11 +729,16 @@ class Property:
"lighting": adjusted_lighting_cost,
"appliances": adjusted_appliances_cost
},
"original": {
"unadjusted": {
"heating": unadjusted_heating_cost,
"hot_water": unadjusted_hot_water_cost,
"lighting": float(self.data["lighting-cost-current"]),
"appliances": appliances_kwh * AnnualBillSavings.ELECTRICITY_PRICE_CAP
},
"epc": {
"heating": float(self.data["heating-cost-current"]),
"hot_water": float(self.data["hot-water-cost-current"]),
"lighting": float(self.data["lighting-cost-current"]),
"appliances": appliances_kwh
}
}
@ -740,7 +749,7 @@ class Property:
"lighting": adjusted_lighting_kwh,
"appliances": adjusted_applicances_kwh
},
"original": {
"unadjusted": {
"heating": heating_prediction,
"hot_water": hot_water_prediction,
"lighting": lighting_kwh,
@ -749,7 +758,7 @@ class Property:
}
self.expected_energy_bill = (
adjusted_heating_cost + adjusted_hot_water_cost + adjusted_lighting_cost + appliances_energy_cost
adjusted_heating_cost + adjusted_hot_water_cost + adjusted_lighting_cost + adjusted_appliances_cost
)
def set_spatial(self, spatial: pd.DataFrame):