From 615dd5d3a229541c88d4cf52ed4add61069e2990 Mon Sep 17 00:00:00 2001 From: Michael Duong Date: Thu, 4 Jul 2024 22:51:37 +0100 Subject: [PATCH] add hotwater model --- .github/workflows/Deploy.yml | 2 +- .github/workflows/MLPipelinePostMerge.yml | 2 +- .github/workflows/MLPipelinePullRequest.yml | 2 +- .../src/pipeline/configs/settings.yaml | 4 +- modules/ml-pipeline/src/pipeline/dvc.lock | 52 +++++++++---------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index c1b21f6..86a0105 100644 --- a/.github/workflows/Deploy.yml +++ b/.github/workflows/Deploy.yml @@ -2,7 +2,7 @@ name: Sap Change Model Deploy on: push: - branches: [ sap-dev, sap-prod, heat-dev, heat-prod, carbon-dev, carbon-prod, lighting-dev, lighting-prod ] + branches: [ sap-dev, sap-prod, heat-dev, heat-prod, carbon-dev, carbon-prod, hotwater-dev, hotwater-prod ] jobs: deploy: diff --git a/.github/workflows/MLPipelinePostMerge.yml b/.github/workflows/MLPipelinePostMerge.yml index 78ea05a..a80bb57 100644 --- a/.github/workflows/MLPipelinePostMerge.yml +++ b/.github/workflows/MLPipelinePostMerge.yml @@ -13,7 +13,7 @@ on: - "sap-dev" - "heat-dev" - "carbon-dev" - - "lighting-dev" + - "hotwater-dev" permissions: write-all diff --git a/.github/workflows/MLPipelinePullRequest.yml b/.github/workflows/MLPipelinePullRequest.yml index aa701db..2232e34 100644 --- a/.github/workflows/MLPipelinePullRequest.yml +++ b/.github/workflows/MLPipelinePullRequest.yml @@ -5,7 +5,7 @@ on: # branches: # - "model-**" pull_request: - branches: ["sap-dev", "heat-dev", "carbon-dev", "lighting-dev"] + branches: ["sap-dev", "heat-dev", "carbon-dev", "hotwater-dev"] label: types: ["created", "edited"] diff --git a/modules/ml-pipeline/src/pipeline/configs/settings.yaml b/modules/ml-pipeline/src/pipeline/configs/settings.yaml index 3adbe55..80ad400 100644 --- a/modules/ml-pipeline/src/pipeline/configs/settings.yaml +++ b/modules/ml-pipeline/src/pipeline/configs/settings.yaml @@ -32,12 +32,12 @@ default: feature_processor_config: subsample_amount: null subsample_seed: 0 - target: lighting_cost_ending + target: hot_water_cost_ending identifier_columns: ["uprn"] # drop_columns: ["heat_demand_change", "carbon_change", "rdsap_change", "heat_demand_ending", "carbon_ending", "days_to_starting", "days_to_ending"] drop_columns: [ "sap_ending", "heat_demand_change", "carbon_change", "rdsap_change", "heat_demand_ending", "carbon_ending", - "heating_cost_ending", "hot_water_cost_ending", + "lighting_cost_ending", "heating_cost_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'] diff --git a/modules/ml-pipeline/src/pipeline/dvc.lock b/modules/ml-pipeline/src/pipeline/dvc.lock index a34651c..3fe8e87 100644 --- a/modules/ml-pipeline/src/pipeline/dvc.lock +++ b/modules/ml-pipeline/src/pipeline/dvc.lock @@ -27,8 +27,8 @@ stages: - rdsap_change - heat_demand_ending - carbon_ending + - lighting_cost_ending - heating_cost_ending - - hot_water_cost_ending - number_habitable_rooms_starting - number_habitable_rooms_ending - number_heated_rooms_starting @@ -38,7 +38,7 @@ stages: 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 - default.feature_processor.feature_processor_config.target: lighting_cost_ending + default.feature_processor.feature_processor_config.target: hot_water_cost_ending default.feature_processor.feature_processor_type: dataframe default.prepare_data.data_filepath: s3://retrofit-data-dev/sap_change_model/2024-07-03-23-11-39/dataset_rooms.parquet @@ -50,8 +50,8 @@ stages: outs: - path: data/prepared_data/ hash: md5 - md5: 0f11a02cf75c0421757c0b26184cec33.dir - size: 48971227 + md5: 782e258411cf655c0a5c8437c20459d9.dir + size: 49160755 nfiles: 2 build_model: cmd: python 2_build_model.py @@ -62,8 +62,8 @@ stages: size: 4820 - path: data/prepared_data hash: md5 - md5: 0f11a02cf75c0421757c0b26184cec33.dir - size: 48971227 + md5: 782e258411cf655c0a5c8437c20459d9.dir + size: 49160755 nfiles: 2 params: configs/build_model.yaml: @@ -95,18 +95,18 @@ stages: outs: - path: data/fit_predictions/ hash: md5 - md5: 36c41f88681ab90668c17ce63fd9c318.dir - size: 3444201 + md5: f292cc6ddbe9c8f1efea8107a776ce16.dir + size: 3444061 nfiles: 1 - path: data/model/ hash: md5 - md5: bb9c3f1538e02e20e918ec36a0b7546f.dir - size: 754271944 - nfiles: 37 + md5: 48cfeca19c3d7ac956704abb425bb2ab.dir + size: 729294819 + nfiles: 35 - path: metrics/fit_metrics.json hash: md5 - md5: 16ae1efa8ac48d8ed978bb3fa67be64a - size: 225 + md5: 2e253c8b9ffc101aad95fc09fb4586c2 + size: 222 generate_predictions: cmd: python 3_generate_predictions.py deps: @@ -116,13 +116,13 @@ stages: size: 2464 - path: data/model hash: md5 - md5: bb9c3f1538e02e20e918ec36a0b7546f.dir - size: 754271944 - nfiles: 37 + md5: 48cfeca19c3d7ac956704abb425bb2ab.dir + size: 729294819 + nfiles: 35 - path: data/prepared_data hash: md5 - md5: 0f11a02cf75c0421757c0b26184cec33.dir - size: 48971227 + md5: 782e258411cf655c0a5c8437c20459d9.dir + size: 49160755 nfiles: 2 params: configs/settings.yaml: @@ -134,8 +134,8 @@ stages: outs: - path: data/predictions/ hash: md5 - md5: 50909a5b19c2551410e921dc9a92bef7.dir - size: 480359 + md5: bdb3afe72fa8ad9e56997f7da659778e.dir + size: 480363 nfiles: 1 generate_metrics: cmd: python 4_generate_metrics.py @@ -146,13 +146,13 @@ stages: size: 3484 - path: data/predictions hash: md5 - md5: 50909a5b19c2551410e921dc9a92bef7.dir - size: 480359 + md5: bdb3afe72fa8ad9e56997f7da659778e.dir + size: 480363 nfiles: 1 - path: data/prepared_data hash: md5 - md5: 0f11a02cf75c0421757c0b26184cec33.dir - size: 48971227 + md5: 782e258411cf655c0a5c8437c20459d9.dir + size: 49160755 nfiles: 2 params: configs/settings.yaml: @@ -162,8 +162,8 @@ stages: outs: - path: metrics/metrics.json hash: md5 - md5: d74767b34a1042c9ab0e3d6535791be6 - size: 224 + md5: fb65d79e41782ebc1f616fa6e0e8bec1 + size: 220 generate_scenerio_metrics: cmd: python 5_generate_scenarios.py deps: