Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#473 - Convert AbstractHyperrectangle to HPolytope #615

Merged
merged 10 commits into from
Sep 13, 2018
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/src/lib/conversion.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ convert(::Type{HPolytope}, ::HPolygon)
convert(::Type{HPolygon}, ::HPolytope)
convert(::Type{Zonotope}, ::AbstractHyperrectangle)
convert(::Type{Hyperrectangle}, ::Interval)
convert(::Type{HPolytope}, ::AbstractHyperrectangle)
convert(::Type{HPolygon}, ::AbstractHyperrectangle)
```
1 change: 1 addition & 0 deletions docs/src/lib/interfaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ radius(::AbstractHyperrectangle, ::Real)
σ(::AbstractVector{Real}, ::AbstractHyperrectangle{Real})
∈(::AbstractVector{Real}, ::AbstractHyperrectangle{Real})
vertices_list(::AbstractHyperrectangle{Real})
constraints_list(::AbstractHyperrectangle{Real})
```

#### Singleton
Expand Down
28 changes: 27 additions & 1 deletion src/AbstractHyperrectangle.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Base.∈

export AbstractHyperrectangle,
radius_hyperrectangle
radius_hyperrectangle,
constraints_list

"""
AbstractHyperrectangle{N<:Real} <: AbstractCentrallySymmetricPolytope{N}
Expand Down Expand Up @@ -59,6 +60,31 @@ function vertices_list(H::AbstractHyperrectangle{N}
for si in Iterators.product([[1, -1] for i = 1:dim(H)]...)][:]
end

"""
constraints_list(H::AbstractHyperrectangle{N})::Vector{Vector{N}} where {N<:Real}

Return the list of constraints of an axis-aligned hyperrectangular set.

### Input

- `H` -- hyperrectangular set

### Output

A list of linear constraints.
"""
function constraints_list(H::AbstractHyperrectangle{N})::Vector{LinearConstraint{N}} where {N<:Real}
n = dim(H)
constraints = Vector{LinearConstraint{N}}(2*n)
b, c = high(H), -low(H)
one_N = one(N)
for i in 1:n
ei = LazySets.Approximations.UnitVector(i, n, one_N)
constraints[i] = HalfSpace(ei, b[i])
constraints[i+n] = HalfSpace(-ei, c[i])
end
return constraints
end

# --- LazySet interface functions ---

Expand Down
37 changes: 37 additions & 0 deletions src/convert.jl
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,40 @@ Hyperrectangle{Float64}([0.5], [0.5])
function convert(::Type{Hyperrectangle}, x::Interval{N, IN}) where {N, IN <: AbstractInterval{N}}
return Hyperrectangle(low=[low(x)], high=[high(x)])
end

"""
convert(::Type{HPolytope}, H::AbstractHyperrectangle{N}) where {N}

Converts a hyperrectangular set to a polytope in constraint representation.

### Input

- `HPolytope` -- type used for dispatch
- `H` -- hyperrectangular set

### Output

A polytope in constraint representation.
"""
function convert(::Type{HPolytope}, H::AbstractHyperrectangle{N}) where {N}
return HPolytope{N}(constraints_list(H))
end

"""
convert(::Type{HPOLYGON}, H::AbstractHyperrectangle{N}) where {N, HPOLYGON<:AbstractHPolygon}

Converts a hyperrectangular set to a polygon in constraint representation.

### Input

- `HPOLYGON` -- type used for dispatch
- `H` -- hyperrectangular set

### Output

A polygon in constraint representation.
"""
function convert(X::Type{HPOLYGON}, H::AbstractHyperrectangle{N}) where {N, HPOLYGON<:AbstractHPolygon}
@assert dim(H) == 2 "cannot convert a $(dim(H))-dimensional hyperrectangle into a two-dimensional polygon"
return HPOLYGON{N}(constraints_list(H))
end
14 changes: 14 additions & 0 deletions test/unit_Hyperrectangle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,18 @@ for N in [Float64, Rational{Int}, Float32]
H = Hyperrectangle(fill(N(1.), 100), fill(N(0.), 100))
vl = vertices_list(H)
@test length(vl) == 1 && vl[1] == H.center

# transform hyperrectangle into a polygon
H1pol = convert(HPolygon, H1)
vlist = vertices_list(H1pol)
@test length(vlist) == 4
@test all([vi ∈ vlist for vi in [N[3, 3], N[3, -1], N[-1, -1], N[-1, 3]]])

# test that we can produce the list of constraints
clist = constraints_list(H1)
@test length(clist) == 4
@test any([HalfSpace(N[1, 0], N(3)) == ci for ci in constraints_list(H1)]) &&
any([HalfSpace(N[0, 1], N(3)) == ci for ci in constraints_list(H1)]) &&
any([HalfSpace(N[-1, 0], N(1)) == ci for ci in constraints_list(H1)]) &&
any([HalfSpace(N[0, -1], N(1)) == ci for ci in constraints_list(H1)])
end
7 changes: 7 additions & 0 deletions test/unit_Polytope.jl
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ for N in [Float64, Rational{Int}, Float32]
@test length(p.constraints) == length(cl)
end

# convert hyperrectangle to a HPolytope
H = Hyperrectangle(N[1, 1], N[2, 2])
P = convert(HPolytope, H)
vlist = vertices_list(P)
@test length(vlist) == 4
@test all([vi ∈ vlist for vi in [N[3, 3], N[3, -1], N[-1, -1], N[-1, 3]]])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i added this test here because the conversion and testing for vertices requires to load the package Polyhedra

Copy link
Member

@schillic schillic Sep 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have to add a condition that Polyhedra is loaded around this test:
if test_suite_polyhedra
Otherwise, vertices_list is not defined and the test crashes.


# -----
# V-rep
# -----
Expand Down