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

zero and one for irrational numbers #34773

Merged
merged 3 commits into from
Feb 20, 2020
Merged

zero and one for irrational numbers #34773

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
739ceb3
zero, one and oneunit (throws) for irrationals
mohamed82008 Feb 16, 2020
8e8a725
tab to whitespace indentation
mohamed82008 Feb 16, 2020
f96aec9
remove oneunit for irrationals
mohamed82008 Feb 16, 2020
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
9 changes: 9 additions & 0 deletions base/irrationals.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ hash(x::Irrational, h::UInt) = 3*objectid(x) - h

widen(::Type{T}) where {T<:Irrational} = T

zero(::AbstractIrrational) = false
zero(::Type{<:AbstractIrrational}) = false

one(::AbstractIrrational) = true
one(::Type{<:AbstractIrrational}) = true

oneunit(T::Type{<:AbstractIrrational}) = throw(ArgumentError("The number one cannot be of type $T"))
oneunit(x::T) where {T <: AbstractIrrational} = oneunit(T)
mohamed82008 marked this conversation as resolved.
Show resolved Hide resolved

-(x::AbstractIrrational) = -Float64(x)
for op in Symbol[:+, :-, :*, :/, :^]
@eval $op(x::AbstractIrrational, y::AbstractIrrational) = $op(Float64(x),Float64(y))
Expand Down
9 changes: 9 additions & 0 deletions test/numbers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,15 @@ end
@test !(1 > NaN)
end

@testset "Irrational zero, one and oneunit" begin
@test one(pi) === true
@test zero(pi) === false
@test one(typeof(pi)) === true
@test zero(typeof(pi)) === false
@test_throws ArgumentError oneunit(pi)
@test_throws ArgumentError oneunit(typeof(pi))
mohamed82008 marked this conversation as resolved.
Show resolved Hide resolved
end

@testset "Irrationals compared with Irrationals" begin
for i in (π, ℯ, γ, catalan)
for j in (π, ℯ, γ, catalan)
Expand Down