Skip to content
Snippets Groups Projects
Commit 6dd1875b authored by Christoph von Oy's avatar Christoph von Oy
Browse files

Merge branch 'dev_cvo_predictor_fix' into 'main'

Fixes

See merge request focus/focus-framework!22
parents a86a4b8d 8b6465e9
No related branches found
No related tags found
No related merge requests found
Subproject commit d9688f0d6d0517b83e4bd32a31643f7bec34a60e
Subproject commit dc5c2facdbb74e782cb7b88408551306342ed8f9
Subproject commit 510cb9ad836b3efbb205e9049002fd90ff1ce4d8
Subproject commit a83e46cf62a9327d5a8e51547feffd788adbea31
......@@ -60,18 +60,15 @@ input_profiles = Tooling.input_profile_processor.input_profile_processor.process
# 'topology_path': path to directory that contains the matrices that define the prosumer topology
prosumer_dict = {'SCN2_CAT1_PV11_3000_6000':{'config_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv',
'topology_path': 'input_files/models/prosumer_models/SCN2_CAT1_PV11',
'profiles': {'pv_roof': [['irradiance_1', 'irradiance', 'time_forward'],['temperature_1', 'temperature', 'time_forward']],
'elec_cns': ['demand_electric_1', 'demand_electric', 'time_forward'],
'therm_cns': ['demand_heat_1', 'demand_heat', 'time_forward'],
'dhw_dmd': ['demand_hot_water_1', 'demand_hot_water', 'time_forward']}},
'profiles': {'pv_roof': [('irradiance_1', 'irradiance', 'perfect_foresight'), ('temperature_1', 'temperature', 'perfect_foresight')],
'elec_cns': ('demand_electric_1', 'demand_electric', 'perfect_foresight'),
'therm_cns': ('demand_heat_1', 'demand_heat', 'perfect_foresight'),
'dhw_dmd': ('demand_hot_water_1', 'demand_hot_water', 'perfect_foresight')}},
'SCN0_CAT1_3000_6000': {'config_path': 'input_files/models/prosumer_models/SCN0_CAT1/config.csv',
'topology_path': 'input_files/models/prosumer_models/SCN0_CAT1',
'profiles': {'elec_cns': ['demand_electric_2', 'demand_electric', 'same_as_last_day'],
'therm_cns': ['demand_heat_2', 'demand_heat', 'same_as_last_day'],
'dhw_dmd': ['demand_hot_water_2', 'demand_hot_water', 'same_as_last_day']}}}
# [['irradiance_1', 'irradiance', 'same_as_last_day'],['temperature_1', 'temperature', 'time_forward']]
# ['demand_electric_1', 'demand_electric', 'same_as_last_week']
'profiles': {'elec_cns': ('demand_electric_2', 'demand_electric', 'perfect_foresight'),
'therm_cns': ('demand_heat_2', 'demand_heat', 'perfect_foresight'),
'dhw_dmd': ('demand_hot_water_2', 'demand_hot_water', 'perfect_foresight')}}}
prosumer_main = main_prosumer.ProsumerMain(prosumer_dict, input_profiles, t_horizon, t_step)
......@@ -85,9 +82,9 @@ prosumers = prosumer_main.prosumers
if simulation_scope == SimulationScope.PROSUMER:
exit()
district_assets_dict = {'da_bat': {'config_path': 'input_files/models/district_models/example_CA/config.csv',
district_assets_dict = {'ca_bat': {'config_path': 'input_files/models/district_models/example_CA/config.csv',
'topology_path': 'input_files/models/district_models/example_CA',
'profiles': {'elec_cns': ['demand_electric_3', 'demand_electric', 'same_as_last_day']}}}
'profiles': {'elec_cns': ('demand_electric_3', 'demand_electric', 'perfect_foresight')}}}
district_assets = main_prosumer.DistrictAssetMain(district_assets_dict, input_profiles, t_horizon, t_step).district_assets
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment