Skip to content

Commit 0a6b4b3

Browse files
committed
Improve readability of bounds calculation
This makes it easier to integrate exclusion bounds in next commit. Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 29bc38c commit 0a6b4b3

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ def _calc_target_power(
8383
target_power = lower_bound
8484
else:
8585
target_power = next_proposal.preferred_power
86-
low, high = next_proposal.bounds.lower, next_proposal.bounds.upper
87-
if low is not None:
88-
lower_bound = max(lower_bound, low)
89-
if high is not None:
90-
upper_bound = min(upper_bound, high)
86+
proposal_lower, proposal_upper = (
87+
next_proposal.bounds.lower or lower_bound,
88+
next_proposal.bounds.upper or upper_bound,
89+
)
90+
lower_bound = max(lower_bound, proposal_lower)
91+
upper_bound = min(upper_bound, proposal_upper)
9192

9293
return target_power
9394

@@ -206,13 +207,12 @@ def get_status(
206207
for next_proposal in reversed(self._battery_buckets.get(battery_ids, [])):
207208
if next_proposal.priority <= priority:
208209
break
209-
low, high = next_proposal.bounds.lower, next_proposal.bounds.upper
210-
calc_lower_bound = lower_bound
211-
calc_upper_bound = upper_bound
212-
if low is not None:
213-
calc_lower_bound = max(calc_lower_bound, low)
214-
if high is not None:
215-
calc_upper_bound = min(calc_upper_bound, high)
210+
proposal_lower, proposal_upper = (
211+
next_proposal.bounds.lower or lower_bound,
212+
next_proposal.bounds.upper or upper_bound,
213+
)
214+
calc_lower_bound = max(lower_bound, proposal_lower)
215+
calc_upper_bound = min(upper_bound, proposal_upper)
216216
if calc_lower_bound <= calc_upper_bound:
217217
lower_bound = calc_lower_bound
218218
upper_bound = calc_upper_bound

0 commit comments

Comments
 (0)