Skip to content

Commit be49479

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 309353f commit be49479

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
@@ -551,24 +551,6 @@ def _get_components_pairs(
551551

552552
return bat_inv_map, inv_bat_map
553553

554-
def _get_working_batteries(self, batteries: Set[int]) -> Set[int]:
555-
"""Get subset with working batteries.
556-
557-
If none of the given batteries are working, then treat all of them
558-
as working.
559-
560-
Args:
561-
batteries: requested batteries
562-
563-
Returns:
564-
Subset with working batteries or input set if none of the given batteries
565-
are working.
566-
"""
567-
working_batteries = self._all_battery_status.get_working_batteries(batteries)
568-
if len(working_batteries) == 0:
569-
return batteries
570-
return working_batteries
571-
572554
def _get_components_data(self, batteries: Set[int]) -> List[InvBatPair]:
573555
"""Get data for the given batteries and adjacent inverters.
574556
@@ -582,7 +564,9 @@ def _get_components_data(self, batteries: Set[int]) -> List[InvBatPair]:
582564
Pairs of battery and adjacent inverter data.
583565
"""
584566
pairs_data: List[InvBatPair] = []
585-
working_batteries = self._get_working_batteries(batteries)
567+
working_batteries = (
568+
self._all_battery_status.get_working_batteries(batteries) or batteries
569+
)
586570

587571
for battery_id in working_batteries:
588572
if battery_id not in self._battery_receivers:

0 commit comments

Comments
 (0)