-
Notifications
You must be signed in to change notification settings - Fork 181
Improve IsSubset for cyclotomic domains (such as Integers, PositiveIntegers, GaussianRationals etc.)
#6265
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
Open
limakzi
wants to merge
5
commits into
gap-system:master
Choose a base branch
from
limakzi:6250-add-is-subset-infinite-finite
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+32
−1
Open
Improve IsSubset for cyclotomic domains (such as Integers, PositiveIntegers, GaussianRationals etc.)
#6265
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
948667b
fix: Fix IsSubset for cyclotomic domains
limakzi 6cf0efb
Fix IsSubset implementation
limakzi 0b71ca1
Simplify tests for IsSubset
limakzi 95febd7
Add IsSubset method for a range and a cyclotomic
limakzi d997254
Add IsSubset method for a list and a cyclotomic semiring
limakzi 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
Some comments aren't visible on the classic Files Changed page.
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,4 +1,4 @@ | ||||||||||||||||||||
| #@local a,cyc,gm,i,l1,l2,l3,mat,n,r,x,y,z,sets | ||||||||||||||||||||
| #@local a,b,cyc,gm,i,l1,l2,l3,mat,n,r,ranges,s,x,y,z,sets | ||||||||||||||||||||
| gap> START_TEST("cyclotom.tst"); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| # Check basic arithmetic operations. | ||||||||||||||||||||
|
|
@@ -352,5 +352,16 @@ gap> SetX(r, r, {i,j} -> IsSubset(sets[i],sets[j]) = (i>=j)); | |||||||||||||||||||
| gap> SetX(r, r, {i,j} -> (sets[i]=sets[j]) = (i=j)); | ||||||||||||||||||||
| [ true ] | ||||||||||||||||||||
|
|
||||||||||||||||||||
| # | ||||||||||||||||||||
| # IsSubset for cyclotomic semirings and ranges for large bounds | ||||||||||||||||||||
| # | ||||||||||||||||||||
| gap> sets:=[ PositiveIntegers, NonnegativeIntegers, Integers, GaussianIntegers, GaussianRationals, Cyclotomics ];; | ||||||||||||||||||||
| gap> b:=2^(8*GAPInfo.BytesPerVariable - 6);; | ||||||||||||||||||||
| gap> ranges:=[ [-2..-1], [-1..0], [-1..1], [0..1], [1..2], [-b..-1], [-b..0], [-b..1], [-1..b], [0..b], [1..b], [-b,b]];; | ||||||||||||||||||||
| gap> SetX(ranges, sets, {r,s} -> IsSubset(s,r) = (IsEmpty(r) or (First(r) in s and Last(r) in s))); | ||||||||||||||||||||
| [ true ] | ||||||||||||||||||||
| gap> SetX(ranges, sets, {r,s} -> not IsSubset(r,s)); | ||||||||||||||||||||
limakzi marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||||||||||
| [ true ] | ||||||||||||||||||||
|
|
||||||||||||||||||||
| # | ||||||||||||||||||||
|
Member
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. When I wrote that I'd suggest to keep the tests for ranges and lists apart, my idea was to insert something like this, here below the ranges tests:
Suggested change
|
||||||||||||||||||||
| gap> STOP_TEST("cyclotom.tst"); | ||||||||||||||||||||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note test contains a test for a list as well.
The cyclotomics must not be subset of finite list.
My concern is whether we should split this test case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am confused as to what you are talking about here.
Ah -- is it maybe the
[-b,b]at the end? That's a typo, what I meant is this: