OPT-11 P1: per-battery mode limits, on/off, solar order
A battery's mode is a soft unit limit (source `mode`, P_MODE 35) kept
apart from the hard limits in pre_resolve(). The allocator applies it
only while the site target is decided at or below 35 (new
Resolution.deciding_priority), so the peak floor releases it and a mode
`hi` never meets the site `lo`. At N=1 resolve() applies the same rule
to the site target after stage 2. A mode range without 0 W is dropped
as a software fault, so REFUSE_SIGN stays unreachable from a mode.
compute() gets the loop bound (sum over live units of hard limits with
modes applied), so the loop never asks for watts no battery may give
and the saturation freeze never parks on them. While charging, Leftover
solar weighs 0 so Solar first fills first. Store keys pack_use and
pack_mode per battery, set by two new /action values; Off stops and
skips maintenance with a log line. Minimal Batteries cards (EN/NL).
Off by default (battery_modes_enabled); off, commands are byte-identical
to a5dddad at N=1 and N=2 (test_modes.py part 1).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1156,6 +1156,118 @@ check("...while the GAIN does own it: 0.6 -> 0.3 -> 0.2 falls monotonically, at
|
||||
_R["gain03"]["over"] < _R["rail"]["over"]
|
||||
and _R["gain02"]["over"] < _R["gain03"]["over"])
|
||||
|
||||
print()
|
||||
print("OPT-11: the loop is told what the battery modes allow")
|
||||
# compute(bound=(lo, hi)) is the site output bound: the sum over live units of
|
||||
# (hard limits with the mode applied), allocator.loop_bound(). Without it the
|
||||
# loop asks for watts no battery may give, the allocator reports them unmet,
|
||||
# and the saturation freeze parks the target on them (SAFETY-73 section 1).
|
||||
import random as _random # noqa: E402
|
||||
from app.control import MODE_BOUND # noqa: E402
|
||||
from named_absence import present # noqa: E402
|
||||
|
||||
TB = Tuning(gain=0.6, max_w=5000.0, slew_w=400.0, deadband_w=15.0,
|
||||
step_w=10, target_grid_w=-10.0)
|
||||
|
||||
|
||||
def closed_loop(cycles, load, *, bound=None, deliver=None, change=None):
|
||||
"""A plant that follows 94 % of the command each cycle, capped at
|
||||
`deliver` (what the allocator can place). `change(i)` may return a new
|
||||
bound. Rows: (command, actual, sat_count, frozen, reason, i_w)."""
|
||||
prev, actual, sat, i_w, rows = 0.0, 0.0, 0, None, []
|
||||
for i in range(cycles):
|
||||
if change is not None:
|
||||
bound = change(i, bound)
|
||||
d = compute(prev, load - actual, actual, TB, sat, i_w, bound=bound)
|
||||
prev, sat, i_w = d.target_w, d.sat_count, d.i_w
|
||||
cmd = prev if deliver is None else max(deliver[0],
|
||||
min(deliver[1], prev))
|
||||
actual = actual + 0.94 * (cmd - actual)
|
||||
rows.append((prev, actual, sat, d.frozen, d.reason, d.i_w))
|
||||
return rows
|
||||
|
||||
|
||||
# (a) One battery may give 800 W (the other is Off), the house takes 3000 W.
|
||||
_with = closed_loop(40, 3000.0, bound=(-800.0, 800.0))
|
||||
_without = closed_loop(40, 3000.0, deliver=(-800.0, 800.0))
|
||||
print(f" house 3000 W, modes allow 800 W: with the bound the command ends "
|
||||
f"at {nth(_with, -1)[0]:.0f} W (sat {max(r[2] for r in _with)}, reason "
|
||||
f"{nth(_with, -1)[4]}); without it {nth(_without, -1)[0]:.0f} W with "
|
||||
f"{sum(r[3] for r in _without)} frozen cycles")
|
||||
check("⭐ THE LOOP BOUND HOLDS: every command and every integrator value "
|
||||
"stays inside [-800, 800], and the command settles at the bound",
|
||||
all(-800.0 <= r[0] <= 800.0 and -800.0 <= r[5] <= 800.0 for r in _with)
|
||||
and present(nth(_with, -1)) and nth(_with, -1)[0] == 800.0
|
||||
and nth(_with, -1)[4] == MODE_BOUND)
|
||||
_big = []
|
||||
_pv, _iw, _sat = 0.0, None, 0
|
||||
for _i in range(30):
|
||||
_d = compute(_pv, 12000.0, _pv, TB, _sat, _iw, bound=(-800.0, 800.0))
|
||||
_pv, _iw, _sat = _d.target_w, _d.i_w, _d.sat_count
|
||||
_big.append(_d)
|
||||
check("...and a house far beyond what the modes allow (12 kW against 800 W) "
|
||||
"does not read as the loop winding into its rail: SAFETY-03's flags "
|
||||
"stay false on every cycle",
|
||||
_big and not any(d.i_clamped or d.clamped for d in _big)
|
||||
and all(d.target_w <= 800.0 for d in _big))
|
||||
check("⭐ NO SATURATION FREEZE from unmet watts: sat_count never reaches the "
|
||||
"freeze and no cycle is frozen",
|
||||
not any(r[3] for r in _with)
|
||||
and max(r[2] for r in _with) < TB.saturation_cycles)
|
||||
check("...and the same site WITHOUT the bound is the failure it removes: the "
|
||||
"loop asks past 800 W, the plant cannot follow and the freeze engages",
|
||||
any(r[3] for r in _without) and max(r[0] for r in _without) > 800.0)
|
||||
|
||||
# (b) Every battery switched off: the bound is [0, 0].
|
||||
_off = closed_loop(20, 2500.0, bound=(0.0, 0.0))
|
||||
check("all batteries off: the loop asks 0 W on every cycle, with the "
|
||||
"integrator at 0, and never freezes",
|
||||
all(r[0] == 0.0 and r[5] == 0.0 and not r[3] for r in _off))
|
||||
|
||||
# (c) A mode closes while the battery gives 2000 W: the ask drops at once.
|
||||
_close = closed_loop(30, 2000.0, bound=(-5000.0, 5000.0),
|
||||
change=lambda i, b: (0.0, 0.0) if i >= 20 else b)
|
||||
check("a mode that closes mid-run drops the ask to 0 W on the same cycle "
|
||||
"(no slew steps of unmet watts) and carries no integrator past it",
|
||||
present(nth(_close, 20)) and nth(_close, 19)[0] > 1500.0
|
||||
and nth(_close, 20)[0] == 0.0
|
||||
and nth(_close, 20)[5] == 0.0 and not any(r[3] for r in _close[20:]))
|
||||
|
||||
# (d) Rounding never steps outside the bound.
|
||||
_q = compute(1000.0, 3000.0, 1000.0, TB, 0, 1236.0, bound=(-5000.0, 1236.0))
|
||||
check("quantising to 10 W does not step outside the bound: 1236 W becomes "
|
||||
"1230 W, not 1240 W", _q.target_w == 1230.0)
|
||||
_qn = compute(-1000.0, -3000.0, -1000.0, TB, 0, -1236.0,
|
||||
bound=(-1236.0, 5000.0))
|
||||
check("...on the charge side too: -1236 W becomes -1230 W",
|
||||
_qn.target_w == -1230.0)
|
||||
|
||||
# (e) A bound that leaves out 0 W is a fault and is not obeyed.
|
||||
_rngc = _random.Random(1131)
|
||||
_same, _nb = True, 0
|
||||
for _ in range(4000):
|
||||
args = (_rngc.uniform(-5000, 5000), _rngc.uniform(-4000, 4000),
|
||||
_rngc.uniform(-5000, 5000), TB, _rngc.randint(0, 5),
|
||||
_rngc.choice((None, _rngc.uniform(-6000, 6000))))
|
||||
_nb += 1
|
||||
if (compute(*args, bound=(200.0, 900.0)) != compute(*args)
|
||||
or compute(*args, bound=None) != compute(*args)):
|
||||
_same = False
|
||||
check(f"a bound that leaves out 0 W is ignored, and bound=None is the law as "
|
||||
f"it was: {_nb} random cycles give the identical Decision",
|
||||
_same and _nb == 4000)
|
||||
|
||||
# (f) Inside the bound nothing changes: a bound wider than every command.
|
||||
_wide = True
|
||||
for _ in range(4000):
|
||||
args = (_rngc.uniform(-4000, 4000), _rngc.uniform(-3000, 3000),
|
||||
_rngc.uniform(-4000, 4000), TB, _rngc.randint(0, 5),
|
||||
_rngc.choice((None, _rngc.uniform(-4000, 4000))))
|
||||
if compute(*args, bound=(-9000.0, 9000.0)) != compute(*args):
|
||||
_wide = False
|
||||
check("a bound wider than the rail changes no Decision (4000 random cycles)",
|
||||
_wide)
|
||||
|
||||
print()
|
||||
if fails:
|
||||
print(f"{len(fails)} FAILED: {', '.join(fails)}")
|
||||
|
||||
Reference in New Issue
Block a user