Rename bot family, curate analyze plots, tier evaluation cadence
Three coordinated hygiene changes; none target the diagnosed
selection-bias bottleneck. They make the codebase honestly reflect the
pure-self-play stance and reduce dashboard noise.
Bot rename (drop the unhelpful safe_ prefix; suffixes describe behaviour):
- safe_heuristic_loose -> heuristic_aggressive
- safe_heuristic -> heuristic_balanced
- safe_heuristic_strict -> heuristic_cautious
- noisy_safe -> heuristic_noisy
- passive_discard -> discard_only
Class renames in bots/: SafeHeuristicBot -> HeuristicBot,
SafeHeuristicParams -> HeuristicParams, PassiveDiscardBot -> DiscardOnlyBot,
plus loose/strict parameter constants. Backwards compatibility was dropped
intentionally per user instruction; no aliases. Active configs, docs,
scripts, tests updated. Archive directories (configs/archive,
docs/archive, runs/archive) left intact and may still reference old
names per their read-only policy. The src/.../bots/passive.py module was
renamed to discard_only.py via git mv.
Analyze plot curation (deep_cfr/analyze.py):
- Added analysis_00_core.png as the canonical daily dashboard with 10
heuristic-free metrics (loss/{advantage,strategy}; vs heuristic_cautious:
avg_score_diff0, win_rate0, avg_opened_colors, positive_expedition_rate,
bonus_expedition_rate, score_per_opened_color, policy_entropy; vs random:
win_rate0).
- Removed analysis_05_open_quality.png (bad/weak/good open rates,
recoverable score) and analysis_07_calibration.png (calibration gap,
recoverable mean) - both relied on the heuristic recoverable_score
classifier already dropped from inputs.
- Removed SELECTIVITY_PLOTS and plot_selectivity (heuristic-laden).
- SUMMARY_EVAL_METRICS no longer includes bad_open_rate or
calibration_gap.
- PlotSpec gained an opponents allowlist so the new core section can pin
a specific opponent per panel without restructuring plot_section.
Tiered evaluation cadence (EvaluationConfig):
- Added extended_opponents and extended_eval_every (default 0 = disabled).
- opponents_for_iteration(iteration) returns the core list every
eval_every and appends extended_opponents (de-duplicated) when
iteration is also a multiple of extended_eval_every.
- default.yaml now uses 3 core opponents (random, discard_only,
heuristic_cautious) every 5 iterations and 3 extended opponents
(heuristic_balanced, heuristic_aggressive, heuristic_noisy) every 50
iterations. random is the floor sanity. discard_only is the
zero-pit detector / absolute-score reference (its score is always 0,
so eval/discard_only/avg_score_diff0 directly equals the model's raw
average score). heuristic_cautious is the ceiling and the
archive-comparable benchmark used in the prior diagnostic sections.
Net eval cost reduction: roughly 50% (3 opponents x every 5 iter, plus
6 opponents x every 50 iter, vs the prior 6 x every 5).
Documented in docs/plans/deep-cfr-selectivity.md section 9.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1494,3 +1494,83 @@ def test_interleaved_regret_matching_no_fallback_unchanged_by_mode() -> None:
|
||||
assert fallback_a is False
|
||||
assert np.allclose(policy_uniform, policy_argmax)
|
||||
assert np.allclose(policy_uniform.sum(), 1.0)
|
||||
|
||||
|
||||
def test_evaluation_opponents_for_iteration_core_only_when_extended_disabled() -> None:
|
||||
from coolrl_lost_cities.games.classic.deep_cfr.config import EvaluationConfig
|
||||
|
||||
cfg = EvaluationConfig(
|
||||
eval_every=5,
|
||||
opponents=("random", "discard_only", "heuristic_cautious"),
|
||||
extended_eval_every=0,
|
||||
extended_opponents=("heuristic_balanced",),
|
||||
)
|
||||
assert cfg.opponents_for_iteration(0) == ()
|
||||
assert cfg.opponents_for_iteration(3) == ()
|
||||
assert cfg.opponents_for_iteration(5) == (
|
||||
"random",
|
||||
"discard_only",
|
||||
"heuristic_cautious",
|
||||
)
|
||||
assert cfg.opponents_for_iteration(50) == (
|
||||
"random",
|
||||
"discard_only",
|
||||
"heuristic_cautious",
|
||||
)
|
||||
|
||||
|
||||
def test_evaluation_opponents_for_iteration_extends_on_extended_cadence() -> None:
|
||||
from coolrl_lost_cities.games.classic.deep_cfr.config import EvaluationConfig
|
||||
|
||||
cfg = EvaluationConfig(
|
||||
eval_every=5,
|
||||
opponents=("random", "discard_only", "heuristic_cautious"),
|
||||
extended_eval_every=50,
|
||||
extended_opponents=(
|
||||
"heuristic_balanced",
|
||||
"heuristic_aggressive",
|
||||
"heuristic_noisy",
|
||||
),
|
||||
)
|
||||
assert cfg.opponents_for_iteration(5) == (
|
||||
"random",
|
||||
"discard_only",
|
||||
"heuristic_cautious",
|
||||
)
|
||||
assert cfg.opponents_for_iteration(45) == (
|
||||
"random",
|
||||
"discard_only",
|
||||
"heuristic_cautious",
|
||||
)
|
||||
assert cfg.opponents_for_iteration(50) == (
|
||||
"random",
|
||||
"discard_only",
|
||||
"heuristic_cautious",
|
||||
"heuristic_balanced",
|
||||
"heuristic_aggressive",
|
||||
"heuristic_noisy",
|
||||
)
|
||||
assert cfg.opponents_for_iteration(100) == (
|
||||
"random",
|
||||
"discard_only",
|
||||
"heuristic_cautious",
|
||||
"heuristic_balanced",
|
||||
"heuristic_aggressive",
|
||||
"heuristic_noisy",
|
||||
)
|
||||
|
||||
|
||||
def test_evaluation_opponents_for_iteration_dedupes_overlap() -> None:
|
||||
from coolrl_lost_cities.games.classic.deep_cfr.config import EvaluationConfig
|
||||
|
||||
cfg = EvaluationConfig(
|
||||
eval_every=5,
|
||||
opponents=("random", "heuristic_cautious"),
|
||||
extended_eval_every=10,
|
||||
extended_opponents=("heuristic_cautious", "heuristic_balanced"),
|
||||
)
|
||||
assert cfg.opponents_for_iteration(10) == (
|
||||
"random",
|
||||
"heuristic_cautious",
|
||||
"heuristic_balanced",
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user