diff --git a/.idea/csv-editor.xml b/.idea/csv-editor.xml index f7aaafc..9170fa6 100644 --- a/.idea/csv-editor.xml +++ b/.idea/csv-editor.xml @@ -24,6 +24,13 @@ + + + + + + diff --git a/environment.py b/environment.py index 8e302c2..be6597e 100644 --- a/environment.py +++ b/environment.py @@ -153,14 +153,12 @@ class ESSEnv(gym.Env): # format(self.day, self.current_time, current_obs, next_obs, reward, finish)) def _load_year_data(self): - # pv_df = pd.read_csv('data/pv.csv', sep=',') price_df = pd.read_csv('data/prices.csv', sep=';') load_df = pd.read_csv('data/houseload.csv', sep=',') irradiance_df = pd.read_csv('data/irradiance.csv', sep=',') temperature_df = pd.read_csv('data/temper.csv', sep=',') wind_df = pd.read_csv('data/wind.csv', sep=',') - # pv = pv_df['pv'].to_numpy(dtype=float) price = price_df['Price'].apply(lambda x: x.replace(',', '.')).to_numpy(dtype=float) load = load_df['houseload'].to_numpy(dtype=float) irradiance = irradiance_df['irradiance'].to_numpy(dtype=float) @@ -173,7 +171,6 @@ class ESSEnv(gym.Env): transformed_element = transform_function(element) add_function(transformed_element) - # process_elements(pv, lambda x: x, self.data_manager.add_pv_element) process_elements(price, lambda x: max(x / 10, 0.5), self.data_manager.add_price_element) process_elements(load, lambda x: x * 3, self.data_manager.add_load_element) process_elements(irradiance, lambda x: x, self.data_manager.add_irradiance_element) diff --git a/module.py b/module.py index a930e90..4b4bde4 100644 --- a/module.py +++ b/module.py @@ -78,9 +78,9 @@ class Solar: self.oc_voltage = parameters['V_oc0'] self.s_resistance = parameters['R_s'] self.sh_resistance = parameters['R_sh'] - self.temper_coefficient = parameters['k_v'] - self.opex_cofficient = parameters['k_o'] - self.refer_irradiance = parameters['G_ref'] + self.temper_coefficient = parameters['T_c'] + self.opex_cofficient = parameters['O_c'] + self.refer_irradiance = parameters['I_ref'] self.refer_temperature = parameters['T_ref'] def step(self, temperature, irradiance, action_voltage=0): diff --git a/parameters.py b/parameters.py index 9113baa..ea778dd 100644 --- a/parameters.py +++ b/parameters.py @@ -2,13 +2,13 @@ import numpy as np solar_parameters = { 'I_sc0': 8.0, # 参考条件下的短路电流 (A) - 'V_b': 24, # 基准电压 + 'V_b': 25, # 基准电压 'V_oc0': 36.0, # 参考条件下的开路电压 (V) 'R_s': 0.1, # 串联电阻 (Ω) 'R_sh': 100.0, # 并联电阻 (Ω) - 'k_v': -0.2, # 开路电压的温度系数 (V/°C) - 'k_o': 0.001, # 变动成本系数 (元/千瓦时) - 'G_ref': 1000, # 参考辐照度 (W/m²) + 'T_c': -0.2, # 开路电压的温度系数 (V/°C) + 'O_c': 0.001, # 变动成本系数 (元/千瓦时) + 'I_ref': 1000, # 参考辐照度 (W/m²) 'T_ref': 25, # 参考温度 (°C) }