junte/ML
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/ML.git synced 2026-06-30 13:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #137 from Hestia-Homes/heatingkwh-dev-model

Browse source 
removed features for new heatingkwh model
This commit is contained in:
KhalimCK 2024-08-06 12:37:37 +01:00 • committed by GitHub
commit dbc43cb4f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 97 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/ml-pipeline/README.MD
View file

@ -17,14 +17,15 @@ Within `src` folder, the structure is as follows:
# How to develop using this pipeline: # How to develop using this pipeline:
Run `make init`, which will: First, download miniconda to use conda to manage Python Environments
- Download pyenv (Python version management) Rund `conda init`, to initialise your terminal
- Download Python 3.X.X as defined in the `make` file - current 3.10.12
- Create a virtual environment with this version of python Change to this directory and run `make init`, which will:
- Create a conda virtual environment with this version of python - current 3.10.12
- Install packages in the training and version control directories in the pipeline folder (dev version if applicable) - Install packages in the training and version control directories in the pipeline folder (dev version if applicable)
- Install pre-commit to enable pre-commit hooks - Install pre-commit to enable pre-commit hooks
To use the environment, run `source .dev_env_pipeline/bin/activate`. To use the environment, run `conda activate dev_env_pipeline`
To enable the virtual envrionemnt created in vscode: To enable the virtual envrionemnt created in vscode:
- Open settings - Open settings

163
modules/ml-pipeline/src/pipeline/configs/settings.yaml
View file

@ -36,102 +36,75 @@ default:
subsample_seed: 0 subsample_seed: 0
target: heating_kwh target: heating_kwh
identifier_columns: ["uprn"] 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: ["hot_water_kwh"] drop_columns: ["hot_water_kwh"]
# [ retain_features: [
# "sap_ending", "heat_demand_change", "carbon_change", "rdsap_change", "heat_demand_ending", "carbon_ending", 'uprn',
# "heating_cost_ending", "hot_water_cost_ending", 'heating-cost-current',
# # "days_to_starting", "days_to_ending", 'co2-emissions-current',
# 'number_habitable_rooms_starting', 'number_habitable_rooms_ending', 'number_heated_rooms_starting', 'number_heated_rooms_ending', 'hot-water-cost-current',
# 'number_habitable_rooms', 'number_heated_rooms'] 'total-floor-area',
retain_features: ['uprn', 'heating-cost-current', 'secondheat-description',
'co2-emissions-current', 'environment-impact-current',
'hot-water-cost-current', 'floor-description',
'total-floor-area', 'mainheat-energy-eff',
'secondheat-description', 'current-energy-efficiency',
'environment-impact-current', 'mainheat-env-eff',
'floor-description', 'walls-energy-eff',
'mainheat-energy-eff', 'roof-energy-eff',
'current-energy-efficiency', 'property-type',
'mainheat-env-eff', 'mainheat-description',
'walls-energy-eff', 'hot-water-env-eff',
'roof-energy-eff', 'mechanical-ventilation',
'property-type', 'floor-level',
'mainheat-description', 'built-form',
'hot-water-env-eff', 'walls-description',
'mechanical-ventilation', 'mainheatcont-description',
'floor-level', 'roof-description',
'built-form', 'energy-consumption-current',
'walls-description', 'construction-age-band',
'mainheatcont-description', 'hotwater-description',
'roof-description', # 'lodgement-datetime',
'energy-consumption-current', 'main-fuel',
'construction-age-band', 'hot-water-energy-eff',
'hotwater-description', 'co2-emiss-curr-per-floor-area',
'lodgement-datetime', 'windows-energy-eff',
'main-fuel', 'current-energy-rating',
'hot-water-energy-eff', 'lodgement-year',
'co2-emiss-curr-per-floor-area', 'extension-count',
'windows-energy-eff', 'number-open-fireplaces',
'current-energy-rating', 'number-heated-rooms',
'lodgement-year', # 'lodgement-date',
'extension-count', # 'number-habitable-rooms',
'number-open-fireplaces', 'windows-description',
'number-heated-rooms', # 'local-authority',
'lodgement-date', 'photo-supply',
# 'number-habitable-rooms', 'heat-loss-corridor',
'windows-description', # 'posttown',
'local-authority', # 'address',
'photo-supply', 'flat-top-storey',
'heat-loss-corridor', 'unheated-corridor-length',
'posttown', 'fixed-lighting-outlets-count',
# 'address', # 'inspection-date',
'flat-top-storey', 'tenure',
'unheated-corridor-length', # 'county',
'fixed-lighting-outlets-count', # 'constituency-label',
'inspection-date', 'multi-glaze-proportion',
'tenure', 'solar-water-heating-flag',
'county', # 'address2',
'constituency-label', 'energy-tariff',
'multi-glaze-proportion', 'floor-height',
'solar-water-heating-flag', 'constituency',
# 'address2', # 'uprn-source',
'energy-tariff', 'transaction-type',
'floor-height', 'floor-energy-eff',
'constituency', # 'postcode',
'uprn-source', 'lodgement-month',
'transaction-type', 'lighting-cost-current',
'floor-energy-eff', 'glazed-area',
'postcode', # 'address1',
'lodgement-month', 'floor-env-eff',
'lighting-cost-current', 'main-heating-controls'
'glazed-area', ]
# 'address1',
'floor-env-eff',
'main-heating-controls']
# retain_features: ['uprn', 'sap_starting', 'hot_water_energy_eff_ending',
# 'mainheat_energy_eff_ending', 'constituency', 'roof_energy_eff_ending',
# 'walls_energy_eff_ending', 'secondheat_description_ending',
# 'property_type', 'mainheatc_energy_eff_ending', 'built_form',
# 'walls_insulation_thickness_ending', 'potential_energy_efficiency',
# 'transaction_type_ending',
# 'floor_thermal_transmittance_ending',
# 'low_energy_lighting_ending', 'heat_demand_starting',
# 'photo_supply_ending', 'carbon_starting',
# 'walls_thermal_transmittance_ending',
# 'roof_insulation_thickness_ending',
# 'total_floor_area_ending', 'number_open_fireplaces_ending',
# 'windows_energy_eff_ending',
# 'floor_height_ending',
# 'extension_count_ending',
# 'has_air_source_heat_pump_ending',
# 'charging_system_ending', 'construction_age_band', 'glazed_type_ending',
# 'roof_thermal_transmittance_ending',
# 'floor_insulation_thickness_ending', 'has_mains_gas_ending',
# 'estimated_perimeter_starting', 'energy_consumption_potential',
# 'environment_impact_potential', 'heater_type_ending',
# 'multi_glaze_proportion_ending',
# 'lighting_energy_eff_ending', 'fixed_lighting_outlets_count']
generate_predictions: generate_predictions:
input_dataclient_type: local input_dataclient_type: local

