Merge pull request #3945 from JuliaReach/schillic/ia_methods

Remove methods for `IntervalArithmetic` types

Author: schillic

src/ConcreteOperations/isdisjoint.jl

@@ -35,17 +35,6 @@ function _isdisjoint_convex_sufficient(X::LazySet, Y::LazySet)
     return ρ(d, Y) < -ρ(-d, X)
 end
 
-# conversion for IA types
-isdisjoint(X::LazySet, Y::IA.Interval, witness::Bool=false) = isdisjoint(X, Interval(Y), witness)
-isdisjoint(X::IA.Interval, Y::LazySet, witness::Bool=false) = isdisjoint(Interval(X), Y, witness)
-
-function isdisjoint(X::LazySet, Y::IA.IntervalBox, witness::Bool=false)
-    return isdisjoint(X, convert(Hyperrectangle, Y), witness)
-end
-function isdisjoint(X::IA.IntervalBox, Y::LazySet, witness::Bool=false)
-    return isdisjoint(convert(Hyperrectangle, X), Y, witness)
-end
-
 """
 # Extended help
 

src/ConcreteOperations/issubset.jl

@@ -7,13 +7,6 @@ function ⊆(::AbstractVector, ::LazySet)
                         "(they behave equivalently although the implementations may differ)"))
 end
 
-# conversion for IA types
-⊆(X::LazySet, Y::IA.Interval) = ⊆(X, Interval(Y))
-⊆(X::IA.Interval, Y::LazySet) = ⊆(Interval(X), Y)
-
-⊆(X::LazySet, Y::IA.IntervalBox) = ⊆(X, convert(Hyperrectangle, Y))
-⊆(X::IA.IntervalBox, Y::LazySet) = ⊆(convert(Hyperrectangle, X), Y)
-
 """
 # Extended help
 

src/Initialization/init_IntervalArithmetic.jl

@@ -1,16 +1,3 @@
-# convenience method for IntervalArithmetic.Interval
-function vertices_list(x::IA.Interval{N}) where {N}
-    a = IA.inf(x)
-    b = IA.sup(x)
-    ST = IA.SVector{1,N}
-    return _isapprox(a, b) ? [ST(a)] : [ST(a), ST(b)]
-end
-
-# convenience method for IntervalArithmetic.IntervalBox
-function vertices_list(H::IA.IntervalBox)
-    return vertices_list(convert(Hyperrectangle, H))
-end
-
 const zero_itv_store = Dict{Type,IA.Interval}()
 function zero_itv(N)
     res = get(zero_itv_store, N, nothing)

test/ConcreteOperations/isdisjoint.jl

@@ -8,20 +8,6 @@ if !isdefined(@__MODULE__, Symbol("@tN"))
 end
 
 for N in @tN([Float64, Float32, Rational{Int}])
-    # using IA types
-    X = IA.interval(N(0), N(1)) # IA
-    Y = Interval(N(-1), N(2))
-    Z = Interval(N(2), N(3))
-    res, w = isdisjoint(X, Y, true)
-    @test !isdisjoint(X, Y) && !isdisjoint(Y, X) && !res && w ∈ Interval(X) && w ∈ Y
-    res, w = isdisjoint(X, Z, true)
-    @test isdisjoint(X, Z) && isdisjoint(Z, X) && res && w == N[]
-
-    X = IntervalBox(IA.interval(N(0), N(1)), IA.interval(N(0), N(1)))
-    Y = Hyperrectangle(; low=[N(-1), N(-1)], high=[N(2), N(2)])
-    @test !isdisjoint(X, Y)
-    @test !isdisjoint(Y, X)
-
     @static if isdefined(@__MODULE__, :Polyhedra)
         if N == Rational{Int}
             for n in [2, 3]

test/ConcreteOperations/issubset.jl

@@ -29,17 +29,6 @@ for N in @tN([Float64, Float32, Rational{Int}])
         @test !(X ⊆ Y) && !res && w ∈ X && w ∉ Y
     end
 
-    # using IA types
-    X = IA.interval(N(0), N(1)) # IA
-    Y = Interval(N(-1), N(2))
-    @test X ⊆ Y
-    @test !(Y ⊆ X)
-
-    X = IntervalBox(IA.interval(N(0), N(1)), IA.interval(N(0), N(1)))
-    Y = Hyperrectangle(; low=[N(-1), N(-1)], high=[N(2), N(2)])
-    @test X ⊆ Y
-    @test !(Y ⊆ X)
-
     # interval with union of unbounded sets
     X = Interval(N(1), N(3))
     for H in (HalfSpace(N[1], N(2)), HalfSpace(N[-1], N(-2)))

test/Interfaces/IntervalArithmetic.jl

@@ -65,9 +65,6 @@ end
     @testset "LazySets.CDDLib" begin
         include("Interfaces/CDDLib.jl")
     end
-    @testset "LazySets.IntervalArithmetic" begin
-        include("Interfaces/IntervalArithmetic.jl")
-    end
     @testset "LazySets.SymEngine" begin
         include("Interfaces/SymEngine.jl")
     end