Skip to content

Paper experiments: consolidated code (Stage 1/2 landscape, E-07/09/10/11, diversity, blend) - #55

Merged
taddyb merged 7 commits into
masterfrom
paper/stage2-code
Oct 10, 2026
Merged

taddyb merged 7 commits into
masterfrom
paper/stage2-code

Conversation

@taddyb

@taddyb taddyb commented Oct 8, 2026

Copy link
Copy Markdown
Owner

Code-only consolidation of the new code written for the paper experiments, based on origin/master 309a814. Nothing from research/findings, journal, specs, figures, CLAUDE.md, .claude, outputs or data is included. Findings docs live on the paper/* branches.

Commits and source branches

  1. landscape: frozen key, shard env overrides, Stage 1 census bundles and scripts. From paper/e02-stage1-census (commit e9b87b0 frozen key is committed there and included). Applied as a merge-base diff because master has moved. src/experiment/landscape/{mod,objective}.rs conflicted with master's additive_axes; resolved by keeping both: Objective::build now takes additive and frozen, and validate_axes checks both. Also scripts/landscape_shards.sh, experiments/landscape-stage1-{kge,nse}-all, experiments/landscape/stage1_*.py.
  2. E-07 seed-43 configs and seed_pairs.py. From paper/e07-seed43.
  3. adjoint-six-models bundle and analyze.py. From paper/e09-adjoint-six-models.
  4. cross-product scripts (E-10, E-08). From paper/e10-e08-cross-product.
  5. E-11 lumped provenance scripts (research/scripts/e11_*.py). From paper/e11-lumped-provenance.
  6. prediction-space diversity scripts. From paper/prediction-diversity.
  7. blend prediction scripts, read-out, UH reproduction check, landscape-blend-smoke. blend_inflow.py and inflow_props.py from paper/blend-prediction; the rest from paper/blend-readout. member_fields.py is edited on both branches; blend-readout's version is a 3-line superset of blend-prediction's and was taken.

Not included

  • paper/e01-lineage: findings only, no code.
  • Result outputs on the branches (csv, txt, png, audit .out.txt) and all findings docs.
  • Blend ENGINE code: uncommitted in the multi-product-forcing worktree, owned by another session (implementer). Not touched.

Tests

  • cargo build --release: ok
  • cargo test --release --test ddr_sandbox_match: 1 passed
  • cargo test --release --lib landscape: 60 passed, 0 failed, 1 ignored (includes the new frozen/axis_active tests)
  • python3 -m py_compile on all 19 added python files: ok

🤖 Generated with Claude Code

taddyb and others added 7 commits October 7, 2026 21:32
…d scripts

From paper/e02-stage1-census (code only, applied as a merge-base diff so
later master changes to src/experiment/landscape are preserved).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016t4wThhuCP2GECMDzH1GrS
From paper/e07-seed43 (csv/txt outputs excluded).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016t4wThhuCP2GECMDzH1GrS
From paper/e09-adjoint-six-models.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016t4wThhuCP2GECMDzH1GrS
…-10, E-08)

From paper/e10-e08-cross-product (txt outputs excluded).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016t4wThhuCP2GECMDzH1GrS
From paper/e11-lumped-provenance (audit output txt excluded).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016t4wThhuCP2GECMDzH1GrS
From paper/prediction-diversity (csv/txt/png outputs excluded).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016t4wThhuCP2GECMDzH1GrS
From paper/blend-prediction (blend_inflow, inflow_props) and paper/blend-readout
(member_fields updated version, blend_readout, uh_repro_score, uh_reproduction.yaml,
landscape-blend-smoke). member_fields.py conflict resolved by taking the later
blend-readout version, which is a 3-line change on top of blend-prediction.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016t4wThhuCP2GECMDzH1GrS
@taddyb
taddyb marked this pull request as ready for review October 10, 2026 16:00
@taddyb
taddyb merged commit 65211a9 into master Oct 10, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant