Merge pull request #1200 from JuliaReach/schillic/union

Fix dim(::UnionSet)
JuliaReach · Mar 6, 2019 · ba1f869 · ba1f869
2 parents 8bc5c0b + dd6d626
commit ba1f869
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/docs/src/lib/operations.md b/docs/src/lib/operations.md
@@ -358,7 +358,7 @@ Hence these set types are not part of the convex-set family `LazySet`.
 ```@docs
 UnionSet
 ∪(::LazySet, ::LazySet)
-dim(::Union)
+dim(::UnionSet)
 σ(::AbstractVector{N}, ::UnionSet{N}; algorithm="support_vector") where {N<:Real}
 ρ(::AbstractVector{N}, ::UnionSet{N}) where {N<:Real}
 an_element(::UnionSet{N}) where {N<:Real}

diff --git a/src/UnionSet.jl b/src/UnionSet.jl
@@ -1,4 +1,4 @@
-import Base: isempty, ∈, ∪, Union
+import Base: isempty, ∈, ∪
 
 export UnionSet,
        UnionSetArray,
@@ -43,7 +43,7 @@ Alias for `UnionSet`.
 ∪(X::LazySet, Y::LazySet) = UnionSet(X, Y)
 
 """
-    dim(cup::Union)::Int
+    dim(cup::UnionSet)::Int
 
 Return the dimension of the set union of two convex sets.
 
@@ -55,7 +55,7 @@ Return the dimension of the set union of two convex sets.
 
 The ambient dimension of the union of two convex sets.
 """
-function dim(cup::Union)::Int
+function dim(cup::UnionSet)::Int
     return dim(cup.X)
 end
 

diff --git a/test/unit_UnionSet.jl b/test/unit_UnionSet.jl
@@ -12,6 +12,9 @@ for N in [Float64, Rational{Int}, Float32]
     Uarr = UnionSetArray([B1, B2])
 
     for U in [UXY, Uarr]
+        # dimension
+        @test dim(U) == dim(B1)
+
         # support vector (default algorithm)
         d = N[1, 0]
         @test σ(d, U) == [N(2), N(1)]