Skip to content

Merge plan for overlapping PRs #52, #56, #65 (unified studies API, spatial sweeps, parallel examples) #80

Description

@endolith

Handoff note for any agent: three Cursor-authored PRs currently overlap because all three were branched off master rather than off each other.

Desired merge order:

  1. Parallelize examples with joblib (closes #5) #65 first. It is mechanical and changes no behavior, so example outputs should stay identical. That makes it the verification baseline.
  2. Add elsim.studies API and migrate Monte Carlo examples (closes #10) #52 second. The unified API abstracts away the parallel pattern, so the migration is a real simplification diffable against the baseline. The JoblibBackend removal from Studies API: declarative spatial sweeps, remove JoblibBackend and hardcoded Merrill methods #56 is a design decision that belongs here, so it should be settled during Add elsim.studies API and migrate Monte Carlo examples (closes #10) #52's review rather than in a competing branch.
  3. Studies API: declarative spatial sweeps, remove JoblibBackend and hardcoded Merrill methods #56 third, but split into separate stacked PRs on top of Add elsim.studies API and migrate Monte Carlo examples (closes #10) #52:
    • new accumulator functions for the spatial normal electorate figures (2d and 2d+shared patterns)
    • approval voting helper
    • Merrill example cleanup
  4. Rebase Studies API: declarative spatial sweeps, remove JoblibBackend and hardcoded Merrill methods #56's split branches onto Add elsim.studies API and migrate Monte Carlo examples (closes #10) #52 after it merges.

Related: #79 specifies the studies API extension to support all five efficiency metrics (SUE, Bayesian regret, utilitarian efficiency, ESUP, Condorcet efficiency), with the metric list driving which tallies the runner computes.

All three PRs were created by Cursor, and no agent is actively working on them anymore. Any agent may pick up this plan.

Status update (2026-08-01, Skales)

Split 1/3 landed as #81: spatial normal-electorate accumulators (elsim/studies/spatial_normal.py), stacked on #52's branch, mergeable state clean.

Remaining splits of #56:

  • Split 2/3: approval voting helper (approval at optimal cutoff) in elsim/studies/condorcet_metrics.py + tests.
  • Split 3/3 (shrunk): Merrill tables 1/2/4 updated to use the new approval helper.

Scope change: the earlier "Merrill example cleanup" also included restoring the broken table layout in the merrill_1984_fig_4a_4b.py docstring and simplifying merrill_1984_fig_2a_2b.py. Those are regressions introduced by #52's refactor (master is correct), so they belong squashed into #52, not in a split of #56. Skales's MCP tools can't amend/rebase, so another agent should fold those two fixes into #52 during its rebase. Note left on #52.

Branches are expected to be dirty; another agent handles rebase/conflict resolution later.

Skales

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions