EV-10 round 3: grade the floor case on the same landing with and without the car; per-quarter latches independent of the cover option; stricter write-mute test
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -215,24 +215,60 @@ class _G:
|
||||
|
||||
|
||||
def explains(proj_w, car_w, *, floor=True, cover=True, car_so_far_w=None,
|
||||
within_aim=False):
|
||||
c = _Car(cover, car_w)
|
||||
p = _Proj(proj_w)
|
||||
c._carq = {"key": p.block_start,
|
||||
"ws": (car_w if car_so_far_w is None else car_so_far_w)
|
||||
* p.elapsed_s, "mono": 0.0}
|
||||
c.car_cycle(p, _G(floor, within_aim=within_aim), 4450.0, None)
|
||||
within_aim=False, earlier=(), block=0, c=None, at=0.0):
|
||||
"""One cycle of `car_cycle` on a stub; `earlier` are projections of
|
||||
cycles before it in the same quarter (they latch SAFETY-126's test)."""
|
||||
c = c or _Car(cover, car_w)
|
||||
c.w = car_w
|
||||
for k, e in enumerate(tuple(earlier) + (proj_w,)):
|
||||
p = _Proj(e)
|
||||
p.block_start = p.block_start + timedelta(minutes=15 * block)
|
||||
c._now = at - len(earlier) + k
|
||||
c._carq = {"key": p.block_start,
|
||||
"ws": ((car_w or 0.0) if car_so_far_w is None else car_so_far_w)
|
||||
* p.elapsed_s, "mono": c._now}
|
||||
c.car_cycle(p, _G(floor, within_aim=within_aim), 4450.0, None)
|
||||
return c.car_explains
|
||||
|
||||
|
||||
check("rule: the alarm's test is true with the car (4468 W, the batteries "
|
||||
"at 0 W land 4485 W) and false without it (768 W): the car explains it, "
|
||||
"with the projection under the aim", explains(4468.0, 3700.0))
|
||||
check("rule: under the aim, the quarter's test latched by the car's share "
|
||||
"(4600 W earlier), the car explains the alarm (the positive under-aim "
|
||||
"case; a single 4300 W cycle has no landing miss to explain, so it "
|
||||
"needs the earlier cycle)", explains(4300.0, 3700.0, earlier=(4600.0,)))
|
||||
check("rule: where the alarm would not fire anyway nothing is explained",
|
||||
not explains(4300.0, 3700.0, within_aim=True))
|
||||
check("rule: without the car it is still over the aim: the car does not "
|
||||
"explain it", not explains(9000.0, 3700.0))
|
||||
check("rule: no car power, no explanation", not explains(9000.0, 0.0))
|
||||
check("rule: no car power, no explanation", not explains(4300.0, 0.0))
|
||||
check("rule: ...also when the test was latched earlier in the quarter",
|
||||
not explains(4300.0, 0.0, earlier=(4600.0,))
|
||||
and not explains(9000.0, 0.0))
|
||||
check("rule: an untrusted car figure (None) explains nothing",
|
||||
not explains(4300.0, None, earlier=(4600.0,)))
|
||||
# the latches: per quarter, and independent of the cover option
|
||||
c4 = _Car(True, 3700.0)
|
||||
explains(9000.0, 3700.0, c=c4, block=0) # the house needs it: latched
|
||||
check("latch: in the same quarter the house need stays latched, so the car "
|
||||
"does not explain", not explains(4300.0, 3700.0, c=c4, block=0, at=10.0))
|
||||
check("latch: a new quarter starts clean: the car alone explains it again",
|
||||
explains(4300.0, 3700.0, c=c4, block=1, at=1000.0,
|
||||
earlier=(4600.0,)))
|
||||
c5 = _Car(False, 3700.0) # cover OFF
|
||||
explains(9000.0, 3700.0, c=c5, block=0) # the house needs it
|
||||
c5.o["ev_batt_cover"] = True # ... and the option flips
|
||||
check("latch: the option flipping to ON does not lose a house need seen "
|
||||
"while it was off", not explains(4300.0, 3700.0, c=c5, block=0, at=10.0))
|
||||
c6 = _Car(True, 3700.0)
|
||||
explains(9000.0, 3700.0, c=c6, block=0)
|
||||
c6.o["ev_batt_cover"] = False
|
||||
explains(4300.0, 3700.0, c=c6, block=0, at=10.0)
|
||||
c6.o["ev_batt_cover"] = True
|
||||
check("latch: ... nor does flipping it off and on again",
|
||||
not explains(4300.0, 3700.0, c=c6, block=0, at=20.0))
|
||||
|
||||
check("rule: the guard is not floor-limited or saturated: nothing to explain",
|
||||
not explains(4300.0, 3700.0, floor=False))
|
||||
|
||||
@@ -490,32 +526,36 @@ check("Manual: two writes of ours, never 'another writer' in the tracker",
|
||||
|
||||
async def failed_write_then_outside(how):
|
||||
"""A write that RAISES or returns FAILURE must still close the self-mute:
|
||||
a later outside change shows the row."""
|
||||
it ends 15 s after the write returned, and a later outside change shows
|
||||
the row."""
|
||||
w = World()
|
||||
await w.step(3)
|
||||
await w.c.handle_action("car_mode", value="manual")
|
||||
ret = []
|
||||
|
||||
async def bad(a):
|
||||
await w.sleep(1.0)
|
||||
ret.append(w.t) # when the write came back
|
||||
if how == "raise":
|
||||
raise RuntimeError("the charger link broke")
|
||||
return False
|
||||
w.drv.write_current = bad
|
||||
await w.c.handle_action("car_current", value=12)
|
||||
await w.step(3) # the write is tried
|
||||
closed = (bool(ret) and w.c.car.mute_until <= ret[-1] + 15.0 + 1e-6)
|
||||
await w.c.handle_action("car_mode", value="off")
|
||||
await w.step(20) # past the 15 s mute
|
||||
w.sim.set_current(7) # somebody else
|
||||
await w.step(3)
|
||||
return w
|
||||
return w, closed
|
||||
|
||||
|
||||
for how in ("raise", "fail"):
|
||||
wf = asyncio.run(failed_write_then_outside(how))
|
||||
wf, closed = asyncio.run(failed_write_then_outside(how))
|
||||
check(f"a write that {'raises' if how == 'raise' else 'returns failure'}"
|
||||
": the mute closes within 15 s, and a later outside change shows "
|
||||
"the row", wf.c.car.mute_until < wf.t
|
||||
and "charger_writer" in wf.rows())
|
||||
": the mute ends within 15 s of the write's return, and a later "
|
||||
"outside change shows the row",
|
||||
closed and "charger_writer" in wf.rows())
|
||||
|
||||
print()
|
||||
print("FAIL: " + ", ".join(fails) if fails else "PASS: every check passed")
|
||||
|
||||
Reference in New Issue
Block a user