From 5166493eda6a4d9b1e1c6e8c8b7876f141521f2b Mon Sep 17 00:00:00 2001
From: Michael Duong <michaelduong22@gmail.com>
Date: Wed, 9 Oct 2024 16:25:04 +0100
Subject: [PATCH] model with no floor_thermal starting and ending

---
 .../src/pipeline/configs/settings.yaml        |  4 +-
 modules/ml-pipeline/src/pipeline/dvc.lock     | 50 ++++++++++---------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/modules/ml-pipeline/src/pipeline/configs/settings.yaml b/modules/ml-pipeline/src/pipeline/configs/settings.yaml
index 4022a1b..483fdd5 100644
--- a/modules/ml-pipeline/src/pipeline/configs/settings.yaml
+++ b/modules/ml-pipeline/src/pipeline/configs/settings.yaml
@@ -36,7 +36,9 @@ default:
       drop_columns: [
         "heat_demand_change", "carbon_change", "rdsap_change", "heat_demand_ending", "carbon_ending", "days_to_starting", "days_to_ending",
         'number_habitable_rooms_starting', 'number_habitable_rooms_ending', 'number_heated_rooms_starting', 'number_heated_rooms_ending',
-        'number_habitable_rooms', 'number_heated_rooms', 'lighting_cost_starting', 'lighting_cost_ending', 'heating_cost_starting', 'heating_cost_ending', 'hot_water_cost_starting', 'hot_water_cost_ending',]
+        'number_habitable_rooms', 'number_heated_rooms', 'lighting_cost_starting',
+        'lighting_cost_ending', 'heating_cost_starting', 'heating_cost_ending', 'hot_water_cost_starting', 'hot_water_cost_ending',
+        'floor_thermal_transmittance', 'floor_thermal_transmittance_ending']
       retain_features: null
       # retain_features: ['uprn', 'sap_starting', 'hot_water_energy_eff_ending',
       #  'mainheat_energy_eff_ending', 'constituency', 'roof_energy_eff_ending',
diff --git a/modules/ml-pipeline/src/pipeline/dvc.lock b/modules/ml-pipeline/src/pipeline/dvc.lock
index 910ab1c..5e87957 100644
--- a/modules/ml-pipeline/src/pipeline/dvc.lock
+++ b/modules/ml-pipeline/src/pipeline/dvc.lock
@@ -40,6 +40,8 @@ stages:
         - heating_cost_ending
         - hot_water_cost_starting
         - hot_water_cost_ending
+        - floor_thermal_transmittance
+        - floor_thermal_transmittance_ending
         default.feature_processor.feature_processor_config.retain_features:
         default.feature_processor.feature_processor_config.subsample_amount:
         default.feature_processor.feature_processor_config.subsample_seed: 0
@@ -55,8 +57,8 @@ stages:
     outs:
     - path: data/prepared_data/
       hash: md5
-      md5: cd82e70e3cfcd0421cddf9a2c4b3e476.dir
-      size: 49655735
+      md5: 9159a400187e6d65687b5e411a4cb0de.dir
+      size: 48034631
       nfiles: 2
   build_model:
     cmd: python 2_build_model.py
@@ -67,8 +69,8 @@ stages:
       size: 4820
     - path: data/prepared_data
       hash: md5
-      md5: cd82e70e3cfcd0421cddf9a2c4b3e476.dir
-      size: 49655735
+      md5: 9159a400187e6d65687b5e411a4cb0de.dir
+      size: 48034631
       nfiles: 2
     params:
       configs/build_model.yaml:
@@ -100,18 +102,18 @@ stages:
     outs:
     - path: data/fit_predictions/
       hash: md5
-      md5: a1c97fa17adae60ee97696c95cfebe7e.dir
-      size: 3618488
+      md5: 6ac50c46e6fd740ccf76da4c2bf6735d.dir
+      size: 3615441
       nfiles: 1
     - path: data/model/
       hash: md5
-      md5: 7e6f38163a2cfe208ace26702ae28793.dir
-      size: 762167138
+      md5: 2212643103819177f58da1d3063c8c94.dir
+      size: 761489901
       nfiles: 35
     - path: metrics/fit_metrics.json
       hash: md5
-      md5: 8a6db7d72f9b4b8a5e411beaa3a2a413
-      size: 224
+      md5: d379cf95e07eb7c8797b4b766f8292cf
+      size: 225
   generate_predictions:
     cmd: python 3_generate_predictions.py
     deps:
@@ -121,13 +123,13 @@ stages:
       size: 2464
     - path: data/model
       hash: md5
-      md5: 7e6f38163a2cfe208ace26702ae28793.dir
-      size: 762167138
+      md5: 2212643103819177f58da1d3063c8c94.dir
+      size: 761489901
       nfiles: 35
     - path: data/prepared_data
       hash: md5
-      md5: cd82e70e3cfcd0421cddf9a2c4b3e476.dir
-      size: 49655735
+      md5: 9159a400187e6d65687b5e411a4cb0de.dir
+      size: 48034631
       nfiles: 2
     params:
       configs/settings.yaml:
@@ -139,8 +141,8 @@ stages:
     outs:
     - path: data/predictions/
       hash: md5
-      md5: 14729e943275748a19e86cf47d6561ee.dir
-      size: 508468
+      md5: e8bd8e8ba88a667ccea645890d348e62.dir
+      size: 507948
       nfiles: 1
   generate_metrics:
     cmd: python 4_generate_metrics.py
@@ -151,13 +153,13 @@ stages:
       size: 3484
     - path: data/predictions
       hash: md5
-      md5: 14729e943275748a19e86cf47d6561ee.dir
-      size: 508468
+      md5: e8bd8e8ba88a667ccea645890d348e62.dir
+      size: 507948
       nfiles: 1
     - path: data/prepared_data
       hash: md5
-      md5: cd82e70e3cfcd0421cddf9a2c4b3e476.dir
-      size: 49655735
+      md5: 9159a400187e6d65687b5e411a4cb0de.dir
+      size: 48034631
       nfiles: 2
     params:
       configs/settings.yaml:
@@ -167,8 +169,8 @@ stages:
     outs:
     - path: metrics/metrics.json
       hash: md5
-      md5: e076cba5f5737fd6d95931931411fdd0
-      size: 225
+      md5: a8cf405272776730f5818d50b20c6f43
+      size: 222
   generate_scenerio_metrics:
     cmd: python 5_generate_scenarios.py
     deps:
@@ -188,9 +190,9 @@ stages:
     outs:
     - path: metrics/scenario_metrics.md
       hash: md5
-      md5: 3e1047665bc18e92bf0f4216b9cc0c88
+      md5: b110d6cb700b124220bf5cbc3c69f342
       size: 356
     - path: metrics/scenario_table.md
       hash: md5
-      md5: 71d4052f1ab986253bce9268644cc421
+      md5: ab2b7b4b251c9c7eb72df21f4d0e02bc
       size: 872