Mirrors/EOS
1
0
Fork 0
mirror of https://github.com/Akkudoktor-EOS/EOS.git synced 2025-12-14 07:46:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Ruff format

Browse Source
This commit is contained in:
Chris
2024-10-10 15:00:32 +02:00
committed by Andreas
parent 5503b8876c
commit e65eb6b6dd
19 changed files with 101 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/akkudoktoreos/class_ems.py
View File

@@ -30,9 +30,7 @@ class EnergieManagementSystem:
def set_eauto_charge_hours(self, ds: List[int]) -> None:
self.eauto.set_charge_per_hour(ds)
def set_haushaltsgeraet_start(
self, ds: List[int], global_start_hour: int = 0
) -> None:
def set_haushaltsgeraet_start(self, ds: List[int], global_start_hour: int = 0) -> None:
self.haushaltsgeraet.set_startzeitpunkt(ds, global_start_hour=global_start_hour)
def reset(self) -> None:
@@ -48,9 +46,7 @@ class EnergieManagementSystem:
# Ensure arrays have the same length
lastkurve_wh = self.gesamtlast
assert (
len(lastkurve_wh)
== len(self.pv_prognose_wh)
== len(self.strompreis_euro_pro_wh)
len(lastkurve_wh) == len(self.pv_prognose_wh) == len(self.strompreis_euro_pro_wh)
), f"Array sizes do not match: Load Curve = {len(lastkurve_wh)}, PV Forecast = {len(self.pv_prognose_wh)}, Electricity Price = {len(self.strompreis_euro_pro_wh)}"
# Optimized total hours calculation
@@ -86,14 +82,10 @@ class EnergieManagementSystem:
# E-Auto handling
if self.eauto:
geladene_menge_eauto, verluste_eauto = self.eauto.energie_laden(
None, stunde
)
geladene_menge_eauto, verluste_eauto = self.eauto.energie_laden(None, stunde)
verbrauch += geladene_menge_eauto
verluste_wh_pro_stunde[stunde_since_now] += verluste_eauto
eauto_soc_pro_stunde[stunde_since_now] = (
self.eauto.ladezustand_in_prozent()
)
eauto_soc_pro_stunde[stunde_since_now] = self.eauto.ladezustand_in_prozent()
# Process inverter logic
erzeugung = self.pv_prognose_wh[stunde]
@@ -117,9 +109,7 @@ class EnergieManagementSystem:
akku_soc_pro_stunde[stunde_since_now] = self.akku.ladezustand_in_prozent()
# Total cost and return
gesamtkosten_euro = np.nansum(kosten_euro_pro_stunde) - np.nansum(
einnahmen_euro_pro_stunde
)
gesamtkosten_euro = np.nansum(kosten_euro_pro_stunde) - np.nansum(einnahmen_euro_pro_stunde)
# Prepare output dictionary
out: Dict[str, Union[np.ndarray, float]] = {