Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - feat: Extending convex functions #6339

Closed
wants to merge 18 commits into from

Conversation

YaelDillies
Copy link
Collaborator

@YaelDillies YaelDillies commented Aug 3, 2023

Forward-ports leanprover-community/mathlib#18797

The changes to Mathlib.Data.Set.Intervals.Basic were independently added to mathlib4 in Mathlib.Data.Set.Intervals.Image, so the #aligns have been added there instead of the original file.


This does not quite match the mathlib PR since Scott independently proved Monotone.image_Icc_subset in a new file. So instead of porting those changes, I'm integrating them to Scott's new file.

Open in Gitpod

@YaelDillies YaelDillies added awaiting-review The author would like community review of the PR mathlib3-pair This PR is a forward-port of a mathlib3 PR or part of one, either under review or recently merged t-analysis Analysis (normed *, calculus) t-order Order hierarchy labels Aug 3, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Aug 10, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Aug 27, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Sep 7, 2023
@@ -0,0 +1,99 @@
/-
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is new, right? If so, can you drop it from this PR so that it can be reviewed as a port, not a forward-port?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is a forward-port, though?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's only a forward-port if it's a modification of a file that was already ported from the out-of-sync region of https://leanprover-community.github.io/mathlib-port-status; otherwise it's just a sparkling port.

It's best to do this in a separate PR using start_port.sh so that the review against mathport is possible. Obviously that will have to wait for the rest of this files in this PR to be merged first.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you recently change the presentation of out-of-sync? I swear I copied that code from there 🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't touched it...

@YaelDillies YaelDillies removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Sep 9, 2023
@@ -64,6 +64,7 @@ variable [Preorder α] [Preorder β]
theorem Monotone.image_Icc_subset (h : Monotone f) :
f '' Icc a b ⊆ Icc (f a) (f b) :=
h.mapsTo_Icc.image_subset
#align monotone.image_Icc_subset Monotone.image_Icc_subset
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are the other three lemmas, MonotoneOn.image_Icc_subset, AntitoneOn.image_Icc_subset, and Antitone.image_Icc_subset? I'm a bit confused, because your previous version had maybe 20 new lemmas, but this one is now missing 3 lemmas.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two approaches come to mind:

  • Add #noaligns for the other three lemmas with a TODO comment
  • Make a separate PR that adds this whole family of lemmas (first), then update this one to just add the aligns.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Went for the second because it's less work for me: #7146.

@bors bors bot changed the base branch from master to ScottCarnahan/BinomialRing2 September 17, 2023 03:25
@semorrison semorrison changed the base branch from ScottCarnahan/BinomialRing2 to master September 17, 2023 12:14
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Sep 28, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Oct 5, 2023
@eric-wieser
Copy link
Member

bors d+

I think I finished this us, please merge if it looks good to you and CI.

@bors
Copy link

bors bot commented Oct 5, 2023

✌️ YaelDillies can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@github-actions github-actions bot added delegated and removed awaiting-review The author would like community review of the PR labels Oct 5, 2023
@YaelDillies
Copy link
Collaborator Author

Thank you for the merge.

bors merge

bors bot pushed a commit that referenced this pull request Oct 6, 2023
Forward-ports leanprover-community/mathlib#18797

The changes to `Mathlib.Data.Set.Intervals.Basic` were independently added to mathlib4 in `Mathlib.Data.Set.Intervals.Image`, so the `#align`s have been added there instead of the original file.



Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
@bors
Copy link

bors bot commented Oct 6, 2023

Build failed:

@YaelDillies
Copy link
Collaborator Author

"No space left on device". I'll rerun bors once this is fixed: https://leanprover.zulipchat.com/#narrow/stream/113488-general/topic/No.20space.20left.20on.20device

@YaelDillies
Copy link
Collaborator Author

Hopefully fixed now.

bors merge

bors bot pushed a commit that referenced this pull request Oct 6, 2023
Forward-ports leanprover-community/mathlib#18797

The changes to `Mathlib.Data.Set.Intervals.Basic` were independently added to mathlib4 in `Mathlib.Data.Set.Intervals.Image`, so the `#align`s have been added there instead of the original file.



Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
@bors
Copy link

bors bot commented Oct 6, 2023

This PR was included in a batch that was canceled, it will be automatically retried

bors bot pushed a commit that referenced this pull request Oct 6, 2023
Forward-ports leanprover-community/mathlib#18797

The changes to `Mathlib.Data.Set.Intervals.Basic` were independently added to mathlib4 in `Mathlib.Data.Set.Intervals.Image`, so the `#align`s have been added there instead of the original file.



Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
@bors
Copy link

bors bot commented Oct 6, 2023

Pull request successfully merged into master.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot changed the title feat: Extending convex functions [Merged by Bors] - feat: Extending convex functions Oct 6, 2023
@bors bors bot closed this Oct 6, 2023
@bors bors bot deleted the proj_Ici_convex branch October 6, 2023 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
delegated mathlib3-pair This PR is a forward-port of a mathlib3 PR or part of one, either under review or recently merged t-analysis Analysis (normed *, calculus) t-order Order hierarchy
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants