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.

Sign up for GitHub

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

Move and fix tests for convex_hull #1441

Merged
merged 1 commit into from
Jun 14, 2019
Merged

Move and fix tests for convex_hull #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions test/unit_ConvexHull.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,4 @@ for N in [Float64, Rational{Int}, Float32]
@test neutral(ConvexHull) == neutral(ConvexHullArray) == EmptySet
@test CH(b1, e) == CH(e, b1) == b1
@test CH(cha, e) == CH(e, cha) == cha

# ==============================
# concrete convex hull operation
# ==============================

points = to_N(N, [[0.9, 0.2], [0.4, 0.6], [0.2, 0.1], [0.1, 0.3], [0.3, 0.28]])
sorted = to_N(N, [[0.1, 0.3], [0.2, 0.1], [0.9, 0.2], [0.4, 0.6]])
@test convex_hull!(points, algorithm="monotone_chain") == sorted
@test convex_hull!(points, algorithm="monotone_chain_sorted") == sorted
@test_throws ErrorException convex_hull!(points, algorithm="")

# test corner cases with one and two vectors (see #876)
p1 = [1., 2.]
p2 = [1., 3.]
@test convex_hull([p1]) == [p1]
@test convex_hull([p1, p2]) == [p1, p2]
@test convex_hull([p2, p1]) == [p1, p2]
end
20 changes: 17 additions & 3 deletions test/unit_convex_hull.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
for N in [Float64, Rational{Int}]


# ====================================
# Concrete convex hull for point sets
# ====================================
Expand All @@ -16,6 +14,13 @@ for N in [Float64, Rational{Int}]
@test convex_hull([[N(1), N(0)], [N(0), N(1)]]) == [[N(1), N(0)], [N(0), N(1)]]
@test convex_hull([[N(1), N(0)], [N(1), N(0)]]) == [[N(1), N(0)]]

# test corner cases with one and two vectors (see #876)
p1 = [1., 2.]
p2 = [1., 3.]
@test convex_hull([p1]) == [p1]
@test convex_hull([p1, p2]) == [p1, p2]
@test convex_hull([p2, p1]) == [p1, p2]

# corner cases in higher dimension
@test convex_hull([[N(0), N(0), N(0)]]) == [[N(0), N(0), N(0)]]
# there is no sorting in higher dim
Expand Down Expand Up @@ -50,6 +55,14 @@ for N in [Float64, Rational{Int}]
@test ispermutation(convex_hull!([N[0, 1], N[0, 2], N[0, 3]]), [N[0, 1], N[0, 3]]) # three points on a vertical line
@test convex_hull!([N[0, 1], N[0, 1], N[0, 1]]) == [N[0, 1]] # three equal points

# five-vertices case in 2D
points = to_N(N, [[0.9, 0.2], [0.4, 0.6], [0.2, 0.1], [0.1, 0.3], [0.3, 0.28]])
points_copy = copy(points)
sorted = to_N(N, [[0.1, 0.3], [0.2, 0.1], [0.9, 0.2], [0.4, 0.6]])
@test ispermutation(convex_hull!(points, algorithm="monotone_chain"), sorted)
@test ispermutation(convex_hull!(points, algorithm="monotone_chain_sorted"), sorted)
@test_throws ErrorException convex_hull!(points_copy, algorithm="")

# higher dimension
if test_suite_polyhedra && N != Float32 # no backend supporting Float32
points_3D = [[N(1), N(0), N(4)], [N(1), N(1), N(5)], [N(0), N(1), N(6)],
Expand All @@ -65,8 +78,9 @@ for N in [Float64, Rational{Int}]
end

# ============================
# Binary concrete convex hull
# Binary concrete convex hull
# ============================

V1 = VPolygon([[N(1), N(0)], [N(1), N(1)], [N(0), N(1)]])
V2 = VPolygon([[N(-1), N(-1)], [N(1/2), N(1/2)]])
ch = convex_hull(V1, V2)
Expand Down