#1823 - Use Tolerance for getfield in comparison of sets of the same …

…type (#1824) * Update LazySet.jl * define promotion rules in comparisons * Add default tolerance for Int and for Rational * Update src/Utils/comparisons.jl Co-Authored-By: Christian Schilling <[email protected]>
JuliaReach · Dec 12, 2019 · 8f371b3 · 8f371b3
1 parent 8cf9c30
commit 8f371b3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/Interfaces/LazySet.jl b/src/Interfaces/LazySet.jl
@@ -435,7 +435,7 @@ function ≈(X::LazySet, Y::LazySet)
     end
 
     for f in fieldnames(typeof(X))
-        if !(getfield(X, f) ≈ getfield(Y, f))
+        if !_isapprox(getfield(X, f), getfield(Y, f))
             return false
         end
     end

diff --git a/src/Utils/comparisons.jl b/src/Utils/comparisons.jl
@@ -101,6 +101,8 @@ set_atol(N::Type{NT}, ε::NT) where {NT<:Number} = begin
 end
 
 default_tolerance(N::Type{<:Number}) = error("default tolerance for numeric type $N is not defined")
+default_tolerance(N::Type{<:Rational}) = Tolerance(zero(N), zero(N), zero(N))
+default_tolerance(N::Type{<:Integer}) = Tolerance(zero(N), zero(N), zero(N))
 default_tolerance(N::Type{<:AbstractFloat}) = Tolerance(Base.rtoldefault(N), sqrt(eps(N)), zero(N))
 
 """
@@ -147,8 +149,9 @@ arguments to a common numeric type, returning them as a tuple. The conversion
 is such that the common type to which the values are converted can represent
 them as faithfully as possible.
 """
-_leq(x::N, y::M; kwargs...) where {N<:Real, M<:Real} =
-    _leq(promote(x, y)...; kwargs...)
+function _leq(x::N, y::M; kwargs...) where {N<:Real, M<:Real}
+    return _leq(promote(x, y)...; kwargs...)
+end
 
 """
     _geq(x::Real, y::Real; [kwargs...])
@@ -242,6 +245,11 @@ function _isapprox(x::N, y::N;
     end
 end
 
+# different numeric types with promotion
+function _isapprox(x::N, y::M; kwargs...) where {N<:Real, M<:Real}
+    return _isapprox(promote(x, y)...; kwargs...)
+end
+
 # generic "dense"
 function _isapprox(x::AbstractVector{N}, y::AbstractVector{N};
                    rtol::Real=_rtol(N),
@@ -268,6 +276,12 @@ function _isapprox(x::SparseVector{N}, y::SparseVector{N};
     return x.nzind == y.nzind && _isapprox(x.nzval, y.nzval, rtol=rtol, ztol=ztol, atol=atol)
 end
 
+# different numeric types with promotion
+function _isapprox(x::AbstractVector{N}, y::AbstractVector{M};
+                   kwargs...) where {N<:Real, M<:Real}
+    _isapprox(promote(x, y)...; kwargs...)
+end
+
 """
     ispermutation(u::AbstractVector{T}, v::AbstractVector)::Bool where {T}