From d600475ece4a59f98438270337aeadd9bedb4b1f Mon Sep 17 00:00:00 2001
From: Michael Duong <michaelduong22@gmail.com>
Date: Fri, 25 Oct 2024 23:53:10 +0100
Subject: [PATCH] add model with removed floor u values

---
 .../src/pipeline/configs/settings.yaml        |  4 +-
 modules/ml-pipeline/src/pipeline/dvc.lock     | 48 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/modules/ml-pipeline/src/pipeline/configs/settings.yaml b/modules/ml-pipeline/src/pipeline/configs/settings.yaml
index 66f2bd5..b9b537f 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", "sap_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: ["SAP_STARTING", "TOTAL_FLOOR_AREA_DIFF"]
       retain_features: null
       # retain_features: ['uprn', 'sap_starting', 'hot_water_energy_eff_ending',
diff --git a/modules/ml-pipeline/src/pipeline/dvc.lock b/modules/ml-pipeline/src/pipeline/dvc.lock
index 4eb9ccd..e773e80 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: 29314b464c692ad9d33c935337c00830.dir
-      size: 39932302
+      md5: 9501005b5b07c1fbff7851f6454e7cd9.dir
+      size: 38571641
       nfiles: 2
   build_model:
     cmd: python 2_build_model.py
@@ -67,8 +69,8 @@ stages:
       size: 4820
     - path: data/prepared_data
       hash: md5
-      md5: 29314b464c692ad9d33c935337c00830.dir
-      size: 39932302
+      md5: 9501005b5b07c1fbff7851f6454e7cd9.dir
+      size: 38571641
       nfiles: 2
     params:
       configs/build_model.yaml:
@@ -100,17 +102,17 @@ stages:
     outs:
     - path: data/fit_predictions/
       hash: md5
-      md5: 7b7fcc11334b15fde7f66622ab0e57a9.dir
-      size: 3766689
+      md5: efcaa146941a0940c68da193cdd1940d.dir
+      size: 3770676
       nfiles: 1
     - path: data/model/
       hash: md5
-      md5: 9711e64fb1ea399676c232e941cc47c8.dir
-      size: 754702754
-      nfiles: 36
+      md5: 91434ce548318be55d586a860a8af79d.dir
+      size: 781202553
+      nfiles: 37
     - path: metrics/fit_metrics.json
       hash: md5
-      md5: 91ac2d006b4312a6c9507f66b24463ed
+      md5: c6a886f4e1abca9a61d1d2ca121421c6
       size: 227
   generate_predictions:
     cmd: python 3_generate_predictions.py
@@ -121,13 +123,13 @@ stages:
       size: 2464
     - path: data/model
       hash: md5
-      md5: 9711e64fb1ea399676c232e941cc47c8.dir
-      size: 754702754
-      nfiles: 36
+      md5: 91434ce548318be55d586a860a8af79d.dir
+      size: 781202553
+      nfiles: 37
     - path: data/prepared_data
       hash: md5
-      md5: 29314b464c692ad9d33c935337c00830.dir
-      size: 39932302
+      md5: 9501005b5b07c1fbff7851f6454e7cd9.dir
+      size: 38571641
       nfiles: 2
     params:
       configs/settings.yaml:
@@ -139,8 +141,8 @@ stages:
     outs:
     - path: data/predictions/
       hash: md5
-      md5: 42655d4e7a618ea515ef881efea5132a.dir
-      size: 515279
+      md5: 2a320c41deaa96d14fc35792d115d66a.dir
+      size: 515614
       nfiles: 1
   generate_metrics:
     cmd: python 4_generate_metrics.py
@@ -151,13 +153,13 @@ stages:
       size: 3484
     - path: data/predictions
       hash: md5
-      md5: 42655d4e7a618ea515ef881efea5132a.dir
-      size: 515279
+      md5: 2a320c41deaa96d14fc35792d115d66a.dir
+      size: 515614
       nfiles: 1
     - path: data/prepared_data
       hash: md5
-      md5: 29314b464c692ad9d33c935337c00830.dir
-      size: 39932302
+      md5: 9501005b5b07c1fbff7851f6454e7cd9.dir
+      size: 38571641
       nfiles: 2
     params:
       configs/settings.yaml:
@@ -167,8 +169,8 @@ stages:
     outs:
     - path: metrics/metrics.json
       hash: md5
-      md5: 020ebcd0fdc225dedbad7949d31f7a12
-      size: 226
+      md5: 50c805705076c5c3185f34c3e82573d1
+      size: 225
   generate_scenerio_metrics:
     cmd: python 5_generate_scenarios.py
     deps: