Skip to content

Fix to repeat of incremental rate adjustments #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
springfall2008 merged 3 commits into from
Feb 1, 2024
Merged

Fix to repeat of incremental rate adjustments #685

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad2d150
Fix to repeat of incremental rate adjustments
springfall2008 Feb 1, 2024
a7efafa
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Feb 1, 2024
a9b3085
Update predbat.py - typo
springfall2008 Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions apps/predbat/predbat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5338,12 +5338,18 @@ def basic_rates(self, info, rtype, prev=None):
for minute in range(start_minutes, end_minutes):
minute_mod = minute % max_minute
if (not date) or (minute >= 0 and minute < max_minute):
if rate_increment:
rates[minute_mod] = rates.get(minute % max_minute, 0.0) + rate
else:
rates[minute_mod] = rate
if load_scaling is not None:
self.load_scaling_dynamic[minute_mod] = load_scaling
minute_index = minute_mod
# For incremental adjustments we have to loop over 24-hour periods
while minute_index < max_minute:
if rate_increment:
rates[minute_index] = rates.get(minute_index, 0.0) + rate
else:
rates[minute_index] = rate
if load_scaling is not None:
self.load_scaling_dynamic[minute_index] = load_scaling
if date or not prev:
break
minute_index += 24 * 60
if not date and not prev:
rates[minute_mod + max_minute] = rate
if load_scaling is not None:
Expand Down