Don't bypass proposals with out-of-bounds power requests

Instead the proposed powers need to be clamped to the available
bounds.

Author: shsms

src/frequenz/sdk/microgrid/_power_managing/_shifting_matryoshka.py

@@ -112,11 +112,6 @@ def _calc_targets(
             if proposal_upper < proposal_lower:
                 continue
 
-            if proposal_power and (
-                proposal_power < proposal_lower or proposal_power > proposal_upper
-            ):
-                continue
-
             if proposal_lower >= upper_bound:
                 proposal_lower = upper_bound
                 proposal_upper = upper_bound

tests/actor/_power_managing/test_shifting_matryoshka.py

@@ -323,21 +323,21 @@ async def test_matryoshka_with_excl_2() -> None:
     tester.tgt_power(priority=1, power=-10.0, bounds=(-10.0, 50.0), expected=30.0)
     tester.bounds(priority=0, expected_power=30.0, expected_bounds=(0.0, 50.0))
 
-    tester.tgt_power(priority=1, power=-10.0, bounds=(-10.0, 20.0), expected=-10.0)
-    tester.bounds(priority=0, expected_power=-10.0, expected_bounds=(0.0, 20.0))
+    tester.tgt_power(priority=1, power=-10.0, bounds=(-10.0, 20.0), expected=0.0)
+    tester.bounds(priority=0, expected_power=0.0, expected_bounds=(0.0, 20.0))
 
-    tester.tgt_power(priority=1, power=-10.0, bounds=(-10.0, -5.0), expected=None)
+    tester.tgt_power(priority=1, power=-10.0, bounds=(-10.0, -5.0), expected=-10.0)
     tester.bounds(priority=0, expected_power=-10.0, expected_bounds=(0.0, 0.0))
 
-    tester.tgt_power(priority=2, power=-10.0, bounds=(-200.0, -5.0), expected=-20.0)
-    tester.bounds(priority=1, expected_power=-20.0, expected_bounds=(-190.0, 5.0))
-    tester.bounds(priority=0, expected_power=-20.0, expected_bounds=(0.0, 5.0))
+    tester.tgt_power(priority=2, power=-10.0, bounds=(-200.0, -5.0), expected=-15.0)
+    tester.bounds(priority=1, expected_power=-15.0, expected_bounds=(-190.0, 5.0))
+    tester.bounds(priority=0, expected_power=-15.0, expected_bounds=(0.0, 5.0))
 
     tester.tgt_power(priority=1, power=-10.0, bounds=(-100.0, -5.0), expected=None)
-    tester.bounds(priority=0, expected_power=-20.0, expected_bounds=(-90.0, 5.0))
+    tester.bounds(priority=0, expected_power=-15.0, expected_bounds=(-90.0, 5.0))
 
-    tester.tgt_power(priority=1, power=-40.0, bounds=(-100.0, -35.0), expected=-50.0)
-    tester.bounds(priority=0, expected_power=-50.0, expected_bounds=(-60.0, 5.0))
+    tester.tgt_power(priority=1, power=-40.0, bounds=(-100.0, -35.0), expected=-45.0)
+    tester.bounds(priority=0, expected_power=-45.0, expected_bounds=(-60.0, 5.0))
 
 
 async def test_matryoshka_with_excl_3() -> None: