Skip to content

Merge main into bounding (resolve conflicts with #484) - #492

Draft
thefundamentaltheor3m wants to merge 2 commits into
boundingfrom
claude/pr-review-audit-plan-n2a07a
Draft

thefundamentaltheor3m wants to merge 2 commits into
boundingfrom
claude/pr-review-audit-plan-n2a07a

Conversation

@thefundamentaltheor3m

Copy link
Copy Markdown
Owner

#460 became un-mergeable after #484 (A, B and the g inequality statements) landed on main. This merges main into bounding and resolves the three conflicts:

  • a/Eigenfunction.lean, b/Eigenfunction.lean: Define A, B and add inequality statements of them and g #484 only switched eig_a / eig_b to 𝓕 notation in the old SchwartzMap setting. This branch had already rewritten both proofs for RadialSchwartzMap, so the branch's versions are kept.
  • g/Basic.lean: fourier_g_zero keeps this branch's version, which goes through fourier_g_apply. The duplicated open scoped FourierTransform is dropped. Define A, B and add inequality statements of them and g #484's new A, B, A_eq, B_eq, g_eq_integral_A, g_Fourier_eq_integral_B, A_neg, B_pos, g_nonpos and g_Fourier_nonneg are merged in unchanged. They use g x / 𝓕 g x, which work for the RadialSchwartzMap g through its coercion to functions and its Fourier transform instance.

Phi.lean, Psi.lean and the blueprint merge cleanly.

I've started the build workflow by hand on the head branch to validate the merge before it lands.

🤖 Generated with Claude Code

https://claude.ai/code/session_01UXLVscFdDj42KSSxpVWBHP


Generated by Claude Code

seewoo5 and others added 2 commits October 2, 2026 05:33
Resolve conflicts with #484 by keeping this branch's RadialSchwartzMap
versions of eig_a, eig_b and fourier_g_zero; drop the duplicated
`open scoped FourierTransform` in g/Basic.lean.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01UXLVscFdDj42KSSxpVWBHP
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.

3 participants