Merge pull request #3503 from JuliaReach/schillic/basetype

Outsource `basetype` to ReachabilityBase
JuliaReach · May 14, 2024 · 05f27b0 · 05f27b0
2 parents 3f9b7ae + cef46ba
commit 05f27b0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 54 deletions.
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -88,15 +88,21 @@ instantaneous.
 julia> Y = CH(SparseMatrixExp(A * δ) * X0 + δ * B * U, X0);
 ```
 
-By asking for the concrete type of `Y`, we see that it has a convex hull type,
-parameterized by the types of its arguments, corresponding to the mathematical
-formulation:
+By asking for the (parameter-free) type of `Y`, we see that it is a lazy convex
+hull:
 
 ```jldoctest index_label
-julia> basetype(Y)
+julia> LazySets.basetype(Y)
 ConvexHull
 ```
 
+The full type includes type parameters for the types of the arguments:
+
+```jldoctest index_label
+julia> typeof(Y)
+ConvexHull{Float64, MinkowskiSum{Float64, ExponentialMap{Float64, Ball2{Float64, Vector{Float64}}}, LinearMap{Float64, BallInf{Float64, Vector{Float64}}, Float64, Matrix{Float64}}}, Ball2{Float64, Vector{Float64}}}
+```
+
 Now suppose that we are interested in observing the projection of ``\mathcal{Y}``
 onto the variables number 1 and 500.
 First we define the ``2×1000`` projection matrix and apply it to ``\mathcal{Y}`` as

diff --git a/docs/src/lib/interfaces/LazySet.md b/docs/src/lib/interfaces/LazySet.md
@@ -49,7 +49,6 @@ extrema(::LazySet, ::Int)
 extrema(::LazySet)
 convex_hull(::LazySet; kwargs...)
 triangulate(::LazySet)
-basetype
 isboundedtype(::Type{<:LazySet})
 isbounded(::LazySet)
 _isbounded_unit_dimensions(::LazySet)

diff --git a/src/Interfaces/LazySet.jl b/src/Interfaces/LazySet.jl
@@ -1,5 +1,4 @@
 export LazySet,
-       basetype,
        neutral,
        absorbing,
        tosimplehrep,
@@ -326,51 +325,6 @@ The default implementation assumes that the first type parameter is `N`.
 """
 eltype(::LazySet{N}) where {N} = N
 
-"""
-    basetype(T::Type{<:LazySet})
-
-Return the base type of the given set type (i.e., without type parameters).
-
-### Input
-
-- `T` -- set type
-
-### Output
-
-The base type of `T`.
-"""
-basetype(T::Type{<:LazySet}) = Base.typename(T).wrapper
-
-"""
-    basetype(X::LazySet)
-
-Return the base type of the given set (i.e., without type parameters).
-
-### Input
-
-- `X` -- set
-
-### Output
-
-The base type of `X`.
-
-### Examples
-
-```jldoctest
-julia> Z = rand(Zonotope);
-
-julia> basetype(Z)
-Zonotope
-
-julia> basetype(Z + Z)
-MinkowskiSum
-
-julia> basetype(LinearMap(rand(2, 2), Z + Z))
-LinearMap
-```
-"""
-basetype(X::LazySet) = basetype(typeof(X))
-
 """
 ### Algorithm
 

diff --git a/src/LazySets.jl b/src/LazySets.jl
@@ -50,6 +50,7 @@ using ReachabilityBase.Commutative
 using ReachabilityBase.Distribution
 using ReachabilityBase.Subtypes
 using ReachabilityBase.Arrays
+using ReachabilityBase.Basetype
 
 # =================
 # External packages

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -29,9 +29,8 @@ using Symbolics
 # ==============================
 # Non-exported helper functions
 # ==============================
-using LazySets: _leq, _geq, isapproxzero, _isapprox, _ztol, ispermutation
-using LazySets.Arrays: isinvertible, inner, allequal,
-                       is_cyclic_permutation, SingleEntryVector
+using LazySets: _leq, _geq, isapproxzero, _isapprox, _ztol, ispermutation, basetype
+using LazySets.Arrays: isinvertible, inner, allequal, is_cyclic_permutation, SingleEntryVector
 
 global test_suite_basic = true
 global test_suite_polyhedra = true