Fix ambiguities for isless with RealInfinity, Infinity, and InfiniteC… (

#51) * Fix ambiguities for isless with RealInfinity, Infinity, and InfiniteCardinality * Update cardinality.jl
JuliaMath · Dec 8, 2023 · 8580d78 · 8580d78 · dlfivefifty · Dec 8, 2023
1 parent 75c14ae
commit 8580d78
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Infinities"
 uuid = "e1ba4f0e-776d-440f-acd9-e1d2e9742647"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "0.1.7"
+version = "0.1.8"
 
 [compat]
 Aqua = "0.8"

diff --git a/src/Infinities.jl b/src/Infinities.jl
@@ -178,7 +178,8 @@ end
 <(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)

diff --git a/src/cardinality.jl b/src/cardinality.jl
@@ -70,6 +70,14 @@ isless(x::AbstractFloat, ::InfiniteCardinal{0}) = isfinite(x)
 isless(x::AbstractFloat, ::InfiniteCardinal) = true
 isless(::InfiniteCardinal, y::Real) = false
 isless(x::InfiniteCardinal, y::AbstractFloat) = false
+isless(x::RealInfinity, ::InfiniteCardinal{0}) = isless(x, ∞)
+isless(::InfiniteCardinal{0}, x::RealInfinity) = isless(∞, x)
+isless(x::RealInfinity, ::InfiniteCardinal) = true
+isless(::InfiniteCardinal, x::RealInfinity) = false
+isless(x::Infinity, ::InfiniteCardinal{0}) = isless(x, ∞)
+isless(::InfiniteCardinal{0}, x::Infinity) = isless(∞, x)
+isless(x::Infinity, ::InfiniteCardinal) = true
+isless(::InfiniteCardinal, x::Infinity) = false
 
 @generated <(::InfiniteCardinal{N}, ::InfiniteCardinal{M}) where {N,M} = :($(N < M))
 @generated ≤(::InfiniteCardinal{N}, ::InfiniteCardinal{M}) where {N,M} = :($(N ≤ M))

diff --git a/test/test_cardinality.jl b/test/test_cardinality.jl
@@ -33,6 +33,19 @@ using Infinities, Base64, Base.Checked, Test
         @test !isless(Inf, ℵ₀) && !isless(ℵ₀, Inf)
         @test isless(5, ℵ₀) && !isless(ℵ₀, 5)
         @test isless(5, ℵ₁) && !isless(ℵ₁, 5)
+        @test !isless(RealInfinity(), ℵ₀)
+        @test isless(-RealInfinity(), ℵ₀)
+        @test !isless(ℵ₀, RealInfinity())
+        @test !isless(ℵ₀, -RealInfinity())
+        @test isless(RealInfinity(), ℵ₁)
+        @test isless(-RealInfinity(), ℵ₁)
+        @test !isless(ℵ₁, RealInfinity())
+        @test !isless(ℵ₁, -RealInfinity())
+        @test !isless(∞, ℵ₀)
+        @test !isless(ℵ₀, ∞)
+        @test isless(∞, ℵ₁)
+        @test !isless(ℵ₁, ∞)
+
 
         @test !(ℵ₀ < ℵ₀) && !(ℵ₀ > ℵ₀)
         @test ℵ₀ ≤ ℵ₀ && ℵ₀ ≥ ℵ₀