diff --git a/Model_Library b/Model_Library
index 2a5dc03f968990ce3169bca7ffa73ab173f537d2..cc8296ce60fe4abd297efe60bd3f2ee4711ef136 160000
--- a/Model_Library
+++ b/Model_Library
@@ -1 +1 @@
-Subproject commit 2a5dc03f968990ce3169bca7ffa73ab173f537d2
+Subproject commit cc8296ce60fe4abd297efe60bd3f2ee4711ef136
diff --git a/input_files/convert_input_files_refactoring_part_2.py b/input_files/convert_input_files_refactoring_part_2.py
index b275486e2db694f206d43619ba58c1c6ebe35db5..e0cacbd8a6d9b1f56915ec011e7852e4e3ec5f06 100644
--- a/input_files/convert_input_files_refactoring_part_2.py
+++ b/input_files/convert_input_files_refactoring_part_2.py
@@ -40,6 +40,14 @@ def get_connected_components(matrix, components, comp):
def get_connection(matrix, components, comp_from, comp_to):
return matrix[components[comp_from]][components[comp_to]]
+def read_config(config_path):
+ config_df = pd.read_csv(config_path)
+ config_dict = config_df.to_dict(orient='list')
+
+ for k in config_dict:
+ config_dict[k] = config_dict[k][0]
+ return config_dict
+
changed_topologies = []
invalid_topologies = []
renamed_components = {'StandardElectricalConsumption': 'ElectricalConsumption',
@@ -91,7 +99,85 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
raise KeyError
for connected_component in get_connected_components(matrix, components, component):
all_connections = pd.concat([all_connections, pd.Series({'sector': sector, 'comp_from': component, 'comp_to': connected_component}).to_frame().T], ignore_index = True)
+ config = read_config(os.path.join(dirpath, "config.csv"))
changed_topologies.append(dirpath)
+ new_config = dict()
+ for name, value in config.items():
+ # configs to delete
+ if name in ['injection/pvpeak', 'elec_price_cap_low', 'elec_price_cap_high']:
+ pass
+ # configs to keep
+ elif name in ['yearly_interest', 'planning_horizon']:
+ new_config[name] = value
+ # configs that are handled by other configs
+ elif name in ['elec_price_variable', 'injection_price_variable', 'gas_price_variable', 'injection_price_gas_variable', 'heat_price_variable', 'injection_price_heat_variable', 'cooling_price_variable', 'injection_price_cooling_variable']:
+ pass
+ elif name == 'elec_price':
+ if config['elec_price_variable'] == 1:
+ print(f"Config of topology {dirpath} has a variable electricity price, so be sure to add a price profile!")
+ else:
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'ElectricalGrid':
+ new_config[all_components['comp_name'][i] + '_price'] = value
+ elif name == 'injection_price':
+ if config['injection_price_variable'] == 1:
+ print(f"Config of topology {dirpath} has a variable electricity injection price, so be sure to add a price profile!")
+ else:
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'ElectricalGrid':
+ new_config[all_components['comp_name'][i] + '_injection_price'] = value
+ elif name == 'gas_price':
+ if config['gas_price_variable'] == 1:
+ print(f"Config of topology {dirpath} has a variable gas price, so be sure to add a price profile!")
+ else:
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'GasGrid':
+ new_config[all_components['comp_name'][i] + '_price'] = value
+ elif name == 'injection_price_gas':
+ if config['injection_price_gas_variable'] == 1:
+ print(f"Config of topology {dirpath} has a variable gas injection price, so be sure to add a price profile!")
+ else:
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'GasGrid':
+ new_config[all_components['comp_name'][i] + '_injection_price'] = value
+ elif name == 'heat_price':
+ if config['heat_price_variable'] == 1:
+ print(f"Config of topology {dirpath} has a variable heat price, so be sure to add a price profile!")
+ else:
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'HeatGrid':
+ new_config[all_components['comp_name'][i] + '_price'] = value
+ elif name == 'injection_price_heat':
+ if config['injection_price_heat_variable'] == 1:
+ print(f"Config of topology {dirpath} has a variable heat injection price, so be sure to add a price profile!")
+ else:
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'HeatGrid':
+ new_config[all_components['comp_name'][i] + '_injection_price'] = value
+ elif name == 'cooling_price':
+ if config['cooling_price_variable'] == 1:
+ print(f"Config of topology {dirpath} has a variable cooling price, so be sure to add a price profile!")
+ else:
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'CoolingGrid':
+ new_config[all_components['comp_name'][i] + '_price'] = value
+ elif name == 'injection_price_cooling':
+ if config['injection_price_cooling_variable'] == 1:
+ print(f"Config of topology {dirpath} has a variable cooling injection price, so be sure to add a price profile!")
+ else:
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'CoolingGrid':
+ new_config[all_components['comp_name'][i] + '_injection_price'] = value
+ elif name == 'elec_emission':
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'ElectricalGrid':
+ new_config[all_components['comp_name'][i] + '_emission'] = value
+ elif name == 'gas_emission':
+ for i in all_components.index:
+ if all_components['comp_type'][i] == 'GasGrid':
+ new_config[all_components['comp_name'][i] + '_emission'] = value
+ else:
+ new_config[name] = value
all_components.to_csv(os.path.join(dirpath, "temp.csv"), index = False)
df_str = pd.read_csv(os.path.join(dirpath, "temp.csv"), dtype = str, keep_default_na = False)
for i in all_components.columns:
@@ -106,7 +192,16 @@ for dirpath, dirnames, filenames in os.walk(".\\input_files"):
all_connections.to_csv(os.path.join(dirpath, "connections.csv"), index = False)
for matrix_file, sector in matrix_files:
os.remove(os.path.join(dirpath, matrix_file))
- except KeyError:
+ os.remove(os.path.join(dirpath, "config.csv"))
+ new_config_df = pd.DataFrame(columns = list(new_config.keys()), index = [0])
+ for key, value in new_config.items():
+ string = str(value)
+ if issubclass(type(value), float):
+ if len(string) != 0 and string.endswith(".0"):
+ string = f"{value:.0f}"
+ new_config_df.loc[0, key] = string
+ new_config_df.to_csv(os.path.join(dirpath, "config.csv"), index = False)
+ except:
invalid_topologies.append(dirpath)
for directory in changed_topologies:
print(f"Modified topology {directory}!")
diff --git a/input_files/models/district_models/example_CA/config.csv b/input_files/models/district_models/example_CA/config.csv
index 8d15c623466861f434533b792b808cc2d943dd11..afcf4142ab022e22c5621e2e16650419e717bbaf 100644
--- a/input_files/models/district_models/example_CA/config.csv
+++ b/input_files/models/district_models/example_CA/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20
+grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon
+0.0793,0.3046,0.401,0.03,20
diff --git a/input_files/models/district_models/example_community/config.csv b/input_files/models/district_models/example_community/config.csv
index 257dec3a4df29136ccb629c854f34b105c57e8b9..3af15c2884836838c807b7f6f67dd41ad4e14224 100644
--- a/input_files/models/district_models/example_community/config.csv
+++ b/input_files/models/district_models/example_community/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,network_usage_capacity_fee,network_usage_energy_fee,heat_price,levies_int,levies_ext,concession,electricity_tax_int,electricity_tax_ext,VAT,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon
-0.0793,0,0.7,0.0606,0,0.3046,0,14.79,0.0506,0,0.0276,0.0496,0.0199,0,0.0205,0.190,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20
+grd_injection_price,grd_price,network_usage_capacity_fee,network_usage_energy_fee,levies_int,levies_ext,concession,electricity_tax_int,electricity_tax_ext,VAT,grd_emission,yearly_interest,planning_horizon
+0.0793,0.3046,14.79,0.0506,0.0276,0.0496,0.0199,0,0.0205,0.19,0.401,0.03,20
diff --git a/input_files/models/district_models/jbr_test_ca/config.csv b/input_files/models/district_models/jbr_test_ca/config.csv
index 8d15c623466861f434533b792b808cc2d943dd11..afcf4142ab022e22c5621e2e16650419e717bbaf 100644
--- a/input_files/models/district_models/jbr_test_ca/config.csv
+++ b/input_files/models/district_models/jbr_test_ca/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20
+grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon
+0.0793,0.3046,0.401,0.03,20
diff --git a/input_files/models/district_models/jbr_test_comm/config.csv b/input_files/models/district_models/jbr_test_comm/config.csv
index 8d15c623466861f434533b792b808cc2d943dd11..afcf4142ab022e22c5621e2e16650419e717bbaf 100644
--- a/input_files/models/district_models/jbr_test_comm/config.csv
+++ b/input_files/models/district_models/jbr_test_comm/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20
+grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon
+0.0793,0.3046,0.401,0.03,20
diff --git a/input_files/models/prosumer_models/SCN0_CAT1/config.csv b/input_files/models/prosumer_models/SCN0_CAT1/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN0_CAT1/config.csv
+++ b/input_files/models/prosumer_models/SCN0_CAT1/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/components.csv
deleted file mode 100644
index 4994866b662b73ac82005b1e8854ca09b78cdb3d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/components.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,PVGenerator,PV2,30,30,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
-grd,ElectricalGrid,GRD1,1000,1000,0
-elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/connections.csv
deleted file mode 100644
index a1324858b8799a58af83fa26ecd5c01e4ccbd6cb..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-sector,comp_from,comp_to
-electricity,pv_roof,inv_pv_bat
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,grd,elec_cns
-electricity,pv_roof,grd
-electricity,pv_roof,elec_cns
-electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix - Kopie.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix - Kopie.csv
new file mode 100644
index 0000000000000000000000000000000000000000..31ab298b041e213b0c0f069e2b7e70bafd1b3214
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix - Kopie.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
+pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
+grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..182920b085884b5bee3c23ca657b90b6aa60e0ce
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/archiv/elec_matrix.csv
@@ -0,0 +1,4 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
+pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
+grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV11/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV12_BA/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV13_BA_HP/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV14_HP/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/components.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/components.csv
deleted file mode 100644
index 4994866b662b73ac82005b1e8854ca09b78cdb3d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/components.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,PVGenerator,PV2,30,30,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
-grd,ElectricalGrid,GRD1,1000,1000,0
-elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/connections.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/connections.csv
deleted file mode 100644
index a1324858b8799a58af83fa26ecd5c01e4ccbd6cb..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-sector,comp_from,comp_to
-electricity,pv_roof,inv_pv_bat
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,grd,elec_cns
-electricity,pv_roof,grd
-electricity,pv_roof,elec_cns
-electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix - Kopie.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix - Kopie.csv
new file mode 100644
index 0000000000000000000000000000000000000000..31ab298b041e213b0c0f069e2b7e70bafd1b3214
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix - Kopie.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
+pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
+grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..182920b085884b5bee3c23ca657b90b6aa60e0ce
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/archiv/elec_matrix.csv
@@ -0,0 +1,4 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
+pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
+grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV31/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV32_BA/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV33_BA_HP/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv
+++ b/input_files/models/prosumer_models/SCN2_CAT1_PV34_HP/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1/config.csv b/input_files/models/prosumer_models/SCN3_CAT1/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/components.csv
deleted file mode 100644
index 4994866b662b73ac82005b1e8854ca09b78cdb3d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/components.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,PVGenerator,PV2,30,30,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
-grd,ElectricalGrid,GRD1,1000,1000,0
-elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/connections.csv
deleted file mode 100644
index a1324858b8799a58af83fa26ecd5c01e4ccbd6cb..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-sector,comp_from,comp_to
-electricity,pv_roof,inv_pv_bat
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,grd,elec_cns
-electricity,pv_roof,grd
-electricity,pv_roof,elec_cns
-electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix - Kopie.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix - Kopie.csv
new file mode 100644
index 0000000000000000000000000000000000000000..31ab298b041e213b0c0f069e2b7e70bafd1b3214
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix - Kopie.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
+pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
+grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..182920b085884b5bee3c23ca657b90b6aa60e0ce
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/archiv/elec_matrix.csv
@@ -0,0 +1,4 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
+pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
+grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV11/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV12_BA/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV13_BA_HP/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV14_HP/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/components.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/components.csv
deleted file mode 100644
index 4994866b662b73ac82005b1e8854ca09b78cdb3d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/components.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof,PVGenerator,PV2,30,30,0
-inv_pv_bat,Inverter,STP-7000TL-20,30,30,0
-grd,ElectricalGrid,GRD1,1000,1000,0
-elec_cns,ElectricalConsumption,,,,
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/connections.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/connections.csv
deleted file mode 100644
index a1324858b8799a58af83fa26ecd5c01e4ccbd6cb..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/connections.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-sector,comp_from,comp_to
-electricity,pv_roof,inv_pv_bat
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,grd,elec_cns
-electricity,pv_roof,grd
-electricity,pv_roof,elec_cns
-electricity,grd,elec_cns
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix - Kopie.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix - Kopie.csv
new file mode 100644
index 0000000000000000000000000000000000000000..31ab298b041e213b0c0f069e2b7e70bafd1b3214
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix - Kopie.csv
@@ -0,0 +1,5 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,inv_pv_bat,grd,elec_cns
+pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,0,0
+inv_pv_bat,Inverter,STP-7000TL-20,30,30,0,0,0,1,1
+grd,StandardACGrid,GRD1,1000,1000,0,0,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,0,1000,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..182920b085884b5bee3c23ca657b90b6aa60e0ce
--- /dev/null
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/archiv/elec_matrix.csv
@@ -0,0 +1,4 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof,grd,elec_cns
+pv_roof,StandardPVGenerator,PV2,30,30,0,0,1,1
+grd,StandardACGrid,GRD1,1000,1000,0,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,1000,1000,0,0,0,0
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV31/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV32_BA/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV33_BA_HP/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..975002f601d6d8a963e9a690004b4c7bdce2af41 100644
--- a/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv
+++ b/input_files/models/prosumer_models/SCN3_CAT1_PV34_HP/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,gas_grd_price,grd_price,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/jbr_test/config.csv b/input_files/models/prosumer_models/jbr_test/config.csv
index 8d15c623466861f434533b792b808cc2d943dd11..afcf4142ab022e22c5621e2e16650419e717bbaf 100644
--- a/input_files/models/prosumer_models/jbr_test/config.csv
+++ b/input_files/models/prosumer_models/jbr_test/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20
+grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon
+0.0793,0.3046,0.401,0.03,20
diff --git a/input_files/models/prosumer_models/mfh_quartal/config.csv b/input_files/models/prosumer_models/mfh_quartal/config.csv
index 74c671d2352ed572bd3ff3c36a1d6d469e6967bd..798a9d64cea586cdbbb0bd8801dd24113721bbff 100644
--- a/input_files/models/prosumer_models/mfh_quartal/config.csv
+++ b/input_files/models/prosumer_models/mfh_quartal/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price_low,elec_price_high,elec_price_cap_low,elec_price_cap_high,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon
-0.0793,0,0.7,0.0606,0,0.3046,0.25,50,60,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20
+grd_injection_price,gas_grd_price,elec_price_low,elec_price_high,gas_grd_injection_price,grd_emission,gas_grd_emission,yearly_interest,planning_horizon
+0.0793,0.0606,0.3046,0.25,0,0.401,0.21,0.03,20
diff --git a/input_files/models/prosumer_models/office_pv_heatpump/config.csv b/input_files/models/prosumer_models/office_pv_heatpump/config.csv
index be5d6200a2f1f62a9a82ce2293bdb5ec8a02d3d5..afcf4142ab022e22c5621e2e16650419e717bbaf 100644
--- a/input_files/models/prosumer_models/office_pv_heatpump/config.csv
+++ b/input_files/models/prosumer_models/office_pv_heatpump/config.csv
@@ -1,2 +1,2 @@
-injection_price,injection_price_variable,injection/pvpeak,gas_price,gas_price_variable,elec_price,elec_price_variable,heat_price,heat_price_variable,cooling_price,cooling_price_variable,injection_price_gas,injection_price_gas_variable,injection_price_heat,injection_price_heat_variable,injection_price_cooling,injection_price_cooling_variable,elec_emission,gas_emission,yearly_interest,planning_horizon,elec_price_cap_low,elec_price_cap_high
-0.0793,0,0.7,0.0606,0,0.3046,0,0,0,0,0,0,0,0,0,0,0,0.401,0.21,0.03,20,15,107
+grd_injection_price,grd_price,grd_emission,yearly_interest,planning_horizon
+0.0793,0.3046,0.401,0.03,20
diff --git a/input_files/models/prosumer_models/swimmingPool/components.csv b/input_files/models/prosumer_models/swimmingPool/components.csv
deleted file mode 100644
index 3a8115f5a4faf01605072bf829dea826f665aaa0..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/swimmingPool/components.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,PVGenerator,Vitovolt300,0,800,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
-battery,LiionBattery,BAT1,0,800,0
-grd,ElectricalGrid,GRD1,0,800,0
-elec_cns,ElectricalConsumption,,,,
-bhkw,BHKW,VTB200,0,800,0
-pv_roof2,PVGenerator,Vitovolt300,0,30,0
-heat_pump,HeatPump,EHP1,0,800,0
-gas_grd,GasGrid,GAS1,0,800,0
-gas_boiler,GasBoiler,BOI1,,,
-therm_cns,HeatConsumption,,,,
-water_tes,HotWaterStorage,TES1,0,800,0
-heat_grid,HeatGrid,HG1,0,800,0
-solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool/connections.csv b/input_files/models/prosumer_models/swimmingPool/connections.csv
deleted file mode 100644
index c67046ecf52db2d127419f4421e5618046476b4d..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/swimmingPool/connections.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-sector,comp_from,comp_to
-electricity,pv_roof1,inv_pv_bat
-electricity,inv_pv_bat,battery
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,inv_pv_bat,heat_pump
-electricity,battery,inv_pv_bat
-electricity,grd,elec_cns
-electricity,grd,heat_pump
-electricity,bhkw,inv_pv_bat
-electricity,bhkw,grd
-electricity,bhkw,elec_cns
-electricity,bhkw,heat_pump
-electricity,pv_roof2,inv_pv_bat
-gas,gas_grd,bhkw
-gas,gas_grd,gas_boiler
-heat,water_tes,therm_cns
-heat,heat_grid,therm_cns
-heat,bhkw,therm_cns
-heat,bhkw,water_tes
-heat,solar_therm_ge,therm_cns
-heat,solar_therm_ge,water_tes
-heat,gas_boiler,therm_cns
-heat,gas_boiler,water_tes
-heat,heat_pump,therm_cns
-heat,heat_pump,water_tes
diff --git a/input_files/models/prosumer_models/swimmingPool/elec_matrix.csv b/input_files/models/prosumer_models/swimmingPool/elec_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..2952f8888013444be110460ef9c381c16f9f2eaf
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool/elec_matrix.csv
@@ -0,0 +1,10 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof1,inv_pv_bat,battery,grd,elec_cns,bhkw,pv_roof2,heat_pump
+pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0,0,1,0,0,0,0,0,0
+inv_pv_bat,Inverter,STP-7000TL-20,0,800,0,0,0,1,1,1,0,0,1
+battery,LiionBattery,BAT1,0,800,0,0,1,0,0,0,0,0,0
+grd,StandardACGrid,GRD1,0,800,0,0,0,0,0,1,0,0,1
+elec_cns,StandardElectricalConsumption,CNS1,0,800,0,0,0,0,0,0,0,0,0
+bhkw,BHKW,VTB200,0,800,0,0,1,0,1,1,0,0,1
+pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0,0,1,0,0,0,0,0,0
+heat_pump,HeatPump,EHP1,0,800,0,0,0,0,0,0,0,0,0
+
diff --git a/input_files/models/prosumer_models/swimmingPool/gas_matrix.csv b/input_files/models/prosumer_models/swimmingPool/gas_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..b8624eeae61df1dd114094b27342b3386a889104
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool/gas_matrix.csv
@@ -0,0 +1,4 @@
+comp_name,comp_type,model,min_size,max_size,current_size,bhkw,gas_grd,gas_boiler
+bhkw,BHKW,VTB200,,,,0,0,0
+gas_grd,StandardGasGrid,GAS1,0,800,0,1,0,1
+gas_boiler,GasBoiler,BOI1,,,,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool/therm_matrix.csv b/input_files/models/prosumer_models/swimmingPool/therm_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..7b918b07dfadb50b8420b31dd46e20f7d732f974
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool/therm_matrix.csv
@@ -0,0 +1,8 @@
+comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,water_tes,heat_grid,bhkw,solar_therm_ge,gas_boiler,heat_pump
+therm_cns,HeatConsumption,HeatCNS1,0,800,0,0,0,0,0,0,0,0
+water_tes,HotWaterStorage,TES1,0,800,0,1,0,0,0,0,0,0
+heat_grid,HeatGrid,HG1,0,800,0,1,0,0,0,0,0,0
+bhkw,BHKW,VTB200,,,,1,1,0,0,0,0,0
+solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0,1,1,0,0,0,0,0
+gas_boiler,GasBoiler,BOI1,0,800,0,1,1,0,0,0,0,0
+heat_pump,HeatPump,EHP1,,,,1,1,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv b/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
deleted file mode 100644
index afea1e36833de1afa5a568897c9138d3a9f68586..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/swimmingPool_CHP/components.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,PVGenerator,Vitovolt300,0,800,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
-battery,LiionBattery,BAT1,0,800,0
-grd,ElectricalGrid,GRD1,0,800,0
-elec_cns,ElectricalConsumption,,,,
-bhkw,BHKW,VTB200,0,800,0
-pv_roof2,PVGenerator,Vitovolt300,0,30,0
-gas_grd,GasGrid,GAS1,0,800,0
-gas_boild,GasBoiler,BOI1,,,
-therm_cns,HeatConsumption,,,,
-water_tes,HotWaterStorage,TES1,0,800,0
-heat_grid,HeatGrid,HG1,0,800,0
-solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/connections.csv b/input_files/models/prosumer_models/swimmingPool_CHP/connections.csv
deleted file mode 100644
index 217b727aa515259640098009580f8419067dc1b0..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/swimmingPool_CHP/connections.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-sector,comp_from,comp_to
-electricity,pv_roof1,inv_pv_bat
-electricity,inv_pv_bat,battery
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,battery,inv_pv_bat
-electricity,grd,elec_cns
-electricity,bhkw,inv_pv_bat
-electricity,bhkw,grd
-electricity,bhkw,elec_cns
-electricity,pv_roof2,inv_pv_bat
-gas,gas_grd,bhkw
-gas,gas_grd,gas_boild
-heat,water_tes,therm_cns
-heat,heat_grid,therm_cns
-heat,bhkw,therm_cns
-heat,bhkw,water_tes
-heat,solar_therm_ge,therm_cns
-heat,solar_therm_ge,water_tes
-heat,gas_boild,therm_cns
-heat,gas_boild,water_tes
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/elec_matrix.csv b/input_files/models/prosumer_models/swimmingPool_CHP/elec_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..fe14ce1af60a1ca8e6932e9fc887f39f83d374ad
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_CHP/elec_matrix.csv
@@ -0,0 +1,9 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof1,inv_pv_bat,battery,grd,elec_cns,bhkw,pv_roof2
+pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0,0,1,0,0,0,0,0
+inv_pv_bat,Inverter,STP-7000TL-20,0,800,0.0,0,0,1,1,1,0,0
+battery,LiionBattery,BAT1,0,800,0,0,1,0,0,0,0,0
+grd,StandardACGrid,GRD1,0,800,0,0,0,0,0,1,0,0
+elec_cns,StandardElectricalConsumption,CNS1,0,800,0,0,0,0,0,0,0,0
+bhkw,BHKW,VTB200,0,800,0,0,1,0,1,1,0,0
+pv_roof2,StandardPVGenerator,Vitovolt300,0,30,0,0,1,0,0,0,0,0
+
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/gas_matrix.csv b/input_files/models/prosumer_models/swimmingPool_CHP/gas_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..eda9a94d54d94c4ceb96709d46eb8a6460ab784b
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_CHP/gas_matrix.csv
@@ -0,0 +1,4 @@
+comp_name,comp_type,model,min_size,max_size,current_size,bhkw,gas_grd,gas_boild
+bhkw,BHKW,VTB200,,,,0,0,0
+gas_grd,StandardGasGrid,GAS1,0,800,0,1,0,1
+gas_boild,GasBoiler,BOI1,,,,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool_CHP/therm_matrix.csv b/input_files/models/prosumer_models/swimmingPool_CHP/therm_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..0ba297c669913ae736a8fc6b6a739ecaba67381a
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_CHP/therm_matrix.csv
@@ -0,0 +1,7 @@
+comp_name,comp_type,model,min_size,max_size,current_size,therm_cns,water_tes,heat_grid,bhkw,solar_therm_ge,gas_boild
+therm_cns,HeatConsumption,HeatCNS1,0,800,0,0,0,0,0,0,0
+water_tes,HotWaterStorage,TES1,0,800,0,1,0,0,0,0,0
+heat_grid,HeatGrid,HG1,0,800,0,1,0,0,0,0,0
+bhkw,BHKW,VTB200,,,,1,1,0,0,0,0
+solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0,1,1,0,0,0,0
+gas_boild,GasBoiler,BOI1,0,800,0,1,1,0,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/components.csv b/input_files/models/prosumer_models/swimmingPool_HP/components.csv
deleted file mode 100644
index b59c54999aa01b802434a16e226954a268b41901..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/swimmingPool_HP/components.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-comp_name,comp_type,model,min_size,max_size,current_size
-pv_roof1,PVGenerator,Vitovolt300,0,800,0
-inv_pv_bat,Inverter,STP-7000TL-20,0,800,0
-battery,LiionBattery,BAT1,0,800,0
-grd,ElectricalGrid,GRD1,0,800,0
-elec_cns,ElectricalConsumption,,,,
-heat_pump,HeatPump,EHP1,0,800,0
-pv_roof2,PVGenerator,Vitovolt300,0,800,0
-gas_boild,GasBoiler,BOI1,,,
-gas_grd,GasGrid,GAS1,0,800,0
-therm_cns,HeatConsumption,,,,
-water_tes,HotWaterStorage,TES1,0,800,0
-solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0
-heat_grid,HeatGrid,HG1,0,800,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/connections.csv b/input_files/models/prosumer_models/swimmingPool_HP/connections.csv
deleted file mode 100644
index bac358763630c2943d0f83cc5223f22aea6b3a93..0000000000000000000000000000000000000000
--- a/input_files/models/prosumer_models/swimmingPool_HP/connections.csv
+++ /dev/null
@@ -1,21 +0,0 @@
-sector,comp_from,comp_to
-electricity,pv_roof1,inv_pv_bat
-electricity,inv_pv_bat,battery
-electricity,inv_pv_bat,grd
-electricity,inv_pv_bat,elec_cns
-electricity,inv_pv_bat,heat_pump
-electricity,battery,inv_pv_bat
-electricity,grd,inv_pv_bat
-electricity,grd,elec_cns
-electricity,grd,heat_pump
-electricity,pv_roof2,inv_pv_bat
-gas,gas_grd,gas_boild
-heat,heat_pump,therm_cns
-heat,heat_pump,water_tes
-heat,water_tes,therm_cns
-heat,gas_boild,therm_cns
-heat,gas_boild,water_tes
-heat,solar_therm_ge,therm_cns
-heat,solar_therm_ge,water_tes
-heat,heat_grid,therm_cns
-heat,heat_grid,water_tes
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/elec_matrix.csv b/input_files/models/prosumer_models/swimmingPool_HP/elec_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..1d6cd4fa6c8f36086d463e7ed9a116c17e903c5d
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_HP/elec_matrix.csv
@@ -0,0 +1,8 @@
+comp_name,comp_type,model,min_size,max_size,current_size,pv_roof1,inv_pv_bat,battery,grd,elec_cns,heat_pump,pv_roof2
+pv_roof1,StandardPVGenerator,Vitovolt300,0,800,0,0,1,0,0,0,0,0
+inv_pv_bat,Inverter,STP-7000TL-20,0,800,0,0,0,1,1,1,1,0
+battery,LiionBattery,BAT1,0,800,0,0,1,0,0,0,0,0
+grd,StandardACGrid,GRD1,0,800,0,0,1,0,0,1,1,0
+elec_cns,StandardElectricalConsumption,CNS1,0,800,0,0,0,0,0,0,0,0
+heat_pump,HeatPump,EHP1,0,800,0,0,0,0,0,0,0,0
+pv_roof2,StandardPVGenerator,Vitovolt300,0,800,0,0,1,0,0,0,0,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/gas_matrix.csv b/input_files/models/prosumer_models/swimmingPool_HP/gas_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..bf5cf12badaf5ad6a61eec2dd895302e375424ae
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_HP/gas_matrix.csv
@@ -0,0 +1,3 @@
+comp_name,comp_type,model,min_size,max_size,current_size,gas_boild,gas_grd
+gas_boild,GasBoiler,BOI1,,,,0,0
+gas_grd,StandardGasGrid,GAS1,0,800,0,1,0
diff --git a/input_files/models/prosumer_models/swimmingPool_HP/therm_matrix.csv b/input_files/models/prosumer_models/swimmingPool_HP/therm_matrix.csv
new file mode 100644
index 0000000000000000000000000000000000000000..aebab52b97a1af318fcf105edd1e95a1c6a59a6e
--- /dev/null
+++ b/input_files/models/prosumer_models/swimmingPool_HP/therm_matrix.csv
@@ -0,0 +1,7 @@
+comp_name,comp_type,model,min_size,max_size,current_size,heat_pump,therm_cns,water_tes,gas_boild,solar_therm_ge,heat_grid
+heat_pump,HeatPump,EHP1,,,,0,1,1,0,0,0
+therm_cns,HeatConsumption,HeatCNS1,0.0,800,0,0,0,0,0,0,0
+water_tes,HotWaterStorage,TES1,0,800,0,0,1,0,0,0,0
+gas_boild,GasBoiler,BOI1,0,800,0,0,1,1,0,0,0
+solar_therm_ge,SolarThermalCollector,Vitosol200_TypSV2G,0,800,0,0,1,1,0,0,0
+heat_grid,HeatGrid,HG1,0,800,0,0,1,1,0,0,0