Merge pull request #3582 from JuliaReach/schillic/VPolytope

Outsource `VPolytope` to its own module
JuliaReach · Jul 14, 2024 · f9972ed · f9972ed
2 parents d3b9e77 + d8e4b60
commit f9972ed
Show file tree

Hide file tree

Showing 27 changed files with 744 additions and 669 deletions.
diff --git a/docs/src/lib/sets/VPolytope.md b/docs/src/lib/sets/VPolytope.md
@@ -1,33 +1,43 @@
 ```@meta
-CurrentModule = LazySets
+CurrentModule = LazySets.VPolytopeModule
 ```
 
 # [Polytope in vertex representation (VPolytope)](@id def_VPolytope)
 
 ```@docs
 VPolytope
+```
+
+## Operations
+
+```@docs
+constraints_list(::VPolytope)
 dim(::VPolytope)
-σ(::AbstractVector, ::VPolytope)
-ρ(::AbstractVector, ::VPolytope)
-∈(::AbstractVector{N}, ::VPolytope{N}) where {N}
+polyhedron(::VPolytope)
 rand(::Type{VPolytope})
-translate(::VPolytope, ::AbstractVector)
-translate!(::VPolytope, ::AbstractVector)
-vertices_list(::VPolytope)
 remove_redundant_vertices(::VPolytope{N}) where {N}
-constraints_list(::VPolytope)
+reflect(::VPolytope)
 tohrep(::VPolytope{N}) where {N}
 tovrep(::VPolytope)
-polyhedron(::VPolytope)
+vertices_list(::VPolytope)
 linear_map(::AbstractMatrix, ::VPolytope)
-reflect(::VPolytope)
+∈(::AbstractVector{N}, ::VPolytope{N}) where {N}
+ρ(::AbstractVector, ::VPolytope)
+σ(::AbstractVector, ::VPolytope)
+translate(::VPolytope, ::AbstractVector)
+translate!(::VPolytope, ::AbstractVector)
 ```
+
+```@meta
+CurrentModule = LazySets
+```
+
 Inherited from [`LazySet`](@ref):
+* [`diameter`](@ref diameter(::LazySet, ::Real))
 * [`high`](@ref high(::LazySet))
 * [`low`](@ref low(::LazySet))
 * [`norm`](@ref norm(::LazySet, ::Real))
 * [`radius`](@ref radius(::LazySet, ::Real))
-* [`diameter`](@ref diameter(::LazySet, ::Real))
 * [`singleton_list`](@ref singleton_list(::LazySet))
 
 Inherited from [`AbstractPolyhedron`](@ref):

diff --git a/src/Initialization/init_Polyhedra.jl b/src/Initialization/init_Polyhedra.jl
@@ -39,6 +39,5 @@ end
 
 eval(load_polyhedra_hpolytope())
 eval(load_polyhedra_hpolyhedron())
-eval(load_polyhedra_vpolytope())
 eval(load_polyhedra_mesh())
 eval(load_polyhedra_lazyset())
diff --git a/src/LazySets.jl b/src/LazySets.jl
@@ -120,8 +120,11 @@ include("Sets/DensePolynomialZonotope/DensePolynomialZonotopeModule.jl")
 @reexport using ..DensePolynomialZonotopeModule: DensePolynomialZonotope
 
 include("Sets/HPolygon.jl")
+
 include("Sets/HPolygonOpt.jl")
+
 include("Sets/HPolytope.jl")
+
 include("Sets/HPolyhedron.jl")
 
 include("Sets/HParallelotope/HParallelotopeModule.jl")
@@ -132,6 +135,7 @@ include("Sets/HParallelotope/HParallelotopeModule.jl")
                                         offset
 
 include("Sets/Hyperplane.jl")
+
 include("Sets/Hyperrectangle.jl")
 
 include("Sets/Line2D/Line2DModule.jl")
@@ -162,7 +166,9 @@ Alias for `SimpleSparsePolynomialZonotope`.
 const PolynomialZonotope = SimpleSparsePolynomialZonotope
 
 include("Sets/VPolygon.jl")
-include("Sets/VPolytope.jl")
+
+include("Sets/VPolytope/VPolytopeModule.jl")
+@reexport using ..VPolytopeModule: VPolytope
 
 include("Sets/Polygon/PolygonModule.jl")
 @reexport using ..PolygonModule: Polygon

diff --git a/src/Sets/Polygon/PolygonModule.jl b/src/Sets/Polygon/PolygonModule.jl
@@ -2,8 +2,8 @@ module PolygonModule
 
 using Reexport
 
-using ..LazySets: LazySet, VPolygon, _ρ_vertices, _σ_vertices,
-                  _plot_recipe_2d_vlist
+using ..LazySets: LazySet, VPolygon, _plot_recipe_2d_vlist
+using ..LazySets.VPolytopeModule: _ρ_vertices, _σ_vertices
 
 @reexport import ..API: convex_hull, dim, isconvextype, isbounded,
                         isboundedtype, isempty, isoperationtype, ρ, σ