-
Notifications
You must be signed in to change notification settings - Fork 250
Fix #2195 by removing redundant zero from IsRing #2209
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
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e46ab4d
Fix #2195 by removing redundant zero from IsRing
MatthewDaggitt 0906b16
Moved proofs eariler to IsSemiringWithoutOne
MatthewDaggitt 9385810
Updated CHANGELOG
MatthewDaggitt 74a7d43
Fix bug
MatthewDaggitt 4fd9d86
Refactored Properties.Ring
MatthewDaggitt 367e3b3
Merge branch 'master' into ring-zero-bug
MatthewDaggitt f239dc7
Fix renaming
MatthewDaggitt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -192,6 +192,33 @@ open IsCommutativeSemiringʳ public | |
------------------------------------------------------------------------ | ||
-- IsRing | ||
|
||
record IsRing* (+ * : Op₂ A) (-_ : Op₁ A) (0# 1# : A) : Set (a ⊔ ℓ) where | ||
field | ||
+-isAbelianGroup : IsAbelianGroup + 0# -_ | ||
*-isMonoid : IsMonoid * 1# | ||
distrib : * DistributesOver + | ||
zero : Zero 0# * | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Too late! But is this field also now redundant as a consequence of this issue/PR? |
||
|
||
isRing : IsRing + * -_ 0# 1# | ||
isRing = record | ||
{ +-isAbelianGroup = +-isAbelianGroup | ||
; *-cong = ∙-cong | ||
; *-assoc = assoc | ||
; *-identity = identity | ||
; distrib = distrib | ||
} where open IsMonoid *-isMonoid | ||
|
||
open IsRing* public | ||
using () renaming (isRing to isRing*) | ||
|
||
|
||
|
||
------------------------------------------------------------------------ | ||
-- Deprecated | ||
------------------------------------------------------------------------ | ||
|
||
-- Version 2.0 | ||
|
||
-- We can recover a ring without proving that 0# annihilates *. | ||
record IsRingWithoutAnnihilatingZero (+ * : Op₂ A) (-_ : Op₁ A) (0# 1# : A) | ||
: Set (a ⊔ ℓ) where | ||
|
@@ -224,28 +251,16 @@ record IsRingWithoutAnnihilatingZero (+ * : Op₂ A) (-_ : Op₁ A) (0# 1# : A) | |
; *-assoc = *.assoc | ||
; *-identity = *.identity | ||
; distrib = distrib | ||
; zero = zero | ||
} | ||
|
||
open IsRingWithoutAnnihilatingZero public | ||
using () renaming (isRing to isRingWithoutAnnihilatingZero) | ||
|
||
record IsRing* (+ * : Op₂ A) (-_ : Op₁ A) (0# 1# : A) : Set (a ⊔ ℓ) where | ||
field | ||
+-isAbelianGroup : IsAbelianGroup + 0# -_ | ||
*-isMonoid : IsMonoid * 1# | ||
distrib : * DistributesOver + | ||
zero : Zero 0# * | ||
|
||
isRing : IsRing + * -_ 0# 1# | ||
isRing = record | ||
{ +-isAbelianGroup = +-isAbelianGroup | ||
; *-cong = ∙-cong | ||
; *-assoc = assoc | ||
; *-identity = identity | ||
; distrib = distrib | ||
; zero = zero | ||
} where open IsMonoid *-isMonoid | ||
|
||
open IsRing* public | ||
using () renaming (isRing to isRing*) | ||
{-# WARNING_ON_USAGE IsRingWithoutAnnihilatingZero | ||
"Warning: IsRingWithoutAnnihilatingZero was deprecated in v2.0. | ||
Please use the standard `IsRing` instead." | ||
#-} | ||
{-# WARNING_ON_USAGE isRingWithoutAnnihilatingZero | ||
"Warning: isRingWithoutAnnihilatingZero was deprecated in v2.0. | ||
Please use the standard `IsRing` instead." | ||
#-} |
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.