Skip to content

bidi charging: fix calculation of medium current #3196

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
LKuemmel merged 1 commit into from
Mar 11, 2026
Merged

bidi charging: fix calculation of medium current #3196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/control/algorithm/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
def get_medium_charging_current(currents: List[float]) -> float:
"""Ermittelt den mittleren Ladestrom der Phasen, auf denen geladen wird.

Copilot AI Mar 10, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are pytest-based tests for the algorithm package, but this behavioral change (including negative currents via abs()) isn’t covered by a unit test. Add a small test for get_medium_charging_current that includes negative currents (e.g., [-6, -6, 0] -> -6, and values below the 0.5A threshold) to prevent regressions for bidirectional charging.

Suggested change
"""Ermittelt den mittleren Ladestrom der Phasen, auf denen geladen wird.
"""Ermittelt den mittleren Ladestrom der Phasen, auf denen geladen wird.
Beispiele (doctests):
Negative Ströme (bidirektionales Laden) werden über ihren Betrag für die
Schwellwertprüfung berücksichtigt, der Mittelwert bleibt jedoch negativ:
>>> get_medium_charging_current([-6.0, -6.0, 0.0])
-6.0
Liegen alle Ströme unterhalb der 0.5A-Schwelle (bezogen auf den Betrag),
so wird 0.0 zurückgegeben:
>>> get_medium_charging_current([0.4, -0.3, 0.0])
0.0

Copilot uses AI. Check for mistakes.

Copilot AI Mar 10, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The docstring still describes “Ladestrom … auf denen geladen wird” (charging), but the logic now treats negative currents with abs(x) >= 0.5 as “in use” as well (bidi discharge). Please update the docstring to clarify that phases are considered active based on current magnitude and that the returned average can be negative during discharge.

Suggested change
"""Ermittelt den mittleren Ladestrom der Phasen, auf denen geladen wird.
"""Ermittelt den mittleren Strom der aktiven Phasen.
Eine Phase gilt als aktiv, wenn der Betrag des Stroms mindestens 0,5 A beträgt
(abs(I) >= 0.5). Es wird der arithmetische Mittelwert der Ströme aller aktiven
Phasen zurückgegeben. Der zurückgegebene Mittelwert kann negativ sein, wenn
überwiegend entladen wird (bidirektionaler Betrieb). Sind keine aktiven Phasen
vorhanden, wird 0.0 zurückgegeben.

Copilot uses AI. Check for mistakes.
"""
if any(x >= 0.5 for x in currents):
return sum(x for x in currents if x >= 0.5) / len([x for x in currents if x >= 0.5])
if any(abs(x) >= 0.5 for x in currents):
return sum(x for x in currents if abs(x) >= 0.5) / len([x for x in currents if abs(x) >= 0.5])
Comment on lines +7 to +8

Copilot AI Mar 10, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The list of “active” phase currents (|x| >= 0.5) is recomputed multiple times (any(), sum(), and len([...])). Consider filtering once into a local list and then using it for both sum/len to avoid duplication and keep the logic easier to maintain.

Suggested change
if any(abs(x) >= 0.5 for x in currents):
return sum(x for x in currents if abs(x) >= 0.5) / len([x for x in currents if abs(x) >= 0.5])
active_currents = [x for x in currents if abs(x) >= 0.5]
if active_currents:
return sum(active_currents) / len(active_currents)

Copilot uses AI. Check for mistakes.
else:
return 0.0