integration test bidi charging

Author: LKuemmel

packages/control/algorithm/chargemodes.py

@@ -31,6 +31,6 @@
 CONSIDERED_CHARGE_MODES_SURPLUS = CHARGEMODES[0:4] + CHARGEMODES[8:20]
 CONSIDERED_CHARGE_MODES_PV_ONLY = CHARGEMODES[12:20]
 CONSIDERED_CHARGE_MODES_ADDITIONAL_CURRENT = CHARGEMODES[0:12]
-CONSIDERED_CHARGE_MODES_MIN_CURRENT = CHARGEMODES[0:-1]
+CONSIDERED_CHARGE_MODES_MIN_CURRENT = CHARGEMODES[0:-4]
 CONSIDERED_CHARGE_MODES_NO_CURRENT = CHARGEMODES[22:24]
 CONSIDERED_CHARGE_MODES_BIDI_DISCHARGE = CHARGEMODES[20:22]

packages/control/algorithm/integration_test/bidi_charging_test.py

@@ -0,0 +1,54 @@
+import pytest
+from control import data
+from control.algorithm.algorithm import Algorithm
+from control.chargemode import Chargemode
+
+
+@pytest.fixture()
+def bidi_cps():
+    def _setup(*cps):
+        for cp in cps:
+            data.data.cp_data[cp].data.get.max_discharge_power = -11000
+            data.data.cp_data[cp].data.get.max_charge_power = 11000
+            data.data.cp_data[cp].data.get.phases_in_use = 3
+            control_parameter = data.data.cp_data[cp].data.control_parameter
+            control_parameter.min_current = data.data.cp_data[cp].data.set.charging_ev_data.ev_template.data.min_current
+            control_parameter.phases = 3
+            control_parameter.required_currents = [16]*3
+            control_parameter.required_current = 16
+            control_parameter.chargemode = Chargemode.BIDI_CHARGING
+            control_parameter.submode = Chargemode.BIDI_CHARGING
+    return _setup
+
+
+@pytest.mark.parametrize("grid_power, expected_current",
+                         [pytest.param(-2000, 2.898550724637681, id="bidi charge"),
+                          pytest.param(2000, -2.898550724637681, id="bidi discharge")])
+def test_cp3_bidi(grid_power: float, expected_current: float, bidi_cps, all_cp_not_charging, monkeypatch):
+    # setup
+    bidi_cps("cp3")
+    data.data.counter_data["counter0"].data.get.power = grid_power
+
+    # execution
+    Algorithm().calc_current()
+
+    # evaluation
+    assert data.data.cp_data["cp3"].data.set.current == expected_current
+    assert data.data.cp_data["cp4"].data.set.current == 0
+    assert data.data.cp_data["cp5"].data.set.current == 0
+    assert data.data.counter_data["counter0"].data.set.surplus_power_left == 0
+
+
+def test_cp3_cp4_bidi_discharge(bidi_cps, all_cp_not_charging, monkeypatch):
+    # setup
+    bidi_cps("cp3", "cp4")
+    data.data.counter_data["counter0"].data.get.power = 4000
+
+    # execution
+    Algorithm().calc_current()
+
+    # evaluation
+    assert data.data.cp_data["cp3"].data.set.current == -2.898550724637681
+    assert data.data.cp_data["cp4"].data.set.current == -2.898550724637681
+    assert data.data.cp_data["cp5"].data.set.current == 0
+    assert data.data.counter_data["counter0"].data.set.surplus_power_left == 0

packages/control/algorithm/integration_test/conftest.py

@@ -7,6 +7,7 @@
 from control.bat import Bat
 from control.bat_all import BatAll
 from control.chargepoint.chargepoint import Chargepoint
+from control.chargepoint.chargepoint_template import CpTemplate
 from control.counter_all import CounterAll
 from control.counter import Counter
 from control.ev.ev import Ev
@@ -24,6 +25,7 @@ def data_() -> None:
         "cp4": Chargepoint(4, None),
         "cp5": Chargepoint(5, None)}
     for i in range(3, 6):
+        data.data.cp_data[f"cp{i}"].template = CpTemplate()
         data.data.cp_data[f"cp{i}"].data.config.phase_1 = i-2
         data.data.cp_data[f"cp{i}"].data.set.charging_ev = i
         data.data.cp_data[f"cp{i}"].data.set.charging_ev_data = Ev(i)

packages/control/chargepoint/chargepoint.py

@@ -600,7 +600,7 @@ def check_min_max_current(self, required_current: float, phases: int) -> float:
             if required_current < 0:
                 required_current = max(self.data.get.max_discharge_power / phases / 230, required_current)
             else:
-                required_current = max(self.data.get.max_charge_power / phases / 230, required_current)
+                required_current = min(self.data.get.max_charge_power / phases / 230, required_current)
             required_current = self.check_cp_min_max_current(abs(required_current), phases) * -1
         else:
             required_current, msg = self.data.set.charging_ev_data.check_min_max_current(