coolguyandClaude Opus 4.7
004b913a7b
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>
53 lines
1.8 KiB
Python
53 lines
1.8 KiB
Python
from __future__ import annotations
|
|
|
|
import coolrl_lost_cities.games.classic as classic
|
|
|
|
|
|
def test_classic_package_exports_common_game_api() -> None:
|
|
config = classic.classic_config(seed=1)
|
|
state = classic.GameState.new_game(config)
|
|
bot = classic.build_bot("random", seed=1)
|
|
|
|
action = bot.act(state)
|
|
assert state.unified_legal_mask()[state.to_unified_action(action)]
|
|
assert state.config.deck_size == 60
|
|
|
|
|
|
def test_classic_package_exports_snapshot_alias() -> None:
|
|
state = classic.GameState.new_game(classic.classic_config(seed=1))
|
|
snapshot = classic.Snapshot(
|
|
config=state.config,
|
|
deck=list(state.deck),
|
|
hands=[list(hand) for hand in state.hands],
|
|
expeditions=[
|
|
[list(expedition) for expedition in player_expeditions]
|
|
for player_expeditions in state.expeditions
|
|
],
|
|
discards=[list(discard) for discard in state.discards],
|
|
current_player=state.current_player,
|
|
phase=state.phase,
|
|
pending_discarded_color=state.pending_discarded_color,
|
|
turn_count=state.turn_count,
|
|
terminal=state.terminal,
|
|
legal_mask=state.unified_legal_mask(),
|
|
)
|
|
|
|
assert snapshot.score_diff(0) == state.score_diff(0)
|
|
|
|
|
|
def test_classic_package_exports_bot_registry_helpers() -> None:
|
|
assert "random" in classic.available_bot_names()
|
|
assert isinstance(classic.build_bot("random", seed=1), classic.LostCitiesPolicy)
|
|
|
|
|
|
def test_classic_bot_registry_accepts_reproduction_opponent_names() -> None:
|
|
for name in [
|
|
"random",
|
|
"discard_only",
|
|
"heuristic_balanced",
|
|
"heuristic_aggressive",
|
|
"heuristic_cautious",
|
|
"heuristic_noisy",
|
|
]:
|
|
assert isinstance(classic.build_bot(name, seed=1), classic.LostCitiesPolicy)
|