update isapprox

JuliaMath · Apr 9, 2020 · 1bb8889 · 1bb8889 · JeffreySarnoff · Apr 9, 2020
1 parent 6b2b152
commit 1bb8889
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/src/extras/misc.jl b/src/extras/misc.jl
@@ -10,28 +10,18 @@ releps(::Type{Float32}) = ldexp(inv(sqrt(2.0f0)), -17)
 releps(::Type{Double64}) = ldexp(0.5, -62)
 releps(::Type{Double32}) = ldexp(inv(sqrt(2.0f0)), -34)
 
-#=
-function isapprox(x::Number, y::Number; atol::Real=0, rtol::Real=rtoldefault(x,y,atol), nans::Bool=false)
-    x == y || (isfinite(x) && isfinite(y) && abs(x-y) <= max(atol, rtol*max(abs(x), abs(y)))) || (nans && isnan(x) && isnan(y))
-end
-
-function Base.isapprox(x::DoubleFloat{T}, y::T; atol::Real=0.0, rtol::Real=atol>0 ? 0 : releps(T), nans::Bool=false, norm::Function=norm) where {T<:IEEEFloat}
-    return isapprox(x, DoubleFloat{T}(y), atol=atol, rtol=rtol, nans=nans, norm=norm)
+function Base.isapprox(x::DoubleFloat{T}, y::Real; atol::Real=0.0, rtol::Real=Base.rtoldefault(HI(x),y,atol), nans::Bool=false) where {T<:IEEEFloat}
+    return isapprox(x, DoubleFloat{T}(y), atol=atol, rtol=rtol, nans=nans)
 end
-function Base.isapprox(x::T, y::DoubleFloat{T}; atol::Real=0.0, rtol::Real=atol>0 ? 0 : releps(T), nans::Bool=false, norm::Function=norm) where {T<:IEEEFloat}
-    return isapprox(DoubleFloat{T}(x), y, atol=atol, rtol=rtol, nans=nans, norm=norm)
+function Base.isapprox(x::Real, y::DoubleFloat{T}; atol::Real=0.0, rtol::Real=Base.rtoldefault(x,HI(y),atol), nans::Bool=false) where {T<:IEEEFloat}
+    return isapprox(DoubleFloat{T}(x), y, atol=atol, rtol=rtol, nans=nans)
 end
-function Base.isapprox(x::DoubleFloat{T}, y::DoubleFloat{T}; atol::Real=0.0, rtol::Real=atol>0 ? 0 : releps(DoubleFloat{T}), nans::Bool=false, norm::Function=norm) where {T<:IEEEFloat}
-    x == y || (isfinite(x) && isfinite(y) && abs(x-y) <= max(max(1.0e-32, atol), rtol*max(abs(x), abs(y)))) || (nans && isnan(x) && isnan(y))
+function Base.isapprox(x::DoubleFloat{T}, y::DoubleFloat{T}; atol::Real=0.0, rtol::Real=Base.rtoldefault(HI(x),HI(y),atol), nans::Bool=false) where {T<:IEEEFloat}
+    HI(x) === HI(y) || (isfinite(x) && isfinite(y) && abs(x-y) <= max(max(1.0e-32, atol), rtol*max(abs(x), abs(y)))) || (nans && isnan(x) && isnan(y))
 end
-
-Base.isapprox(x::DoubleFloat{T}, y::F; atol::Real=0.0, rtol::Real=atol>0.0 ? 0.0 : eps(max(abs(x), abs(y)))^(37/64), nans::Bool=false, norm::Function=norm) where {T<:IEEEFloat, F<:Real} =
+Base.isapprox(x::DoubleFloat{T}, y::DoubleFloat{F}; atol::Real=0.0, rtol::Real=Base.rtoldefault(HI(x),HI(y),atol), nans::Bool=false) where {T<:IEEEFloat, F<:IEEEFloat} =
     isapprox(promote(x, y)..., atol=atol, rtol=rtol, nans=nans, norm=norm)
 
-Base.isapprox(x::F, y::DoubleFloat{T}; atol::Real=0.0, rtol::Real=atol>0.0 ? 0.0 : eps(max(abs(x), abs(y)))^(37/64), nans::Bool=false, norm::Function=norm) where {T<:IEEEFloat, F<:Real} =
-    isapprox(promote(x, y)..., atol=atol, rtol=rtol, nans=nans, norm=norm)
-=#
-
 function Base.lerpi(j::Integer, d::Integer, a::DoubleFloat{T}, b::DoubleFloat{T}) where {T}
     t = DoubleFloat{T}(j)/d
     a = fma(-t, a, a)