Skip to content

Commit 893fe1c

Browse files
Simplify working batteries check
The _get_working_batteries method had unnecessary complexity and was redundant as it was returning the original set of batteries if there was any working battery. Therefore, this commit removes the _get_working_batteries method and simplifies the check for working batteries. Signed-off-by: Daniel Zullo <[email protected]>
1 parent ebeef67 commit 893fe1c

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

src/frequenz/sdk/actor/power_distributing/power_distributing.py

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -537,24 +537,6 @@ def _get_components_pairs(
537537

538538
return bat_inv_map, inv_bat_map
539539

540-
def _get_working_batteries(self, batteries: Set[int]) -> Set[int]:
541-
"""Get subset with working batteries.
542-
543-
If none of the given batteries are working, then treat all of them
544-
as working.
545-
546-
Args:
547-
batteries: requested batteries
548-
549-
Returns:
550-
Subset with working batteries or input set if none of the given batteries
551-
are working.
552-
"""
553-
working_batteries = self._all_battery_status.get_working_batteries(batteries)
554-
if len(working_batteries) == 0:
555-
return batteries
556-
return working_batteries
557-
558540
def _get_components_data(self, batteries: Set[int]) -> List[InvBatPair]:
559541
"""Get data for the given batteries and adjacent inverters.
560542
@@ -568,7 +550,9 @@ def _get_components_data(self, batteries: Set[int]) -> List[InvBatPair]:
568550
Pairs of battery and adjacent inverter data.
569551
"""
570552
pairs_data: List[InvBatPair] = []
571-
working_batteries = self._get_working_batteries(batteries)
553+
working_batteries = (
554+
self._all_battery_status.get_working_batteries(batteries) or batteries
555+
)
572556

573557
for battery_id in working_batteries:
574558
if battery_id not in self._battery_receivers:

0 commit comments

Comments
 (0)