Skip to content

feat(mm): add plot_only_corrected flag + ignore-list merge + flake fix#78

Merged
bartzbeielstein merged 3 commits into
mainfrom
develop
May 27, 2026
Merged

feat(mm): add plot_only_corrected flag + ignore-list merge + flake fix#78
bartzbeielstein merged 3 commits into
mainfrom
develop

Conversation

@bartzbeielstein

@bartzbeielstein bartzbeielstein commented May 27, 2026

Copy link
Copy Markdown
Contributor

Summary

Brings develop forward onto the post-Dependabot main, plus three small changes that accumulated on develop:

Commit Type Description
2f6ec27 chore Merge the bart26g/* ignore patterns (union of both sides resolved during the rebase).
aaca3ad feat Add plot_only_corrected: bool = False to plot_mmphi_corrected_vs_n_lhs. When True, plot only the corrected criterion on a single axis instead of the dual-axis intensive/corrected comparison. Two new tests cover the flag and the default behaviour.
c755315 test Widen the test_parallel_max_time ceiling from < 10s to < 20s to stop CI runners blowing through it during pool teardown. The lower bound (>= 2.5s) is unchanged, so the test still validates that max_time is honoured.

The previous CI run on this PR failed solely on the flaky timing assertion that c755315 now widens.

Test plan

  • Full local pytest passes (1725 tests) on the rebased branch tip.
  • test_parallel_max_time passes locally in 6.91 s under the new ceiling.
  • CI (Tests, Analyze, Lint, CodeQL) green on this PR.

🤖 Generated with Claude Code

@bartzbeielstein

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

Copilot AI commented May 27, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved. I merged origin/main into this branch and fixed the .gitignore conflict in commit 336ef42.

Copilot AI changed the title Develop Resolve merge conflicts with origin/main May 27, 2026
bartzbeielstein and others added 2 commits May 27, 2026 21:19
When True, the function plots only the corrected Morris-Mitchell
criterion on a single axis instead of the dual-axis comparison with
the intensive criterion. Default remains False for backward
compatibility.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The assertion intent is "the loop terminated", not a tight timing
budget. Shared CI runners occasionally stall the parallel pool
teardown by several seconds, producing spurious failures (latest
observed: 10.44s on a 10.0s ceiling for a 3s max_time target).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@bartzbeielstein bartzbeielstein changed the title Resolve merge conflicts with origin/main feat(mm): add plot_only_corrected flag + ignore-list merge + flake fix May 27, 2026
@bartzbeielstein bartzbeielstein merged commit 8a5b310 into main May 27, 2026
4 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.

2 participants