MAINT-28 fix-forward round 4: the paused pack's cap is its own part of the guard's floor, the largest of the period, per unit
Owner 2026-11-13 ("ok max", relayed by the manager): while the pause holds,
the pack in maintenance CHARGE gives at most the largest floor the guard
claimed in the quarter. The cap is now that pack's own part of the floor
(the floor less what the other units are placed at, split without the cap),
the largest in the 15-minute period, kept per unit (`_m28_hi`). 0 W while
the guard holds it at its reserve. test_maint28b: SoC check stated against
the owner-accepted give (0.70 point, measured 0.64); both-packs-able tests
(B on Cheap hours, B on Solar first); per-unit state and the one-slot
arbitrate. test_maint28 unchanged (5925 W). Pins: test_safety84
n2_charge_banked, test_packshare's one-resolve AST pin (a second call with
the same weights).
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude
parent
fb4a449591
commit
07d23d2eed
@@ -10,7 +10,7 @@ from datetime import datetime, timedelta, timezone
|
||||
from . import arbitrage
|
||||
from .arbiter import (
|
||||
ACTUATOR_SITE, Claim, P_MAINTENANCE, P_MAINT_SHAPE, P_PEAK, SET,
|
||||
pre_resolve,
|
||||
pre_resolve, resolve,
|
||||
)
|
||||
from . import allocator
|
||||
from . import dayplan
|
||||
@@ -53,6 +53,8 @@ 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
|
||||
# MAINT-28: the reason on a paused pack's cap (`Controller._m28_share()`).
|
||||
M28_REASON = "peak hold"
|
||||
|
||||
|
||||
# OPT-34: the level of a night grid charge that has started, so it does not
|
||||
@@ -740,6 +742,42 @@ class TradeMixin:
|
||||
ok = False
|
||||
return ok
|
||||
|
||||
def _m28_share(self, claims, now) -> None:
|
||||
"""MAINT-28: each paused pack's cap (0 W if the guard holds it at its
|
||||
reserve) set to the largest part of the guard's floor left to it in
|
||||
this 15-minute period: the floor less what the other units are placed
|
||||
at in this cycle's split without the cap. Kept per unit in `_m28_hi`,
|
||||
dropped while the unit is not paused or is held.
|
||||
DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md"""
|
||||
floor = max((c.lo for c in claims if c.source == peakguard.SOURCE),
|
||||
default=0.0)
|
||||
g = self.peak_guard
|
||||
held = {self.actuator_of("maintenance", inv) for inv in self.inverters
|
||||
if g is not None and inv.name in g.held}
|
||||
q, seen = int(now.timestamp() // 900), set()
|
||||
for i, c in enumerate(claims):
|
||||
if c.source != "maintenance" or c.reason != M28_REASON \
|
||||
or c.actuator == ACTUATOR_SITE or c.actuator in held:
|
||||
continue
|
||||
seen.add(c.actuator)
|
||||
shares = resolve(claims[:i] + claims[i + 1:], units=self.units,
|
||||
live=self.live_units(), weights=self.pack_weights,
|
||||
reserve=self._held_back()).shares
|
||||
part = max(0.0, floor - sum(float(w) for u, w in shares.items()
|
||||
if u != c.actuator))
|
||||
hi = max(part, self._m28_was(c.actuator, now))
|
||||
self._m28_hi[c.actuator] = (q, hi)
|
||||
claims[i] = dataclasses.replace(c, hi=hi)
|
||||
# A unit not paused (or held at its reserve) starts again from 0 W.
|
||||
for u in set(self._m28_hi) - seen:
|
||||
del self._m28_hi[u]
|
||||
|
||||
def _m28_was(self, u, now) -> float:
|
||||
"""MAINT-28: unit `u`'s cap so far in this 15-minute period, 0 W in
|
||||
a new one (`_m28_share()`)."""
|
||||
q, hi = self._m28_hi.get(u, (None, 0.0))
|
||||
return hi if q == int(now.timestamp() // 900) else 0.0
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user