bess params are used

v2/app.py

@@ -12,7 +12,7 @@ from visualization import *
 from supplier import Supplier, precalculate_supplier
 from architecture import simulator, add_dummy_predictions
 from decider import Decider, RandomDecider
-from bess import BatteryModel
+from bess import BatteryParameters, BatteryModel
 
 #@title ### Downloading the data
 # !wget "https://static.renyi.hu/ai-shared/daniel/pq/PL_44527.19-21.csv.gz"
@@ -40,7 +40,23 @@ def recalculate(ui):
     time_interval_min = all_data.index.freq.n
     time_interval_h = time_interval_min / 60
 
-    battery_model = BatteryModel(capacity_Ah=600, time_interval_h=time_interval_h)
+    '''
+    def __init__(self, capacity_Ah, time_interval_h):
+        self.capacity_Ah = capacity_Ah
+        self.efficiency = 0.9 # [dimensionless]
+        self.voltage_V = 600
+        self.charge_kW = 50
+        self.discharge_kW = 60
+        self.time_interval_h = time_interval_h
+    '''
+
+    battery_parameters = BatteryParameters()
+    battery_parameters.capacity_Ah = ui.bess_capacity_Ah
+    battery_parameters.voltage_V = ui.bess_voltage_V
+    battery_parameters.bess_charge_kW = ui.bess_charge_kW
+    battery_parameters.bess_discharge_kW = ui.bess_discharge_kW
+
+    battery_model = BatteryModel(battery_parameters, time_interval_h=time_interval_h)
 
     # for faster testing:
     DATASET_TRUNCATED_SIZE = None
@@ -144,8 +160,8 @@ with gr.Blocks() as ui:
     with gr.Row():
         # LEFT: Input controls
         with gr.Column(scale=1):  # narrower column
-            solar_cell_num = gr.Slider(0, 3000, 1140, label="number of installed solar cells")
-            solar_cell_nominal_capacity = gr.Slider(0, 1000, 280, label="solar cell nominal capacity at NOCT [W]")
+            solar_cell_num = gr.Slider(0, 3000, 1140, label="Number of installed solar cells")
+            solar_cell_nominal_capacity = gr.Slider(0, 1000, 280, label="Solar cell nominal capacity at NOCT [W]")
 
             bess_capacity_Ah = gr.Slider(0, 2000, 330, label="BESS nominal capacity [Ah]")
 

v2/bess.py

@@ -1,23 +1,31 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class BatteryParameters:
+    capacity_Ah = 330
+    efficiency = 0.9 # [dimensionless]
+    voltage_V = 600
+    charge_kW = 50
+    discharge_kW = 60
+
+
 # SOC is normalized so that minimal_depth_of_discharge = 0 and maximal_depth_of_discharge = 1.
 # please set capacity_Ah = nominal_capacity_Ah * (max_dod - min_dod)
 #
 # TODO efficiency multiplier is not currently used, where best to put it?
 class BatteryModel:
-    def __init__(self, capacity_Ah, time_interval_h):
-        self.capacity_Ah = capacity_Ah
-        self.efficiency = 0.9 # [dimensionless]
-        self.voltage_V = 600
-        self.charge_kW = 50
-        self.discharge_kW = 60
+    def __init__(self, battery_parameters, time_interval_h):
+        self.p = battery_parameters
         self.time_interval_h = time_interval_h
 
         # the only non-constant member variable!
         # ratio of self.current_capacity_kWh and self.maximal_capacity_kWh
-        self.soc = 0.0 
+        self.soc = 0.0
 
     @property
     def maximal_capacity_kWh(self):
-        return self.capacity_Ah * self.voltage_V / 1000
+        return self.p.capacity_Ah * self.p.voltage_V / 1000
 
     @property
     def current_capacity_kWh(self):
@@ -27,7 +35,7 @@ class BatteryModel:
         assert 0 <= self.soc <= 1
         assert demand_kW >= 0
         # rate limited:
-        possible_discharge_in_timestep_kWh = self.discharge_kW * self.time_interval_h
+        possible_discharge_in_timestep_kWh = self.p.discharge_kW * self.time_interval_h
         # limited by current capacity:
         possible_discharge_in_timestep_kWh = min((possible_discharge_in_timestep_kWh, self.current_capacity_kWh))
         # limited by need:
@@ -44,7 +52,7 @@ class BatteryModel:
         assert 0 <= self.soc <= 1
         assert charge_kW >= 0
         # rate limited:
-        possible_charge_in_timestep_kWh = self.charge_kW * self.time_interval_h
+        possible_charge_in_timestep_kWh = self.p.charge_kW * self.time_interval_h
         # limited by current capacity:
         possible_charge_in_timestep_kWh = min((possible_charge_in_timestep_kWh, self.maximal_capacity_kWh - self.current_capacity_kWh))
         # limited by supply: