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.

Sign up for GitHub

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

Jump to bottom

Add exhaustive divrem tests for ZZ #1919

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+87 −4
Draft

Add exhaustive divrem tests for ZZ #1919

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aecfb59
Add exhaustive `divrem` tests for ZZ
lgoettgens Oct 23, 2024
26fd198
Remove troubling method
lgoettgens Oct 23, 2024
abcaa10
Merge branch 'master' into lg/fmpz-div
lgoettgens Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/flint/fmpz.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,6 @@ function rem(x::ZZRingElem, c::ZZRingElem)
return r
end

function rem(a::ZZRingElem, b::UInt)
return ccall((:fmpz_fdiv_ui, libflint), UInt, (Ref{ZZRingElem}, UInt), a, b)
Copy link
Contributor

Choose a reason for hiding this comment

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

as this will remove ZZ(3) % UInt(2) I don't like it. Rather do an error if the input is illegal (ie. the remainder negative)

end

###############################################################################
#
# Ad hoc binary operators
Expand Down
87 changes: 87 additions & 0 deletions test/flint/fmpz-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,3 +1657,90 @@ end
@test @inferred collect(bits(ZZ(5))) == Bool[true, false, true]
@test @inferred collect(bits(ZZ(2)^64)) == append!([true], falses(64))
end

@testset "ZZRingElem.divrem (both versions)" begin
for i in 1:5
x = rand(100:1000)
y = rand(5:100)

for (x, y) in ((x, y), (-x, y), (x, -y), (-x, -y))
Bdr = Base.divrem(x, y)
@test Bdr == (Base.div(x, y), Base.rem(x, y))
@test Bdr == Base.divrem(BigInt(x), y)
@test Bdr == (Base.div(BigInt(x), y), Base.rem(BigInt(x), y))
@test Bdr == Base.divrem(x, BigInt(y))
@test Bdr == (Base.div(x, BigInt(y)), Base.rem(x, BigInt(y)))
@test Bdr == Base.divrem(BigInt(x), BigInt(y))
@test Bdr == (Base.div(BigInt(x), BigInt(y)), Base.rem(BigInt(x), BigInt(y)))
@test Bdr == Base.divrem(ZZ(x), y)
@test Bdr == (Base.div(ZZ(x), y), Base.rem(ZZ(x), y))
@test Bdr == Base.divrem(x, ZZ(y))
@test Bdr == (Base.div(x, ZZ(y)), Base.rem(x, ZZ(y)))
@test Bdr == Base.divrem(ZZ(x), ZZ(y))
@test Bdr == (Base.div(ZZ(x), ZZ(y)), Base.rem(ZZ(x), ZZ(y)))
@test Bdr == Base.divrem(BigInt(x), ZZ(y))
@test Bdr == (Base.div(BigInt(x), ZZ(y)), Base.rem(BigInt(x), ZZ(y)))
@test Bdr == Base.divrem(ZZ(x), BigInt(y))
@test Bdr == (Base.div(ZZ(x), BigInt(y)), Base.rem(ZZ(x), BigInt(y)))
if x > 0
#@test Bdr == Base.divrem(UInt(x), y)
#@test Bdr == (Base.div(UInt(x), y), Base.rem(UInt(x), y))
@test Bdr == Base.divrem(UInt(x), BigInt(y))
@test Bdr == (Base.div(UInt(x), BigInt(y)), Base.rem(UInt(x), BigInt(y)))
@test Bdr == Base.divrem(UInt(x), ZZ(y))
@test Bdr == (Base.div(UInt(x), ZZ(y)), Base.rem(UInt(x), ZZ(y)))
end
if y > 0
@test Bdr == Base.divrem(x, UInt(y))
@test Bdr == (Base.div(x, UInt(y)), Base.rem(x, UInt(y)))
@test Bdr == Base.divrem(BigInt(x), UInt(y))
@test Bdr == (Base.div(BigInt(x), UInt(y)), Base.rem(BigInt(x), UInt(y)))
@test Bdr == Base.divrem(ZZ(x), UInt(y))
@test Bdr == (Base.div(ZZ(x), UInt(y)), Base.rem(ZZ(x), UInt(y)))
if x > 0
@test unsigned.(Bdr) == Base.divrem(UInt(x), UInt(y))
@test unsigned.(Bdr) == (Base.div(UInt(x), UInt(y)), Base.rem(UInt(x), UInt(y)))
end
end

Ndr = Nemo.divrem(x, y)
@test Ndr == (Nemo.div(x, y), mod(x, y))
@test Ndr == Nemo.divrem(BigInt(x), y)
@test Ndr == (Nemo.div(BigInt(x), y), mod(BigInt(x), y))
@test Ndr == Nemo.divrem(x, BigInt(y))
@test Ndr == (Nemo.div(x, BigInt(y)), mod(x, BigInt(y)))
@test Ndr == Nemo.divrem(BigInt(x), BigInt(y))
@test Ndr == (Nemo.div(BigInt(x), BigInt(y)), mod(BigInt(x), BigInt(y)))
@test Ndr == Nemo.divrem(ZZ(x), y)
@test Ndr == (Nemo.div(ZZ(x), y), mod(ZZ(x), y))
@test Ndr == Nemo.divrem(x, ZZ(y))
@test Ndr == (Nemo.div(x, ZZ(y)), mod(x, ZZ(y)))
@test Ndr == Nemo.divrem(ZZ(x), ZZ(y))
@test Ndr == (Nemo.div(ZZ(x), ZZ(y)), mod(ZZ(x), ZZ(y)))
@test Ndr == Nemo.divrem(BigInt(x), ZZ(y))
@test Ndr == (Nemo.div(BigInt(x), ZZ(y)), mod(BigInt(x), ZZ(y)))
@test Ndr == Nemo.divrem(ZZ(x), BigInt(y))
@test Ndr == (Nemo.div(ZZ(x), BigInt(y)), mod(ZZ(x), BigInt(y)))
if x > 0
#@test Ndr == Nemo.divrem(UInt(x), y)
#@test Ndr == (Nemo.div(UInt(x), y), mod(UInt(x), y))
@test Ndr == Nemo.divrem(UInt(x), BigInt(y))
@test Ndr == (Nemo.div(UInt(x), BigInt(y)), mod(UInt(x), BigInt(y)))
@test Ndr == Nemo.divrem(UInt(x), ZZ(y))
@test Ndr == (Nemo.div(UInt(x), ZZ(y)), mod(UInt(x), ZZ(y)))
end
if y > 0
#@test Ndr == Nemo.divrem(x, UInt(y))
#@test Ndr == (Nemo.div(x, UInt(y)), mod(x, UInt(y)))
@test Ndr == Nemo.divrem(BigInt(x), UInt(y))
@test Ndr == (Nemo.div(BigInt(x), UInt(y)), mod(BigInt(x), UInt(y)))
@test Ndr == Nemo.divrem(ZZ(x), UInt(y))
@test Ndr == (Nemo.div(ZZ(x), UInt(y)), mod(ZZ(x), UInt(y)))
if x > 0
@test unsigned.(Ndr) == Nemo.divrem(UInt(x), UInt(y))
@test unsigned.(Ndr) == (Nemo.div(UInt(x), UInt(y)), mod(UInt(x), UInt(y)))
end
end
end
end
end
Loading