Implement shifting of power when proposals don't have bounds

When a proposal doesn't have bounds, the lower priority actors will
see shifted bounds and their target powers will be shifted.

When a proposal has bounds, lower priority actors will see restricted
bounds based on the proposal.

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

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

@@ -80,6 +80,7 @@ def _calc_target_power(
         ):
             exclusion_bounds = system_bounds.exclusion_bounds
 
+        unshifted_power = Power.zero()
         target_power = Power.zero()
         for next_proposal in sorted(proposals, reverse=True):
             if upper_bound < lower_bound:
@@ -92,15 +93,29 @@ def _calc_target_power(
                     exclusion_bounds,
                 ):
                     case (None, power) | (power, None) if power:
-                        target_power = power
+                        unshifted_power = power
                     case (power_low, power_high) if power_low and power_high:
                         if (
                             power_high - next_proposal.preferred_power
                             < next_proposal.preferred_power - power_low
                         ):
-                            target_power = power_high
+                            unshifted_power = power_high
                         else:
-                            target_power = power_low
+                            unshifted_power = power_low
+                    case _:
+                        pass
+
+            # Shift the bounds if no clamping bounds are specified.
+            if (
+                next_proposal.bounds.lower is None
+                and next_proposal.bounds.upper is None
+                and next_proposal.preferred_power is not None
+            ):
+                lower_bound = lower_bound - unshifted_power
+                upper_bound = upper_bound - unshifted_power
+                target_power += unshifted_power
+                unshifted_power = Power.zero()
+                continue
 
             proposal_lower = next_proposal.bounds.lower or lower_bound
             proposal_upper = next_proposal.bounds.upper or upper_bound
@@ -118,6 +133,8 @@ def _calc_target_power(
                 lower_bound, upper_bound, exclusion_bounds
             )
 
+        target_power += unshifted_power
+
         return target_power
 
     def _validate_component_ids(
@@ -212,7 +229,7 @@ def calculate_target_power(
         return None
 
     @override
-    def get_status(
+    def get_status(  # pylint: disable=too-many-locals
         self,
         component_ids: frozenset[int],
         priority: int,
@@ -247,11 +264,41 @@ def get_status(
         ):
             exclusion_bounds = system_bounds.exclusion_bounds
 
+        limited_power = Power.zero()
         for next_proposal in sorted(
             self._component_buckets.get(component_ids, []), reverse=True
         ):
             if next_proposal.priority <= priority:
                 break
+            if next_proposal.preferred_power:
+                match _bounds.clamp_to_bounds(
+                    next_proposal.preferred_power,
+                    lower_bound,
+                    upper_bound,
+                    exclusion_bounds,
+                ):
+                    case (None, power) | (power, None) if power:
+                        limited_power = power
+                    case (power_low, power_high) if power_low and power_high:
+                        if (
+                            power_high - next_proposal.preferred_power
+                            < next_proposal.preferred_power - power_low
+                        ):
+                            limited_power = power_high
+                        else:
+                            limited_power = power_low
+                    case _:
+                        pass
+            # Shift the bounds if no clamping bounds are specified.
+            if (
+                next_proposal.bounds.lower is None
+                and next_proposal.bounds.upper is None
+                and next_proposal.preferred_power is not None
+            ):
+                lower_bound = lower_bound - limited_power
+                upper_bound = upper_bound - limited_power
+                limited_power = Power.zero()
+                continue
             proposal_lower = next_proposal.bounds.lower or lower_bound
             proposal_upper = next_proposal.bounds.upper or upper_bound
             match _bounds.check_exclusion_bounds_overlap(

tests/actor/_power_managing/test_shifting_matryoshka.py

@@ -142,7 +142,7 @@ async def test_matryoshka_no_excl() -> None:  # pylint: disable=too-many-stateme
     tester.bounds(priority=2, expected_power=40.0, expected_bounds=(10.0, 50.0))
     tester.bounds(priority=1, expected_power=40.0, expected_bounds=(40.0, 50.0))
 
-    tester.tgt_power(priority=2, power=0.0, bounds=(None, None), expected=30.0)
+    tester.tgt_power(priority=2, power=0.0, bounds=(-200.0, 200.0), expected=30.0)
     tester.bounds(priority=4, expected_power=30.0, expected_bounds=(-200.0, 200.0))
     tester.bounds(priority=3, expected_power=30.0, expected_bounds=(-200.0, 200.0))
     tester.bounds(priority=2, expected_power=30.0, expected_bounds=(10.0, 50.0))
@@ -329,13 +329,13 @@ async def test_matryoshka_with_excl_3() -> None:
     )
 
     tester = StatefulTester(batteries, system_bounds)
-    tester.tgt_power(priority=2, power=10.0, bounds=(None, None), expected=30.0)
-    tester.tgt_power(priority=2, power=-10.0, bounds=(None, None), expected=-30.0)
-    tester.tgt_power(priority=2, power=0.0, bounds=(None, None), expected=0.0)
-    tester.tgt_power(priority=3, power=20.0, bounds=(None, None), expected=None)
-    tester.tgt_power(priority=1, power=-20.0, bounds=(None, None), expected=-30.0)
-    tester.tgt_power(priority=3, power=None, bounds=(None, None), expected=None)
-    tester.tgt_power(priority=1, power=None, bounds=(None, None), expected=0.0)
+    tester.tgt_power(priority=2, power=10.0, bounds=(-200.0, 200.0), expected=30.0)
+    tester.tgt_power(priority=2, power=-10.0, bounds=(-200.0, 200.0), expected=-30.0)
+    tester.tgt_power(priority=2, power=0.0, bounds=(-200.0, 200.0), expected=0.0)
+    tester.tgt_power(priority=3, power=20.0, bounds=(-200.0, 200.0), expected=None)
+    tester.tgt_power(priority=1, power=-20.0, bounds=(-200.0, 200.0), expected=-30.0)
+    tester.tgt_power(priority=3, power=None, bounds=(-200.0, 200.0), expected=None)
+    tester.tgt_power(priority=1, power=None, bounds=(-200.0, 200.0), expected=0.0)
 
     tester.tgt_power(priority=2, power=25.0, bounds=(25.0, 50.0), expected=30.0)
     tester.bounds(priority=2, expected_power=30.0, expected_bounds=(-200.0, 200.0))