[Merged by Bors] - feat: port Data.Nat.PSub#806
Closed
zeramorphic wants to merge 7 commits intomasterfrom
Closed
Conversation
Signed-off-by: thirdsgames <thirdsgames2018@gmail.com>
Signed-off-by: thirdsgames <thirdsgames2018@gmail.com>
Signed-off-by: thirdsgames <thirdsgames2018@gmail.com>
Contributor
|
Please rename to |
kim-em
reviewed
Nov 30, 2022
Mathlib/Data/Nat/Psub.lean
Outdated
| /-! | ||
| # Partial predecessor and partial subtraction on the natural numbers | ||
|
|
||
| The usual definition of natural number subtraction (`nat.sub`) returns 0 as a "garbage value" for |
Contributor
There was a problem hiding this comment.
Suggested change
| The usual definition of natural number subtraction (`nat.sub`) returns 0 as a "garbage value" for | |
| The usual definition of natural number subtraction (`Nat.sub`) returns 0 as a "garbage value" for |
Signed-off-by: thirdsgames <thirdsgames2018@gmail.com>
kim-em
reviewed
Nov 30, 2022
Mathlib/Data/Nat/Psub.lean
Outdated
| # Partial predecessor and partial subtraction on the natural numbers | ||
|
|
||
| The usual definition of natural number subtraction (`nat.sub`) returns 0 as a "garbage value" for | ||
| `a - b` when `a < b`. Similarly, `nat.pred 0` is defined to be `0`. The functions in this file |
Contributor
There was a problem hiding this comment.
Suggested change
| `a - b` when `a < b`. Similarly, `nat.pred 0` is defined to be `0`. The functions in this file | |
| `a - b` when `a < b`. Similarly, `Nat.pred 0` is defined to be `0`. The functions in this file |
kim-em
reviewed
Nov 30, 2022
Mathlib/Data/Nat/Psub.lean
Outdated
Comment on lines
+18
to
+19
| - `nat.ppred`: a partial predecessor operation | ||
| - `nat.psub`: a partial subtraction operation |
Contributor
There was a problem hiding this comment.
Suggested change
| - `nat.ppred`: a partial predecessor operation | |
| - `nat.psub`: a partial subtraction operation | |
| - `Nat.ppred`: a partial predecessor operation | |
| - `Nat.psub`: a partial subtraction operation |
kim-em
reviewed
Nov 30, 2022
Co-authored-by: Scott Morrison <scott@tqft.net>
kim-em
reviewed
Nov 30, 2022
Mathlib/Data/Nat/PSub.lean
Outdated
|
|
||
| /-- Partial predecessor operation. Returns `ppred n = some m` | ||
| if `n = m + 1`, otherwise `none`. -/ | ||
| @[simp] |
Contributor
There was a problem hiding this comment.
Please remove @[simp] here and on psub. You may need to write the simp lemmas for the branches yourself.
Putting @[simp] on a definition by matching has changed behaviour in Lean 4.
kim-em
reviewed
Nov 30, 2022
Mathlib/Data/Nat/PSub.lean
Outdated
| | n + 1 => by constructor <;> intro <;> contradiction | ||
| #align nat.ppred_eq_none Nat.ppred_eq_none | ||
|
|
||
| -- Porting note: `simp` eagerly expanded `psub` and `ppred` so it couldn't apply the `simp` lemmas |
kim-em
reviewed
Nov 30, 2022
Mathlib/Data/Nat/PSub.lean
Outdated
Comment on lines
+99
to
+101
| psub m (n + k) = (do | ||
| let x ← psub m n | ||
| psub x k) := |
Contributor
There was a problem hiding this comment.
Suggested change
| psub m (n + k) = (do | |
| let x ← psub m n | |
| psub x k) := | |
| psub m (n + k) = (do psub (← psub m n) k) := |
kim-em
reviewed
Nov 30, 2022
Mathlib/Data/Nat/PSub.lean
Outdated
Comment on lines
+42
to
+43
| -- Porting note: mathport failed to align `option.get_or_else` with `Option.getD` | ||
|
|
Contributor
There was a problem hiding this comment.
Suggested change
| -- Porting note: mathport failed to align `option.get_or_else` with `Option.getD` |
Signed-off-by: thirdsgames <thirdsgames2018@gmail.com>
Collaborator
Author
|
Thanks for your comments, I think I've made all of the relevant changes. |
Signed-off-by: thirdsgames <thirdsgames2018@gmail.com>
Contributor
|
Great, thanks. It's helpful if in mathlib PR reviews, if the author can click "resolve conversation" on everything they've dealt with. Because we have multiple reviewers dealing with things, it's great if someone coming in can quickly see what is and isn't done. bors merge |
bors bot
pushed a commit
that referenced
this pull request
Nov 30, 2022
mathlib3 SHA: 62a5626868683c104774de8d85b9855234ac807c I'm not sure if the file should be called `Psub.lean` or `PSub.lean` - mathport chooses the former. Co-authored-by: zeramorphic <50671761+zeramorphic@users.noreply.github.com>
Collaborator
Author
|
That makes sense, thanks - I'm not very used to collaborating on projects like this just yet. |
|
Pull request successfully merged into master. Build succeeded: |
bors bot
pushed a commit
to leanprover-community/mathlib3
that referenced
this pull request
Dec 1, 2022
Regenerated from the [port status wiki page](https://github.com/leanprover-community/mathlib/wiki/mathlib4-port-status). Relates to the following PRs: * `algebra.field.defs`: leanprover-community/mathlib4#668 * `algebra.group.commute`: leanprover-community/mathlib4#750 * `algebra.group_with_zero.commute`: leanprover-community/mathlib4#762 * `algebra.group_with_zero.semiconj`: leanprover-community/mathlib4#757 * `algebra.group_with_zero.units.basic`: leanprover-community/mathlib4#735 * `algebra.hom.embedding`: leanprover-community/mathlib4#764 * `algebra.order.monoid.cancel.defs`: leanprover-community/mathlib4#774 * `algebra.order.monoid.canonical.defs`: leanprover-community/mathlib4#778 * `algebra.order.monoid.defs`: leanprover-community/mathlib4#771 * `algebra.order.monoid.min_max`: leanprover-community/mathlib4#763 * `algebra.order.monoid.order_dual`: leanprover-community/mathlib4#786 * `algebra.order.sub.defs`: leanprover-community/mathlib4#732 * `algebra.regular.basic`: leanprover-community/mathlib4#758 * `algebra.ring.commute`: leanprover-community/mathlib4#759 * `algebra.ring.regular`: leanprover-community/mathlib4#795 * `algebra.ring.semiconj`: leanprover-community/mathlib4#751 * `control.applicative`: leanprover-community/mathlib4#798 * `control.functor`: leanprover-community/mathlib4#612 * `control.monad.basic`: leanprover-community/mathlib4#752 * `data.countable.defs`: leanprover-community/mathlib4#736 * `data.int.units`: leanprover-community/mathlib4#807 * `data.nat.basic`: leanprover-community/mathlib4#729 * `data.nat.psub`: leanprover-community/mathlib4#806 * `data.nat.units`: leanprover-community/mathlib4#805 * `data.pi.algebra`: leanprover-community/mathlib4#564 * `data.prod.lex`: leanprover-community/mathlib4#783 * `logic.embedding.basic`: leanprover-community/mathlib4#700 * `logic.equiv.option`: leanprover-community/mathlib4#674 * `order.bounded_order`: leanprover-community/mathlib4#697 * `order.with_bot`: leanprover-community/mathlib4#776 * `order.disjoint`: leanprover-community/mathlib4#773 * `order.min_max`: leanprover-community/mathlib4#728 * `order.prop_instances`: leanprover-community/mathlib4#792 * `order.rel_iso.basic`: leanprover-community/mathlib4#772
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
2 participants
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.
mathlib3 SHA: 62a5626868683c104774de8d85b9855234ac807c
I'm not sure if the file should be called
Psub.leanorPSub.lean- mathport chooses the former.