From 77aaecf04fa45ad285ce5cb3262bf7f549996545 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Tue, 2 Jul 2024 18:38:55 +0100 Subject: [PATCH] Added some additional features --- etl/bill_savings/EnergyConsumptionModel.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etl/bill_savings/EnergyConsumptionModel.py b/etl/bill_savings/EnergyConsumptionModel.py index 6492c7a6..e0a52e19 100644 --- a/etl/bill_savings/EnergyConsumptionModel.py +++ b/etl/bill_savings/EnergyConsumptionModel.py @@ -17,6 +17,10 @@ class EnergyConsumptionModel: "lodgement-year", "lodgement-month", "current-energy-efficiency", "energy-consumption-current", "heating-cost-current", "total-floor-area", "number-heated-rooms", "mainheat-description", "main-fuel", "mainheat-energy-eff", "number-habitable-rooms", + "mainheatcont-description", "property-type", "built-form", + # To test + # "hotwater-description" - make a days since lodgment variable? + # A geographic variable ], "hot_water_kwh": [ "lodgement-year", "lodgement-month", "current-energy-efficiency", "energy-consumption-current", @@ -26,7 +30,7 @@ class EnergyConsumptionModel: TARGETS = ['heating_kwh', 'hot_water_kwh'] CATEGORICAL_COLUMNS = [ "lodgement-year", "lodgement-month", "main-fuel", "mainheat-description", "number-heated-rooms", - "number-habitable-rooms", "mainheat-energy-eff" + "number-habitable-rooms", "mainheat-energy-eff", "mainheatcont-description", "property-type", "built-form", ] NUMERICAL_COLUMNS = ["current-energy-efficiency", "energy-consumption-current", "heating-cost-current", "hot-water-cost-current", "total-floor-area"]