fix ambiguities (#40)

* fix ambiguities * Update cardinality.jl * update * update * update * update * update * multiplication * Update ambiguities.jl * update * isinf and isfinite * mod * fld, cld, div * cleanup * cleanup and add a test * test ComplexInfinity promotion * Update Infinities.jl * Update runtests.jl * coverage * coverage * add a note * add tests for #47 --------- Co-authored-by: Sheehan Olver <[email protected]>
JuliaMath · Nov 29, 2024 · eb0e5bb · eb0e5bb
1 parent 1b8c2ce
commit eb0e5bb
Show file tree

Hide file tree

Showing 9 changed files with 242 additions and 441 deletions.
diff --git a/src/Infinities.jl b/src/Infinities.jl
@@ -34,81 +34,15 @@ _convert(::Type{Float16}, ::Infinity) = Inf16
 _convert(::Type{T}, ::Infinity) where {T<:Real} = convert(T, Inf)::T
 (::Type{T})(x::Infinity) where {T<:Real} = _convert(T, x)
 
-
 sign(y::Infinity) = 1
 angle(x::Infinity) = 0
+signbit(::Infinity) = false
 
 one(::Type{Infinity}) = 1
 oneunit(::Type{Infinity}) = 1
 oneunit(::Infinity) = 1
 zero(::Infinity) = 0
 
-isinf(::Infinity) = true
-isfinite(::Infinity) = false
-
-==(x::Infinity, y::Infinity) = true
-==(x::Infinity, y::Number) = isinf(y) && angle(y) == angle(x)
-==(y::Number, x::Infinity) = x == y
-
-isless(x::Infinity, y::Infinity) = false
-isless(x::Real, y::Infinity) = isfinite(x) || signbit(x)
-isless(x::AbstractFloat, y::Infinity) = isless(x, convert(typeof(x), y))
-isless(x::Infinity, y::AbstractFloat) = false
-isless(x::Infinity, y::Real) = false
-
-≤(::Infinity, ::Infinity) = true
-<(::Infinity, ::Infinity) = false
-
-<(x::Real, ::Infinity) = isfinite(x) || signbit(x)
-≤(::Real, ::Infinity) = true
-<(::Infinity, ::Real) = false
-≤(::Infinity, y::Real) = isinf(y) && !signbit(y)
-
-min(::Infinity, ::Infinity) = ∞
-max(::Infinity, ::Infinity) = ∞
-min(x::Real, ::Infinity) = x
-max(::Real, ::Infinity) = ∞
-min(::Infinity, x::Real) = x
-max(::Infinity, ::Real) = ∞
-
-+(::Infinity) = ∞
-+(::Infinity, ::Infinity) = ∞
-+(::Number, y::Infinity) = ∞
-+(::Infinity, ::Number) = ∞
--(::Infinity, ::Number) = ∞
-
-+(::Integer, y::Infinity) = ∞
-+(::Infinity, ::Integer) = ∞
--(::Infinity, ::Integer) = ∞
-
--(::Infinity, ::Infinity) = NotANumber()
-
-# ⊻ is xor
-*(::Infinity) = ∞
-*(::Infinity, ::Infinity) = ∞
-
-
-
-for OP in (:fld,:cld,:div)
-  @eval begin
-    $OP(::Infinity, ::Real) = ∞
-    $OP(::Infinity, ::Infinity) = NotANumber()
-  end
-end
-
-div(::T, ::Infinity) where T<:Real = zero(T)
-fld(x::T, ::Infinity) where T<:Real = signbit(x) ? -one(T) : zero(T)
-cld(x::T, ::Infinity) where T<:Real = signbit(x) ? zero(T) : one(T)
-
-mod(::Infinity, ::Infinity) = NotANumber()
-mod(::Infinity, ::Real) = NotANumber()
-function mod(x::Real, ::Infinity)
-    x ≥ 0 || throw(ArgumentError("mod(x,∞) is unbounded for x < 0"))
-    x
-end
-
-
-
 struct RealInfinity <: Real
     signbit::Bool
 end
@@ -117,135 +51,24 @@ RealInfinity() = RealInfinity(false)
 RealInfinity(::Infinity) = RealInfinity()
 RealInfinity(x::RealInfinity) = x
 
--(::Infinity) = RealInfinity(true)
--(x::Number, ::Infinity) = x + (-∞)
--(x::Integer, ::Infinity) = x + (-∞)
--(x::Complex, ::Infinity) = x + (-∞)
--(x::Complex{Bool}, ::Infinity) = x + (-∞)
-
-
-isinf(::RealInfinity) = true
-isfinite(::RealInfinity) = false
-
-promote_rule(::Type{Infinity}, ::Type{RealInfinity}) = RealInfinity
-_convert(::Type{RealInfinity}, ::Infinity) = RealInfinity(false)
-
 _convert(::Type{Float16}, x::RealInfinity) = sign(x)*Inf16
 _convert(::Type{Float32}, x::RealInfinity) = sign(x)*Inf32
 _convert(::Type{Float64}, x::RealInfinity) = sign(x)*Inf64
 _convert(::Type{T}, x::RealInfinity) where {T<:Real} = sign(x)*convert(T, Inf)
 (::Type{T})(x::RealInfinity) where {T<:Real} = _convert(T, x)
 
+for Typ in (RealInfinity, Infinity)
+    @eval Bool(x::$Typ) = throw(InexactError(:Bool, Bool, x)) # ambiguity fix
+end
 
 signbit(y::RealInfinity) = y.signbit
 sign(y::RealInfinity) = 1-2signbit(y)
 angle(x::RealInfinity) = π*signbit(x)
-mod(::RealInfinity, ::RealInfinity) = NotANumber()
-mod(::RealInfinity, ::Real) = NotANumber()
-function mod(x::Real, y::RealInfinity)
-    signbit(x) == signbit(y) || throw(ArgumentError("mod($x,$y) is unbounded"))
-    x
-end
 
 string(y::RealInfinity) = signbit(y) ? "-∞" : "+∞"
 show(io::IO, y::RealInfinity) = print(io, string(y))
 
-==(x::RealInfinity, y::Infinity) = !x.signbit
-==(y::Infinity, x::RealInfinity) = !x.signbit
-==(x::RealInfinity, y::RealInfinity) = x.signbit == y.signbit
-
-==(x::RealInfinity, y::Number) = isinf(y) && signbit(y) == signbit(x)
-==(y::Number, x::RealInfinity) = x == y
-
-isless(x::RealInfinity, y::RealInfinity) = signbit(x) && !signbit(y)
-for Typ in (:Number, :Real, :Integer, :AbstractFloat)
-    @eval begin
-        isless(x::RealInfinity, y::$Typ) = signbit(x) && y ≠ -∞
-        isless(x::$Typ, y::RealInfinity) = !signbit(y) && x ≠ ∞
-        +(::$Typ, y::RealInfinity) = y
-        +(y::RealInfinity, ::$Typ) = y
-        -(y::RealInfinity, ::$Typ) = y
-        -(::$Typ, y::RealInfinity) = -y
-        function *(a::$Typ, y::RealInfinity)
-            iszero(a) && throw(ArgumentError("Cannot multiply $a * $y"))
-            a > 0 ? y : (-y)
-        end
-    end
-end
-
-≤(::RealInfinity, ::Infinity) = true
-≤(::Infinity, s::RealInfinity) = !signbit(s)
-<(s::RealInfinity, ::Infinity) = signbit(s)
-<(::Infinity, ::RealInfinity) = false
-
-isless(x::RealInfinity, ::Infinity) = isless(x, RealInfinity())
-isless(::Infinity, x::RealInfinity) = isless(RealInfinity(), x)
-
-
-function -(::Infinity, y::RealInfinity)
-    signbit(y) || throw(ArgumentError("Cannot subtract ∞ from ∞"))
-    ∞
-end
-
-function -(x::RealInfinity, ::Infinity)
-    signbit(x) || throw(ArgumentError("Cannot subtract ∞ from ∞"))
-    x
-end
-
-function -(x::RealInfinity, y::RealInfinity)
-    signbit(x) == !signbit(y) || throw(ArgumentError("Cannot subtract ∞ from ∞"))
-    x
-end
-
--(y::RealInfinity) = RealInfinity(!y.signbit)
-
-function +(x::RealInfinity, y::RealInfinity)
-    x == y || throw(ArgumentError("Angles must be the same to add ∞"))
-    x
-end
-
-+(x::RealInfinity, y::Infinity) = x+RealInfinity(y)
-+(x::Infinity, y::RealInfinity) = RealInfinity(x)+y
-
-# ⊻ is xor
-*(a::RealInfinity, b::RealInfinity) = RealInfinity(signbit(a) ⊻ signbit(b))
-*(a::Infinity, b::RealInfinity) = RealInfinity(a)*b
-*(a::RealInfinity, b::Infinity) = a*RealInfinity(b)
-
-*(a::Integer, y::Infinity) = a*RealInfinity(y)
-*(y::Infinity, a::Integer) = RealInfinity(y)*a
-
-*(a::Real, y::Infinity) = a*RealInfinity(y)
-*(y::Infinity, a::Real) = RealInfinity(y)*a
-
-*(y::RealInfinity, a::Real) = a*y
-*(y::RealInfinity, a::Integer) = a*y
-
-<(x::RealInfinity, y::RealInfinity) = signbit(x) & !signbit(y)
-≤(x::RealInfinity, y::RealInfinity) = signbit(x) | !signbit(y)
-
-for OP in (:<,:≤)
-    @eval begin
-        $OP(x::Real, y::RealInfinity) = !signbit(y)
-        $OP(y::RealInfinity, x::Real) = signbit(y)
-    end
-end
-
-
-min(x::RealInfinity, y::RealInfinity) = RealInfinity(x.signbit | y.signbit)
-max(x::RealInfinity, y::RealInfinity) = RealInfinity(x.signbit & y.signbit)
-min(x::Real, y::RealInfinity) = y.signbit ? y : x
-max(x::Real, y::RealInfinity) = y.signbit ? x : y
-min(x::RealInfinity, y::Real) = x.signbit ? x : y
-max(x::RealInfinity, y::Real) = x.signbit ? y : x
-min(x::RealInfinity, ::Infinity) = x
-max(::RealInfinity, ::Infinity) = ∞
-min(::Infinity, x::RealInfinity) = x
-max(::Infinity, x::RealInfinity) = ∞
-
-
-
-######
+#######
 # ComplexInfinity
 #######
 
@@ -268,15 +91,12 @@ ComplexInfinity{T}(::Infinity) where T<:Real = ComplexInfinity{T}()
 ComplexInfinity(::Infinity) = ComplexInfinity()
 ComplexInfinity{T}(x::RealInfinity) where T<:Real = ComplexInfinity{T}(signbit(x))
 ComplexInfinity(x::RealInfinity) = ComplexInfinity(signbit(x))
+ComplexInfinity{T}(x::ComplexInfinity) where T<:Real = ComplexInfinity(T(signbit(x))) # ambiguity fix
 
+signbit(y::ComplexInfinity{Bool}) = y.signbit
+signbit(y::ComplexInfinity{<:Integer}) = !(mod(y.signbit,2) == 0)
+signbit(y::ComplexInfinity) = y.signbit
 
-
-isinf(::ComplexInfinity) = true
-isfinite(::ComplexInfinity) = false
-
-
-promote_rule(::Type{Infinity}, ::Type{ComplexInfinity{T}}) where T = ComplexInfinity{T}
-promote_rule(::Type{RealInfinity}, ::Type{ComplexInfinity{T}}) where T = ComplexInfinity{T}
 convert(::Type{ComplexInfinity{T}}, ::Infinity) where T = ComplexInfinity{T}()
 convert(::Type{ComplexInfinity}, ::Infinity) = ComplexInfinity()
 convert(::Type{ComplexInfinity{T}}, x::RealInfinity) where T = ComplexInfinity{T}(x)
@@ -285,95 +105,15 @@ convert(::Type{ComplexInfinity}, x::RealInfinity) = ComplexInfinity(x)
 
 sign(y::ComplexInfinity{<:Integer}) = mod(y.signbit,2) == 0 ? 1 : -1
 angle(x::ComplexInfinity) = π*x.signbit
-mod(::ComplexInfinity{<:Integer}, ::Integer) = NotANumber()
-
 
 show(io::IO, x::ComplexInfinity) = print(io, "exp($(x.signbit)*im*π)∞")
 
-==(x::ComplexInfinity, y::Infinity) = x.signbit == 0
-==(y::Infinity, x::ComplexInfinity) = x.signbit == 0
-==(x::ComplexInfinity, y::RealInfinity) = x.signbit == signbit(y)
-==(y::RealInfinity, x::ComplexInfinity) = x.signbit == signbit(y)
-==(x::ComplexInfinity, y::ComplexInfinity) = x.signbit == y.signbit
-
-==(x::ComplexInfinity, y::Number) = isinf(y) && angle(y) == angle(x)
-==(y::Number, x::ComplexInfinity) = x == y
-
-isless(x::ComplexInfinity{Bool}, y::ComplexInfinity{Bool}) = x.signbit && !y.signbit
-isless(x::Number, y::ComplexInfinity{Bool}) = !y.signbit && x ≠ ∞
-isless(x::ComplexInfinity{Bool}, y::Number) = x.signbit && y ≠ -∞
-
--(y::ComplexInfinity{B}) where B<:Integer = sign(y) == 1 ? ComplexInfinity(one(B)) : ComplexInfinity(zero(B))
-
-function +(x::ComplexInfinity, y::ComplexInfinity)
-    x == y || throw(ArgumentError("Angles must be the same to add ∞"))
-    promote_type(typeof(x),typeof(y))(x.signbit)
-end
-
-+(x::ComplexInfinity, y::Infinity) = x+ComplexInfinity(y)
-+(x::Infinity, y::ComplexInfinity) = ComplexInfinity(x)+y
-+(x::ComplexInfinity, y::RealInfinity) = x+ComplexInfinity(y)
-+(x::RealInfinity, y::ComplexInfinity) = ComplexInfinity(x)+y
-+(::Number, y::ComplexInfinity) = y
-+(y::ComplexInfinity, ::Number) = y
--(y::ComplexInfinity, ::Number) = y
--(::Number, y::ComplexInfinity) = -y
-
-+(::Complex, ::Infinity) = ComplexInfinity()
-+(::Infinity, ::Complex) = ComplexInfinity()
--(::Infinity, ::Complex) = ComplexInfinity()
-+(::Complex{Bool}, ::Infinity) = ComplexInfinity()
-+(::Infinity, ::Complex{Bool}) = ComplexInfinity()
--(::Infinity, ::Complex{Bool}) = ComplexInfinity()
-
-+(::Complex, y::RealInfinity) = ComplexInfinity(y)
-+(y::RealInfinity, ::Complex) = ComplexInfinity(y)
--(y::RealInfinity, ::Complex) = ComplexInfinity(y)
-+(::Complex{Bool}, y::RealInfinity) = ComplexInfinity(y)
-+(y::RealInfinity, ::Complex{Bool}) = ComplexInfinity(y)
--(y::RealInfinity, ::Complex{Bool}) = ComplexInfinity(y)
-
-
-# ⊻ is xor
-*(a::ComplexInfinity{Bool}, b::ComplexInfinity{Bool}) = ComplexInfinity(a.signbit ⊻ b.signbit)
-*(a::ComplexInfinity, b::ComplexInfinity) = ComplexInfinity(a.signbit + b.signbit)
-*(a::Infinity, b::ComplexInfinity) = ComplexInfinity(a)*b
-*(a::ComplexInfinity, b::Infinity) = a*ComplexInfinity(b)
-*(a::RealInfinity, b::ComplexInfinity) = ComplexInfinity(a)*b
-*(a::ComplexInfinity, b::RealInfinity) = a*ComplexInfinity(b)
-
-*(a::Real, y::ComplexInfinity) = a > 0 ? y : (-y)
-*(y::ComplexInfinity, a::Real) = a*y
-
-*(a::Number, y::ComplexInfinity) = ComplexInfinity(y.signbit+angle(a)/π)
-*(y::ComplexInfinity, a::Number) = a*y
-
-*(a::Complex, y::Infinity) = a*ComplexInfinity(y)
-*(y::Infinity, a::Complex) = ComplexInfinity(y)*a
-
-*(a::Complex,y::RealInfinity) = a*ComplexInfinity(y)
-*(y::RealInfinity, a::Complex) = ComplexInfinity(y)*a
-
-for OP in (:fld,:cld,:div)
-  @eval $OP(y::ComplexInfinity, a::Number) = y*(1/sign(a))
-end
-
-min(x::ComplexInfinity{B}, y::ComplexInfinity{B}) where B<:Integer = sign(x) == -1 ? x : y
-max(x::ComplexInfinity{B}, ::ComplexInfinity{B}) where B<:Integer = sign(x) == 1 ? x : y
-min(x::Real, y::ComplexInfinity{B}) where B<:Integer = sign(y) == 1 ? x : y
-min(x::ComplexInfinity{B}, y::Real) where B<:Integer = min(y,x)
-max(x::Real, y::ComplexInfinity{B}) where B<:Integer = sign(y) == 1 ? y : x
-max(x::ComplexInfinity{B}, y::Real) where B<:Integer = max(y,x)
-
-for OP in (:<,:≤)
-    @eval begin
-        $OP(x::Real, y::ComplexInfinity{B}) where B<:Integer = sign(y) ==  1
-        $OP(y::ComplexInfinity{B}, x::Real) where B<:Integer = sign(y) == -1
-    end
-end
-
 Base.hash(::Infinity) = 0x020113134b21797f # made up
 
 
 include("cardinality.jl")
+include("interface.jl")
+include("compare.jl")
+include("algebra.jl")
+include("ambiguities.jl")
 end # module