From 037c1c9e5f38801c5c30ed4668824c033e54d958 Mon Sep 17 00:00:00 2001 From: Michael Duong Date: Wed, 9 Oct 2024 11:47:28 +0100 Subject: [PATCH 1/3] sap model with changed u values data --- .../src/pipeline/configs/scenarios.yaml | 3 +- .../src/pipeline/configs/settings.yaml | 3 +- modules/ml-pipeline/src/pipeline/dvc.lock | 60 +++++++++---------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/modules/ml-pipeline/src/pipeline/configs/scenarios.yaml b/modules/ml-pipeline/src/pipeline/configs/scenarios.yaml index 98b00fd..19a8764 100644 --- a/modules/ml-pipeline/src/pipeline/configs/scenarios.yaml +++ b/modules/ml-pipeline/src/pipeline/configs/scenarios.yaml @@ -5,6 +5,7 @@ default: scenario_data_filepaths: # - s3://retrofit-data-dev/scenario_data/28-05-2024-19-22-41/recommendations_scoring_data.parquet # - s3://retrofit-data-dev/scenario_data/07-10-2024-16-26-06/recommendations_scoring_data.parquet - - s3://retrofit-data-dev/scenario_data/08-10-2024-15-07-33/recommendations_scoring_data.parquet + # - s3://retrofit-data-dev/scenario_data/08-10-2024-15-07-33/recommendations_scoring_data.parquet + - s3://retrofit-data-dev/scenario_data/08-10-2024-22-18-44/recommendations_scoring_data.parquet comparison_output_filepath: ./metrics/scenario_table.md metrics_output_filepath: ./metrics/scenario_metrics.md diff --git a/modules/ml-pipeline/src/pipeline/configs/settings.yaml b/modules/ml-pipeline/src/pipeline/configs/settings.yaml index edaecba..4022a1b 100644 --- a/modules/ml-pipeline/src/pipeline/configs/settings.yaml +++ b/modules/ml-pipeline/src/pipeline/configs/settings.yaml @@ -19,7 +19,8 @@ default: input_dataclient_type: aws-s3 output_dataclient_type: local # data_filepath: s3://retrofit-data-dev/sap_change_model/2024-05-28-19-08-25/dataset_rooms.parquet - data_filepath: s3://retrofit-data-dev/sap_change_model/2024-10-03-22-57-23/dataset_rooms.parquet + # data_filepath: s3://retrofit-data-dev/sap_change_model/2024-10-03-22-57-23/dataset_rooms.parquet + data_filepath: s3://retrofit-data-dev/sap_change_model/2024-10-08-21-58-03/dataset_rooms.parquet train_proportion: 0.9 output_train_filepath: ./data/prepared_data/train.parquet output_test_filepath: ./data/prepared_data/test.parquet diff --git a/modules/ml-pipeline/src/pipeline/dvc.lock b/modules/ml-pipeline/src/pipeline/dvc.lock index bd91a75..910ab1c 100644 --- a/modules/ml-pipeline/src/pipeline/dvc.lock +++ b/modules/ml-pipeline/src/pipeline/dvc.lock @@ -46,7 +46,7 @@ stages: default.feature_processor.feature_processor_config.target: sap_ending default.feature_processor.feature_processor_type: dataframe default.prepare_data.data_filepath: - s3://retrofit-data-dev/sap_change_model/2024-10-03-22-57-23/dataset_rooms.parquet + s3://retrofit-data-dev/sap_change_model/2024-10-08-21-58-03/dataset_rooms.parquet default.prepare_data.input_dataclient_type: aws-s3 default.prepare_data.output_dataclient_type: local default.prepare_data.output_test_filepath: ./data/prepared_data/test.parquet @@ -55,8 +55,8 @@ stages: outs: - path: data/prepared_data/ hash: md5 - md5: 8ce9c629a531d54fa9b0bfc305391400.dir - size: 49665833 + md5: cd82e70e3cfcd0421cddf9a2c4b3e476.dir + size: 49655735 nfiles: 2 build_model: cmd: python 2_build_model.py @@ -67,8 +67,8 @@ stages: size: 4820 - path: data/prepared_data hash: md5 - md5: 8ce9c629a531d54fa9b0bfc305391400.dir - size: 49665833 + md5: cd82e70e3cfcd0421cddf9a2c4b3e476.dir + size: 49655735 nfiles: 2 params: configs/build_model.yaml: @@ -100,18 +100,18 @@ stages: outs: - path: data/fit_predictions/ hash: md5 - md5: 9dafd875d76676a06890af9be8778567.dir - size: 3617506 + md5: a1c97fa17adae60ee97696c95cfebe7e.dir + size: 3618488 nfiles: 1 - path: data/model/ hash: md5 - md5: 36fb8323508e968a297d650954ccbc58.dir - size: 800833479 - nfiles: 36 + md5: 7e6f38163a2cfe208ace26702ae28793.dir + size: 762167138 + nfiles: 35 - path: metrics/fit_metrics.json hash: md5 - md5: e2bc34ae26afbb854f0b021d12b1b569 - size: 223 + md5: 8a6db7d72f9b4b8a5e411beaa3a2a413 + size: 224 generate_predictions: cmd: python 3_generate_predictions.py deps: @@ -121,13 +121,13 @@ stages: size: 2464 - path: data/model hash: md5 - md5: 36fb8323508e968a297d650954ccbc58.dir - size: 800833479 - nfiles: 36 + md5: 7e6f38163a2cfe208ace26702ae28793.dir + size: 762167138 + nfiles: 35 - path: data/prepared_data hash: md5 - md5: 8ce9c629a531d54fa9b0bfc305391400.dir - size: 49665833 + md5: cd82e70e3cfcd0421cddf9a2c4b3e476.dir + size: 49655735 nfiles: 2 params: configs/settings.yaml: @@ -139,8 +139,8 @@ stages: outs: - path: data/predictions/ hash: md5 - md5: 8f4de36de171006cb6d9eacff7718ba3.dir - size: 508400 + md5: 14729e943275748a19e86cf47d6561ee.dir + size: 508468 nfiles: 1 generate_metrics: cmd: python 4_generate_metrics.py @@ -151,13 +151,13 @@ stages: size: 3484 - path: data/predictions hash: md5 - md5: 8f4de36de171006cb6d9eacff7718ba3.dir - size: 508400 + md5: 14729e943275748a19e86cf47d6561ee.dir + size: 508468 nfiles: 1 - path: data/prepared_data hash: md5 - md5: 8ce9c629a531d54fa9b0bfc305391400.dir - size: 49665833 + md5: cd82e70e3cfcd0421cddf9a2c4b3e476.dir + size: 49655735 nfiles: 2 params: configs/settings.yaml: @@ -167,8 +167,8 @@ stages: outs: - path: metrics/metrics.json hash: md5 - md5: 58e25eb5e1699dbb33e78af9ba4c2964 - size: 222 + md5: e076cba5f5737fd6d95931931411fdd0 + size: 225 generate_scenerio_metrics: cmd: python 5_generate_scenarios.py deps: @@ -182,15 +182,15 @@ stages: input_dataclient_type: aws-s3 output_dataclient_type: local scenario_data_filepaths: - - s3://retrofit-data-dev/scenario_data/08-10-2024-15-07-33/recommendations_scoring_data.parquet + - s3://retrofit-data-dev/scenario_data/08-10-2024-22-18-44/recommendations_scoring_data.parquet comparison_output_filepath: ./metrics/scenario_table.md metrics_output_filepath: ./metrics/scenario_metrics.md outs: - path: metrics/scenario_metrics.md hash: md5 - md5: 746ffa7d10fcdceaf2330d07c7ee623b - size: 363 + md5: 3e1047665bc18e92bf0f4216b9cc0c88 + size: 356 - path: metrics/scenario_table.md hash: md5 - md5: 3b7dfc36054bce065f849423abf31a5d - size: 969 + md5: 71d4052f1ab986253bce9268644cc421 + size: 872 From 5166493eda6a4d9b1e1c6e8c8b7876f141521f2b Mon Sep 17 00:00:00 2001 From: Michael Duong Date: Wed, 9 Oct 2024 16:25:04 +0100 Subject: [PATCH 2/3] 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 From dbcb839be8510a169cc9e890b61c3f52face4ecb Mon Sep 17 00:00:00 2001 From: Michael Duong Date: Wed, 9 Oct 2024 21:47:15 +0100 Subject: [PATCH 3/3] add new scenario data --- modules/ml-pipeline/src/pipeline/configs/scenarios.yaml | 3 ++- modules/ml-pipeline/src/pipeline/dvc.lock | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/ml-pipeline/src/pipeline/configs/scenarios.yaml b/modules/ml-pipeline/src/pipeline/configs/scenarios.yaml index 19a8764..6e60e8b 100644 --- a/modules/ml-pipeline/src/pipeline/configs/scenarios.yaml +++ b/modules/ml-pipeline/src/pipeline/configs/scenarios.yaml @@ -6,6 +6,7 @@ default: # - s3://retrofit-data-dev/scenario_data/28-05-2024-19-22-41/recommendations_scoring_data.parquet # - s3://retrofit-data-dev/scenario_data/07-10-2024-16-26-06/recommendations_scoring_data.parquet # - s3://retrofit-data-dev/scenario_data/08-10-2024-15-07-33/recommendations_scoring_data.parquet - - s3://retrofit-data-dev/scenario_data/08-10-2024-22-18-44/recommendations_scoring_data.parquet + # - s3://retrofit-data-dev/scenario_data/08-10-2024-22-18-44/recommendations_scoring_data.parquet + - s3://retrofit-data-dev/scenario_data/09-10-2024-18-21-08/recommendations_scoring_data.parquet comparison_output_filepath: ./metrics/scenario_table.md metrics_output_filepath: ./metrics/scenario_metrics.md diff --git a/modules/ml-pipeline/src/pipeline/dvc.lock b/modules/ml-pipeline/src/pipeline/dvc.lock index 5e87957..e37c23b 100644 --- a/modules/ml-pipeline/src/pipeline/dvc.lock +++ b/modules/ml-pipeline/src/pipeline/dvc.lock @@ -184,15 +184,15 @@ stages: input_dataclient_type: aws-s3 output_dataclient_type: local scenario_data_filepaths: - - s3://retrofit-data-dev/scenario_data/08-10-2024-22-18-44/recommendations_scoring_data.parquet + - s3://retrofit-data-dev/scenario_data/09-10-2024-18-21-08/recommendations_scoring_data.parquet comparison_output_filepath: ./metrics/scenario_table.md metrics_output_filepath: ./metrics/scenario_metrics.md outs: - path: metrics/scenario_metrics.md hash: md5 - md5: b110d6cb700b124220bf5cbc3c69f342 + md5: a5d9c42d38ef50e4fdf99a3e6043af2a size: 356 - path: metrics/scenario_table.md hash: md5 - md5: ab2b7b4b251c9c7eb72df21f4d0e02bc + md5: 3e48c953451af8852572299b66988910 size: 872