MAINT-28 fix-forward: the peak pause ends only on a settled house estimate, and a pack under its peak reserve gives nothing for the house while it holds
Rig FAIL (TEST-23, f3f9483). F-1: the hold ended at each guard step because
grid + site_batt_w added a new meter reading to a battery reading up to 10 s
old. It now ends only when no battery reading may pre-date a step up of its
command (Controller._batts_settled()). F-2: while the pause holds, a pack in
maintenance CHARGE at or under its peak reserve is limited to 0 W, so it gives
only what the guard claims for the peak. Sim: Lag.batt_period_s (a held 10 s
register). Tests: test_maint28b.py. DECISIONS updated.
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude
parent
f3f9483d9c
commit
34b81e8aeb
@@ -574,10 +574,11 @@ class CycleMixin:
|
||||
else float(self.grid) + float(self.site_batt_w))
|
||||
_susp = peakguard.shaping_suspended(
|
||||
self.peak_guard, self.peak_fc, maint_aim)
|
||||
_m28 = (len(self.inverters) > 1
|
||||
and maint_aim > self.peak_aim_w())
|
||||
self._maint_peak_hold = peakguard.shaping_held(
|
||||
_susp, _peak_held and len(self.inverters) > 1
|
||||
and maint_aim > self.peak_aim_w(),
|
||||
self.peak_fc, maint_aim, house)
|
||||
_susp, _peak_held and _m28, self.peak_fc, maint_aim,
|
||||
house, self._batts_settled())
|
||||
if self._maint_peak_hold:
|
||||
# Edge-logged: level-logging here would write one line per
|
||||
# cycle for as long as the event lasts and flush the 40-line
|
||||
@@ -588,6 +589,11 @@ class CycleMixin:
|
||||
"suspended so the peak claim is not "
|
||||
"contradicted",
|
||||
hint=messages.hint("maint_paused"))
|
||||
# MAINT-28: under its peak reserve this pack gives only
|
||||
# what the guard claims. DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md
|
||||
shape = ((0.0, "peak reserve")
|
||||
if _m28 and inv.name in self._under_reserve()
|
||||
else None)
|
||||
else:
|
||||
self._maint_shape_suspended = False
|
||||
hi = 0.0
|
||||
@@ -604,10 +610,12 @@ class CycleMixin:
|
||||
floor = self._charge_headroom(floor, claims)
|
||||
if floor > 0:
|
||||
hi, reason = -floor, "cheap-window charge"
|
||||
shape = (hi, reason)
|
||||
if shape is not None:
|
||||
# PER-INVERTER, like the SET above and for the same reason -
|
||||
# the shaping is about the pack being charged, which is `inv`.
|
||||
claims.append(Claim.limit("maintenance", P_MAINT_SHAPE, hi=hi,
|
||||
reason=reason,
|
||||
claims.append(Claim.limit("maintenance", P_MAINT_SHAPE,
|
||||
hi=shape[0], reason=shape[1],
|
||||
actuator=self.actuator_of("maintenance",
|
||||
inv)))
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ from . import packmode
|
||||
from . import priceruns
|
||||
from . import solarfc
|
||||
from . import control as _ctl
|
||||
from . import freshness
|
||||
from . import messages
|
||||
from .maintenance import CHARGE, DRAIN, HOLD, IDLE, MaintConfig, POWER_MOVING
|
||||
from .mqtt import MODE_LABELS, USE_OFF, USE_ON, unit_slugs, unit_state_key
|
||||
@@ -49,6 +50,11 @@ EDGE_HOLD_S = _ctl.PLANT_SETTLE_S
|
||||
HOUSE_PROFILE_KEY = "house_profile"
|
||||
|
||||
|
||||
# MAINT-28: a step of a battery's command, in W, after which its reading is not
|
||||
# current until a changed one arrives (`Controller._batts_settled()`).
|
||||
MAINT_STEP_W = 100.0
|
||||
|
||||
|
||||
# OPT-34: the level of a night grid charge that has started, so it does not
|
||||
# drop when the forecast goes (`Controller._latch_charge()`).
|
||||
CHARGE_LATCH_KEY = "night_charge_latch"
|
||||
@@ -711,6 +717,36 @@ class TradeMixin:
|
||||
lo = hi = float(inv.batt)
|
||||
self._read_span[inv.name] = (min(lo, cmd), max(hi, cmd), since)
|
||||
|
||||
def _batts_settled(self) -> bool:
|
||||
"""MAINT-28: False while a battery reading may pre-date a step UP of
|
||||
its command, so `grid + site_batt_w` is a new grid and an old battery.
|
||||
DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md"""
|
||||
now, ok = self._now_mono, True
|
||||
if now is None:
|
||||
return True
|
||||
for inv in self.inverters:
|
||||
cmd = float(inv.standing_w())
|
||||
seen = self._m28_step.get(inv.name)
|
||||
if seen is None:
|
||||
seen = self._m28_step[inv.name] = (cmd, None)
|
||||
elif abs(cmd - seen[0]) >= MAINT_STEP_W:
|
||||
seen = self._m28_step[inv.name] = (
|
||||
cmd, now if cmd > seen[0] else seen[1])
|
||||
at = seen[1]
|
||||
if at is None or now - at >= freshness.BATT_OBLIGED_S:
|
||||
continue
|
||||
got = inv.batt_fresh.changed_mono
|
||||
if got is None or got < at + freshness.PLANT_SETTLE_S:
|
||||
ok = False
|
||||
return ok
|
||||
|
||||
def _under_reserve(self) -> frozenset:
|
||||
"""MAINT-28: the batteries at or under their peak reserve now
|
||||
(`peakguard.reserve_split()`). DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md"""
|
||||
floor = float(self.o.get(
|
||||
"peak_soc_floor", peakguard.PEAK_OPTION_DEFAULTS["peak_soc_floor"]))
|
||||
return frozenset(peakguard.reserve_split(self.packs, floor)[1])
|
||||
|
||||
def _reseed_drop(self, live) -> None:
|
||||
"""SAFETY-96, N>=2: a battery that drops out of the split (stale link)
|
||||
leaves the loop's start point, so the others take over at one slew step
|
||||
|
||||
@@ -506,6 +506,7 @@ class Controller(InputsMixin, WritesMixin, TradeMixin, CycleMixin, AlarmsMixin,
|
||||
self._peak_needed = False
|
||||
self._maint_shape_suspended = False
|
||||
self._maint_peak_hold = False # MAINT-28
|
||||
self._m28_step = {} # MAINT-28: unit -> (command, step at)
|
||||
# OPT-11: battery modes, off by default (SAFETY-10 section 1). Each
|
||||
# battery's mode and on/off switch live in the store, not in options,
|
||||
# so a change applies at once (`pack_use`, `pack_mode`).
|
||||
|
||||
@@ -450,18 +450,23 @@ def shaping_suspended(decision, peak_forecast_w, cap_w) -> bool:
|
||||
return decision is not None and decision.engaged
|
||||
|
||||
|
||||
def shaping_held(suspended, held, peak_forecast_w, aim_w, house_w) -> bool:
|
||||
def shaping_held(suspended, held, peak_forecast_w, aim_w, house_w,
|
||||
settled=True) -> bool:
|
||||
"""MAINT-28. `suspended` (`shaping_suspended()`'s answer), kept on while
|
||||
`held` until the house is `MAINT_RESUME_UNDER_W` under `aim_w`
|
||||
(`peak_forecast_w` stands in for an unread house; neither read: not held,
|
||||
as SAFETY-63). Only ever pauses the maintenance charge, never a cut-back.
|
||||
as SAFETY-63) and `settled` (no battery reading older than its last
|
||||
command step, so `house_w` is not a new grid plus an old battery). Only
|
||||
ever pauses the maintenance charge, never a cut-back.
|
||||
DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md."""
|
||||
if suspended:
|
||||
return True
|
||||
if not held:
|
||||
return False
|
||||
level = house_w if house_w is not None else peak_forecast_w
|
||||
return level is not None and level > float(aim_w) - MAINT_RESUME_UNDER_W
|
||||
if level is None:
|
||||
return False
|
||||
return level > float(aim_w) - MAINT_RESUME_UNDER_W or not settled
|
||||
|
||||
|
||||
def cap_floor(decision, cap_w):
|
||||
|
||||
Reference in New Issue
Block a user