Skip to content

Commit cb7acdf

Browse files
authored
don't extend greater and geq (#21)
* don't extend greater and geq * bump version to v0.1.5 * remove omitted geq methods
1 parent b471935 commit cb7acdf

File tree

3 files changed

+4
-41
lines changed

3 files changed

+4
-41
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Infinities"
22
uuid = "e1ba4f0e-776d-440f-acd9-e1d2e9742647"
33
authors = ["Sheehan Olver <[email protected]>"]
4-
version = "0.1.4"
4+
version = "0.1.5"
55

66
[compat]
77
julia = "1"

src/Infinities.jl

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,12 @@ isless(x::Infinity, y::Real) = false
6161

6262
(::Infinity, ::Infinity) = true
6363
<(::Infinity, ::Infinity) = false
64-
(::Infinity, ::Infinity) = true
65-
>(::Infinity, ::Infinity) = false
6664

6765
<(x::Real, ::Infinity) = isfinite(x) || signbit(x)
6866
(::Real, ::Infinity) = true
6967
<(::Infinity, ::Real) = false
7068
(::Infinity, y::Real) = isinf(y) && !signbit(y)
7169

72-
>(::Real, ::Infinity) = false
73-
(x::Real, ::Infinity) = isinf(x) && !signbit(x)
74-
>(::Infinity, y::Real) = isfinite(y) || signbit(y)
75-
(::Infinity, y::Real) = true
76-
77-
7870
min(::Infinity, ::Infinity) =
7971
max(::Infinity, ::Infinity) =
8072
min(x::Real, ::Infinity) = x
@@ -191,10 +183,6 @@ end
191183
(::Infinity, s::RealInfinity) = !signbit(s)
192184
<(s::RealInfinity, ::Infinity) = signbit(s)
193185
<(::Infinity, ::RealInfinity) = false
194-
(s::RealInfinity, ::Infinity) = !signbit(s)
195-
(::Infinity, ::RealInfinity) = true
196-
>(::RealInfinity, ::Infinity) = false
197-
>(::Infinity, s::RealInfinity) = signbit(s)
198186

199187

200188

@@ -323,7 +311,7 @@ isless(x::ComplexInfinity{Bool}, y::Number) = x.signbit && y ≠ -∞
323311
-(y::ComplexInfinity{B}) where B<:Integer = sign(y) == 1 ? ComplexInfinity(one(B)) : ComplexInfinity(zero(B))
324312

325313
function +(x::ComplexInfinity, y::ComplexInfinity)
326-
x == y || throw(ArgumentError("Angles must be the same to add ∞"))
314+
x == y || throw(ArgumentError("Angles must be the same to add ∞"))
327315
promote_type(typeof(x),typeof(y))(x.signbit)
328316
end
329317

@@ -389,13 +377,6 @@ for OP in (:<,:≤)
389377
end
390378
end
391379

392-
for OP in (:>, :)
393-
@eval begin
394-
$OP(x::Real, y::ComplexInfinity{B}) where B<:Integer = sign(y) == -1
395-
$OP(y::ComplexInfinity{B}, x::Real) where B<:Integer = sign(y) == 1
396-
end
397-
end
398-
399380
Base.hash(::Infinity) = 0x020113134b21797f # made up
400381

401382

src/cardinality.jl

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ isless(x::InfiniteCardinal, y::AbstractFloat) = false
6767

6868
@generated <(::InfiniteCardinal{N}, ::InfiniteCardinal{M}) where {N,M} = :($(N < M))
6969
@generated (::InfiniteCardinal{N}, ::InfiniteCardinal{M}) where {N,M} = :($(N M))
70-
@generated >(::InfiniteCardinal{N}, ::InfiniteCardinal{M}) where {N,M} = :($(N > M))
71-
@generated (::InfiniteCardinal{N}, ::InfiniteCardinal{M}) where {N,M} = :($(N M))
7270

7371
(::InfiniteCardinal{0}, ::InfiniteCardinal) = true
74-
>(::InfiniteCardinal{0}, ::InfiniteCardinal) = false
75-
(::InfiniteCardinal, ::InfiniteCardinal{0}) = true
7672
<(::InfiniteCardinal, ::InfiniteCardinal{0}) = false
7773

7874

@@ -82,14 +78,9 @@ isless(x::InfiniteCardinal, y::AbstractFloat) = false
8278
<(::InfiniteCardinal, x::Real) = false
8379
(::InfiniteCardinal{0}, x::Real) = x
8480
(::InfiniteCardinal, x::Real) = false
85-
(::InfiniteCardinal{0}, x::RealInfinity) = x
81+
(::InfiniteCardinal{0}, x::RealInfinity) = x
8682
(::InfiniteCardinal, x::RealInfinity) = false
87-
>(::InfiniteCardinal{0}, y::Real) => y
88-
>(::InfiniteCardinal, ::Real) = true
89-
(::InfiniteCardinal, ::Real) = true
90-
>(::Real, ::InfiniteCardinal) = false
91-
(x::Real, ::InfiniteCardinal{0}) = x  ∞
92-
(x::Real, ::InfiniteCardinal) = false
83+
<(::InfiniteCardinal, x::RealInfinity) = false
9384

9485

9586
<(::Infinity, ::InfiniteCardinal{0}) = false
@@ -98,20 +89,11 @@ isless(x::InfiniteCardinal, y::AbstractFloat) = false
9889
<(::InfiniteCardinal, ::Infinity) = false
9990
(::InfiniteCardinal{0}, ::Infinity) = true
10091
(::InfiniteCardinal, ::Infinity) = false
101-
>(::InfiniteCardinal{0}, ::Infinity) = false
102-
>(::InfiniteCardinal, ::Infinity) = true
103-
(::InfiniteCardinal, ::Infinity) = true
104-
>(::Infinity, ::InfiniteCardinal) = false
105-
(::Infinity, ::InfiniteCardinal{0}) = true
106-
(::Infinity, ::InfiniteCardinal) = false
10792

10893

10994
<(x::RealInfinity, ::InfiniteCardinal{0}) = x <
11095
<(x::RealInfinity, ::InfiniteCardinal) = true
11196
(x::RealInfinity, ::InfiniteCardinal) = true
112-
>(::InfiniteCardinal{0}, y::RealInfinity) => y
113-
>(::InfiniteCardinal, ::RealInfinity) = true
114-
(::InfiniteCardinal, ::RealInfinity) = true
11597

11698

11799
@generated min(::InfiniteCardinal{N}, ::InfiniteCardinal{M}) where {N,M} = :(InfiniteCardinal{$(min(N,M))}())

0 commit comments

Comments
 (0)