SirStone
81af5854df
MY ERROR. `aed579b` committed `ModularBot.nim` (which wires the new gun as id 15) and `guns/tm_horizon.nim`, but I staged only three files and left job-72's RACK REGISTRATION behind in the working tree. Consequence at HEAD: - `common_libs/gun_harness/selector.nim` still had the 15-entry rack table (ids 0..14) with no TMHORIZON name, so - `TR_RACK_TMHORIZON` was never read (a silent no-op), and - id 15 is PAST the table, and `rackAdmitted` documents "an id past the membership table is admitted" -> **TMHORIZON was admitted unconditionally**. So the committed default rack was `Pattern + TMHORIZON`, not the intended `Pattern only`, and the gun could not be switched off by env at HEAD. This was caught by a live A/B job that had to work around it with `GUN_RACK_DISABLE=15`. FIX (this commit): the rack table goes to 16 entries with `TMHORIZON` appended at id 15 defaulting to `rmOff`, plus the two tests whose length literals follow it (`test_rack_membership` 15->16, `test_tm_pattern_registration` 15->16). `DefaultRackMembership` is again Pattern-only with every other gun `off`. NOTE ON SCOPE: `selector.nim` in the working tree also contains a CONCURRENT job's power-policy threading (an `enemyEnergy` parameter). That work is still in flight and is deliberately NOT included here - only the three rack hunks were staged. The remainder stays unstaged for its own commit. The lesson, recorded because it has bitten twice tonight in different forms: a change is not committed until its registration/table counterpart is, and `git add` of a hand-picked file list is exactly how a half-change ships.
207 lines
8.6 KiB
Nim
207 lines
8.6 KiB
Nim
## Offline guard for the TM pattern gun rack registration (id 14) and the
|
|
## default-path parity proof.
|
|
##
|
|
## Covers:
|
|
## * RackGunNames / DefaultRackMembership carry the new gun, defaulting `off`;
|
|
## * `TR_RACK_TMPATTERN` parses both|1v1|melee|off like every other gun;
|
|
## * the DEFAULT membership table is the shipped `onlyPattern` rack (Pattern
|
|
## admitted, TMPATTERN and every other gun `off`);
|
|
## * an EXPLICIT old-rack membership (guns 0..13 both, gun 14 off) still
|
|
## reproduces the pre-change all-`both` 14-gun selection, RNG draw for RNG
|
|
## draw, through both `bestGun` and the live `selectGun` — so admitting
|
|
## TMPATTERN never perturbs the old rack when it is selected explicitly;
|
|
## * `initTmRadialGun()` selects the radial target mode;
|
|
## * the deferred-label fix (Task 2) resolves every fired virtual bullet:
|
|
## a radial-mode replay ends with `labelMisses == 0` and non-zero training.
|
|
##
|
|
## Run: nim c -r common_libs/tests/test_tm_pattern_registration.nim
|
|
|
|
import std/[random, tables, os]
|
|
import gun_harness/gun_interface
|
|
import gun_harness/virtual_bullets
|
|
import gun_harness/selector
|
|
import gun_harness/offline_range
|
|
import guns/tm_pattern
|
|
|
|
const TmPatternId = 14
|
|
|
|
var failures = 0
|
|
proc check(name: string, ok: bool) =
|
|
if ok: echo "PASS: ", name
|
|
else: echo "FAIL: ", name; inc failures
|
|
|
|
proc recordHit(fw: var FitnessWindow, hit: bool) =
|
|
fw.hits[fw.head] = hit
|
|
fw.head = (fw.head + 1) mod WindowSize
|
|
inc fw.count
|
|
|
|
proc seedWindow(t: var VirtualTracker, targetId, gunId, binIdx, hits, misses: int) =
|
|
if targetId notin t.fitness:
|
|
t.fitness[targetId] = newSeq[GunFitness](t.numGuns)
|
|
var fw = addr t.fitness[targetId][gunId].bins[binIdx]
|
|
for _ in 0..<hits: recordHit(fw[], true)
|
|
for _ in 0..<misses: recordHit(fw[], false)
|
|
|
|
proc seedOldRack(t: var VirtualTracker, targetId: int) =
|
|
## 14 deterministic rates for the old rack.
|
|
seedWindow(t, targetId, 0, 0, 60, 40)
|
|
seedWindow(t, targetId, 1, 0, 40, 60)
|
|
seedWindow(t, targetId, 2, 0, 80, 20)
|
|
seedWindow(t, targetId, 3, 0, 55, 45)
|
|
seedWindow(t, targetId, 4, 0, 20, 80)
|
|
seedWindow(t, targetId, 5, 0, 70, 30)
|
|
seedWindow(t, targetId, 6, 0, 45, 55)
|
|
seedWindow(t, targetId, 7, 0, 65, 35)
|
|
seedWindow(t, targetId, 8, 0, 30, 70)
|
|
seedWindow(t, targetId, 9, 0, 50, 50)
|
|
seedWindow(t, targetId, 10, 0, 35, 65)
|
|
seedWindow(t, targetId, 11, 0, 75, 25)
|
|
seedWindow(t, targetId, 12, 0, 25, 75)
|
|
seedWindow(t, targetId, 13, 0, 52, 48)
|
|
|
|
# ── registration table ────────────────────────────────────────────────────────
|
|
|
|
proc testTable() =
|
|
check "rack: RackGunNames has 16 entries", RackGunNames.len == 16
|
|
check "rack: the new gun is named TMPATTERN at id 14",
|
|
RackGunNames[TmPatternId] == "TMPATTERN"
|
|
check "rack: the new gun defaults to `off`",
|
|
DefaultRackMembership[TmPatternId] == rmOff
|
|
var onlyPattern = true
|
|
for i in 0..<RackGunNames.len:
|
|
let want = if i == 5: rmBoth else: rmOff
|
|
if DefaultRackMembership[i] != want: onlyPattern = false
|
|
check "rack: the shipped default is the onlyPattern rack", onlyPattern
|
|
|
|
const PatternId = 5
|
|
|
|
proc oldRackMembership(): array[15, RackMembership] =
|
|
## The pre-change rack as an explicit table: guns 0..13 `both`, TMPATTERN off.
|
|
for i in 0..<TmPatternId: result[i] = rmBoth
|
|
result[TmPatternId] = rmOff
|
|
|
|
proc testDefaultAdmitsOnlyPattern() =
|
|
check "default membership admits only PATTERN (1v1)",
|
|
admittedGuns(15, rm1v1, DefaultRackMembership) == @[PatternId]
|
|
check "default membership admits only PATTERN (melee)",
|
|
admittedGuns(15, rmMelee, DefaultRackMembership) == @[PatternId]
|
|
|
|
proc testEnvOverride() =
|
|
for name in RackGunNames: delEnv("TR_RACK_" & name)
|
|
putEnv("TR_RACK_TMPATTERN", "both")
|
|
check "env: TR_RACK_TMPATTERN=both admits gun 14",
|
|
loadRackMembership()[TmPatternId] == rmBoth
|
|
putEnv("TR_RACK_TMPATTERN", "1v1")
|
|
check "env: TR_RACK_TMPATTERN=1v1 parses",
|
|
loadRackMembership()[TmPatternId] == rmOnly1v1
|
|
putEnv("TR_RACK_TMPATTERN", "melee")
|
|
check "env: TR_RACK_TMPATTERN=melee parses",
|
|
loadRackMembership()[TmPatternId] == rmOnlyMelee
|
|
putEnv("TR_RACK_TMPATTERN", "off")
|
|
check "env: TR_RACK_TMPATTERN=off parses",
|
|
loadRackMembership()[TmPatternId] == rmOff
|
|
delEnv("TR_RACK_TMPATTERN")
|
|
|
|
# ── default-path parity (RNG draw for RNG draw) ───────────────────────────────
|
|
|
|
proc testDefaultSelectionParity() =
|
|
## The OLD rack: 14 guns, all-`both`, empty membership (pre-change call).
|
|
## The NEW rack: 15 guns, EXPLICIT old-rack membership (gun 14 off). Selection
|
|
## must be identical draw for draw, because gun 14 is filtered out before any
|
|
## RNG use. (The shipped DEFAULT is now `onlyPattern`; this explicit table
|
|
## preserves the TMPATTERN-addition parity proof independent of that default.)
|
|
let oldRack = oldRackMembership()
|
|
var oldT = initTracker(14)
|
|
seedOldRack(oldT, 7)
|
|
var newT = initTracker(15)
|
|
seedOldRack(newT, 7)
|
|
# Give gun 14 data too: it must still be excluded by the default membership.
|
|
seedWindow(newT, 7, TmPatternId, 0, 100, 0)
|
|
|
|
randomize(20250922)
|
|
var oldSeq: seq[int]
|
|
for _ in 0..<400: oldSeq.add oldT.bestGun(7)
|
|
randomize(20250922)
|
|
var newSeq: seq[int]
|
|
for _ in 0..<400:
|
|
newSeq.add newT.bestGun(7, rackMode = rm1v1, membership = oldRack)
|
|
check "parity: old-rack-membership 15-gun bestGun == 14-gun rack, RNG draw for draw",
|
|
oldSeq == newSeq
|
|
check "parity: gun 14 is never selected under the old-rack membership",
|
|
TmPatternId notin newSeq
|
|
|
|
# Same through the live hysteresis path.
|
|
var oldH = initTracker(14); seedOldRack(oldH, 7)
|
|
var newH = initTracker(15); seedOldRack(newH, 7)
|
|
seedWindow(newH, 7, TmPatternId, 0, 100, 0)
|
|
randomize(4242)
|
|
var oldHSeq: seq[int]
|
|
for tick in 0..<400: oldHSeq.add oldH.selectGun(7, tick = tick)
|
|
randomize(4242)
|
|
var newHSeq: seq[int]
|
|
for tick in 0..<400:
|
|
newHSeq.add newH.selectGun(7, tick = tick, rackMode = rm1v1,
|
|
membership = oldRack)
|
|
check "parity: old-rack-membership 15-gun selectGun == 14-gun rack, RNG draw for draw",
|
|
oldHSeq == newHSeq
|
|
|
|
# Forcing TMPATTERN alone DOES change selection (it is forceable).
|
|
var forced = initTracker(15)
|
|
seedOldRack(forced, 7)
|
|
seedWindow(forced, 7, TmPatternId, 0, 100, 0)
|
|
var onlyTmp: array[15, RackMembership]
|
|
for i in 0..<15: onlyTmp[i] = rmOff
|
|
onlyTmp[TmPatternId] = rmBoth
|
|
check "force: with every other gun off, TMPATTERN is the only candidate",
|
|
admittedGuns(15, rm1v1, onlyTmp) == @[TmPatternId]
|
|
randomize(9)
|
|
var forcedSeq: seq[int]
|
|
for _ in 0..<50:
|
|
forcedSeq.add forced.bestGun(7, rackMode = rm1v1, membership = onlyTmp)
|
|
var allTmp = true
|
|
for g in forcedSeq:
|
|
if g != TmPatternId: allTmp = false
|
|
check "force: the forced-alone rack always returns TMPATTERN", allTmp
|
|
|
|
# ── radial mode + deferred-label fix ─────────────────────────────────────────
|
|
|
|
proc testRadialInit() =
|
|
let g = initTmRadialGun()
|
|
check "init: initTmRadialGun() selects the radial target mode",
|
|
g.targetMode == tmRadial
|
|
|
|
proc testDeferredLabel() =
|
|
## Drive a radial-mode gun over a synthetic fixture and prove the deferred
|
|
## label resolves every bullet: no label misses, and training happened.
|
|
let fx = synthesizeOscillator(ticks = 400)
|
|
var g2 = initTmRadialGun()
|
|
randomize(3)
|
|
var tracker = initTracker(1, bmPoint)
|
|
for state in fx.states:
|
|
var preds: array[len(PowerBins), GunPrediction]
|
|
for b in 0..<len(PowerBins):
|
|
preds[b] = g2.predict(state, bulletSpeed(PowerBins[b]))
|
|
tracker.spawnBullets(0, preds, state, fx.enemyId)
|
|
var et: Table[int, tuple[x, y: float, lastSeenTick: int, alive: bool]]
|
|
et[fx.enemyId] = (x: state.enemyX, y: state.enemyY,
|
|
lastSeenTick: state.tick, alive: true)
|
|
tracker.tickBullets(state, et,
|
|
proc(gunId: GunId, binIdx: int, e: FeedbackEvent) = g2.onResult(e))
|
|
check "deferred: a radial replay trains (totalObs > 0)", g2.totalObs > 0
|
|
check "deferred: no label misses remain (labelMisses == 0)", g2.labelMisses == 0
|
|
check "deferred: the pending queue never overflowed", g2.pendingDropped == 0
|
|
check "deferred: the radial head is scored above chance (radTotal > 0)",
|
|
g2.radTotal > 0 and g2.radCorrect > 0
|
|
|
|
when isMainModule:
|
|
testTable()
|
|
testDefaultAdmitsOnlyPattern()
|
|
testEnvOverride()
|
|
testDefaultSelectionParity()
|
|
testRadialInit()
|
|
testDeferredLabel()
|
|
if failures > 0:
|
|
echo "\n", failures, " check(s) FAILED"
|
|
quit(1)
|
|
echo "\nAll TM pattern registration checks passed."
|