55
modules/ml-pipeline/src/pipeline/dvc.lock
View file

@ -48,7 +48,6 @@ stages:
- energy-consumption-current - energy-consumption-current
- construction-age-band - construction-age-band
- hotwater-description - hotwater-description
- lodgement-datetime
- main-fuel - main-fuel
- hot-water-energy-eff - hot-water-energy-eff
- co2-emiss-curr-per-floor-area - co2-emiss-curr-per-floor-area
@ -58,28 +57,20 @@ stages:
- extension-count - extension-count
- number-open-fireplaces - number-open-fireplaces
- number-heated-rooms - number-heated-rooms
- lodgement-date
- windows-description - windows-description
- local-authority
- photo-supply - photo-supply
- heat-loss-corridor - heat-loss-corridor
- posttown
- flat-top-storey - flat-top-storey
- unheated-corridor-length - unheated-corridor-length
- fixed-lighting-outlets-count - fixed-lighting-outlets-count
- inspection-date
- tenure - tenure
- county
- constituency-label
- multi-glaze-proportion - multi-glaze-proportion
- solar-water-heating-flag - solar-water-heating-flag
- energy-tariff - energy-tariff
- floor-height - floor-height
- constituency - constituency
- uprn-source
- transaction-type - transaction-type
- floor-energy-eff - floor-energy-eff
- postcode
- lodgement-month - lodgement-month
- lighting-cost-current - lighting-cost-current
- glazed-area - glazed-area
@ -99,8 +90,8 @@ stages:
outs: outs:
- path: data/prepared_data/ - path: data/prepared_data/
hash: md5 hash: md5
md5: 8585e7f26fa0008dcc0074996a51a78d.dir md5: f5e520d6cc27dcd0d306cfdbebd324ff.dir
size: 18062621 size: 10405713
nfiles: 2 nfiles: 2
build_model: build_model:
cmd: python 2_build_model.py cmd: python 2_build_model.py
@ -111,8 +102,8 @@ stages:
size: 4820 size: 4820
- path: data/prepared_data - path: data/prepared_data
hash: md5 hash: md5
md5: 8585e7f26fa0008dcc0074996a51a78d.dir md5: f5e520d6cc27dcd0d306cfdbebd324ff.dir
size: 18062621 size: 10405713
nfiles: 2 nfiles: 2
params: params:
configs/build_model.yaml: configs/build_model.yaml:
@ -144,17 +135,17 @@ stages:
outs: outs:
- path: data/fit_predictions/ - path: data/fit_predictions/
hash: md5 hash: md5
md5: 0f536790b342ee84fe51f5bf66ca4e3c.dir md5: dee9c58e45081cf5734895a18f31906f.dir
size: 1545512 size: 1545644
nfiles: 1 nfiles: 1
- path: data/model/ - path: data/model/
hash: md5 hash: md5
md5: 0ce09cc5e2d12876d9315cb18f8b70a9.dir md5: 2da6dc420a308a31e5450ab24b7d4c40.dir
size: 320950858 size: 297721035
nfiles: 36 nfiles: 35
- path: metrics/fit_metrics.json - path: metrics/fit_metrics.json
hash: md5 hash: md5
md5: 5c38cf3ad988c55fb9685d76c7da78b3 md5: 23032c58977677c6790415aa79e48aa8
size: 216 size: 216
generate_predictions: generate_predictions:
cmd: python 3_generate_predictions.py cmd: python 3_generate_predictions.py
@ -165,13 +156,13 @@ stages:
size: 2464 size: 2464
- path: data/model - path: data/model
hash: md5 hash: md5
md5: 0ce09cc5e2d12876d9315cb18f8b70a9.dir md5: 2da6dc420a308a31e5450ab24b7d4c40.dir
size: 320950858 size: 297721035
nfiles: 36 nfiles: 35
- path: data/prepared_data - path: data/prepared_data
hash: md5 hash: md5
md5: 8585e7f26fa0008dcc0074996a51a78d.dir md5: f5e520d6cc27dcd0d306cfdbebd324ff.dir
size: 18062621 size: 10405713
nfiles: 2 nfiles: 2
params: params:
configs/settings.yaml: configs/settings.yaml:
@ -183,8 +174,8 @@ stages:
outs: outs:
- path: data/predictions/ - path: data/predictions/
hash: md5 hash: md5
md5: 9f32b5e943df8cd9336077b8daf2975c.dir md5: d93b71cd8f21df7928a423db8a2c4e2b.dir
size: 163552 size: 163544
nfiles: 1 nfiles: 1
generate_metrics: generate_metrics:
cmd: python 4_generate_metrics.py cmd: python 4_generate_metrics.py
@ -195,13 +186,13 @@ stages:
size: 3484 size: 3484
- path: data/predictions - path: data/predictions
hash: md5 hash: md5
md5: 9f32b5e943df8cd9336077b8daf2975c.dir md5: d93b71cd8f21df7928a423db8a2c4e2b.dir
size: 163552 size: 163544
nfiles: 1 nfiles: 1
- path: data/prepared_data - path: data/prepared_data
hash: md5 hash: md5
md5: 8585e7f26fa0008dcc0074996a51a78d.dir md5: f5e520d6cc27dcd0d306cfdbebd324ff.dir
size: 18062621 size: 10405713
nfiles: 2 nfiles: 2
params: params:
configs/settings.yaml: configs/settings.yaml:
@ -211,8 +202,8 @@ stages:
outs: outs:
- path: metrics/metrics.json - path: metrics/metrics.json
hash: md5 hash: md5
md5: 752659c808d2bf0f176a0bf1ad7088a1 md5: f611572ff9273930f0c386903ee2ba63
size: 223 size: 217
generate_scenerio_metrics: generate_scenerio_metrics:
cmd: python 5_generate_scenarios.py cmd: python 5_generate_scenarios.py
deps: deps: