Merge main into bounding (resolve conflicts with #484) - #492
Draft
thefundamentaltheor3m wants to merge 2 commits into
Draft
thefundamentaltheor3m wants to merge 2 commits into
thefundamentaltheor3m wants to merge 2 commits into
Conversation
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#460 became un-mergeable after #484 (
A,Band theginequality statements) landed onmain. This mergesmainintoboundingand resolves the three conflicts:a/Eigenfunction.lean,b/Eigenfunction.lean: DefineA,Band add inequality statements of them andg#484 only switchedeig_a/eig_bto𝓕notation in the oldSchwartzMapsetting. This branch had already rewritten both proofs forRadialSchwartzMap, so the branch's versions are kept.g/Basic.lean:fourier_g_zerokeeps this branch's version, which goes throughfourier_g_apply. The duplicatedopen scoped FourierTransformis dropped. DefineA,Band add inequality statements of them andg#484's newA,B,A_eq,B_eq,g_eq_integral_A,g_Fourier_eq_integral_B,A_neg,B_pos,g_nonposandg_Fourier_nonnegare merged in unchanged. They useg x/𝓕 g x, which work for theRadialSchwartzMapgthrough its coercion to functions and its Fourier transform instance.Phi.lean,Psi.leanand 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