Replace SortedSet with a set in the Matryoshka algorithm

The `SortedSet` implementation appears to be buggy, so it is being
replaced with `set`.

This is slower in theory, but not much difference is expected in
practice.

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

Author: shsms

src/frequenz/sdk/actor/_power_managing/_base_classes.py

@@ -252,6 +252,14 @@ def __eq__(self, other: object) -> bool:
 
         return self.priority == other.priority and self.source_id == other.source_id
 
+    def __hash__(self) -> int:
+        """Get the hash of the proposal.
+
+        Returns:
+            The hash of the proposal.
+        """
+        return hash((self.priority, self.source_id))
+
 
 class Algorithm(enum.Enum):
     """The available algorithms for the power manager."""

src/frequenz/sdk/actor/_power_managing/_matryoshka.py

@@ -29,7 +29,6 @@
 from ...timeseries import Power
 from . import _bounds
 from ._base_classes import BaseAlgorithm, Proposal, _Report
-from ._sorted_set import SortedSet
 
 if typing.TYPE_CHECKING:
     from ...timeseries._base_types import SystemBounds
@@ -44,12 +43,12 @@ class Matryoshka(BaseAlgorithm):
     def __init__(self, max_proposal_age: timedelta) -> None:
         """Create a new instance of the matryoshka algorithm."""
         self._max_proposal_age_sec = max_proposal_age.total_seconds()
-        self._component_buckets: dict[frozenset[int], SortedSet[Proposal]] = {}
+        self._component_buckets: dict[frozenset[int], set[Proposal]] = {}
         self._target_power: dict[frozenset[int], Power] = {}
 
     def _calc_target_power(
         self,
-        proposals: SortedSet[Proposal],
+        proposals: set[Proposal],
         system_bounds: SystemBounds,
     ) -> Power:
         """Calculate the target power for the given components.
@@ -83,7 +82,7 @@ def _calc_target_power(
             exclusion_bounds = system_bounds.exclusion_bounds
 
         target_power = Power.zero()
-        for next_proposal in reversed(proposals):
+        for next_proposal in sorted(proposals, reverse=True):
             if upper_bound < lower_bound:
                 break
             if next_proposal.preferred_power:
@@ -183,9 +182,10 @@ def calculate_target_power(
             return None
 
         if proposal is not None:
-            self._component_buckets.setdefault(component_ids, SortedSet()).insert(
-                proposal
-            )
+            bucket = self._component_buckets.setdefault(component_ids, set())
+            if proposal in bucket:
+                bucket.remove(proposal)
+            bucket.add(proposal)
 
         # If there has not been any proposal for the given components, don't calculate a
         # target power and just return `None`.
@@ -243,7 +243,9 @@ def get_status(
         ):
             exclusion_bounds = system_bounds.exclusion_bounds
 
-        for next_proposal in reversed(self._component_buckets.get(component_ids, [])):
+        for next_proposal in sorted(
+            self._component_buckets.get(component_ids, []), reverse=True
+        ):
             if next_proposal.priority <= priority:
                 break
             proposal_lower = next_proposal.bounds.lower or lower_bound
@@ -286,4 +288,4 @@ def drop_old_proposals(self, loop_time: float) -> None:
                 if (loop_time - proposal.creation_time) > self._max_proposal_age_sec:
                     to_delete.append(proposal)
             for proposal in to_delete:
-                bucket.delete(proposal)
+                bucket.remove(proposal)