Skip to content
This repository was archived by the owner on Nov 22, 2023. It is now read-only.

tests: qualify use of "contains" to fix tests #210

Open
nico202 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tests: qualify use of "contains" to fix tests #210

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
10 changes: 5 additions & 5 deletions test/hyperrectangles.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ end

@test_throws MethodError HyperRectangle(Vec(1.0,2.0,3.0), Vec(1.0,2.0,3.0,4.0))

@test (in(a,b) && in(b,a) && contains(a,b) && contains(b,a))
@test (in(a,b) && in(b,a) && GeometryTypes.contains(a,b) && GeometryTypes.contains(b,a))

c = HyperRectangle(Vec(1.1,2.1,3.1,4.1),Vec4f0(3.8))

@test (!in(a,c) && in(c,a) && contains(a,c) && !contains(c,a))
@test (!in(a,c) && in(c,a) && GeometryTypes.contains(a,c) && !GeometryTypes.contains(c,a))

#conversion
h = HyperRectangle(0,0,1,1)
Expand Down Expand Up @@ -194,9 +194,9 @@ end

@testset "point membership" begin
a = HyperRectangle{4, Float64}(Vec(1.0,2.0,3.0,4.0),Vec4f0(4.0))
@test (in(Vec(4,5,6,7),a) && contains(a,Vec(4,5,6,7)))
@test (in(Vec(5,6,7,8),a) && contains(a,Vec(5,6,7,8)))
@test (!in(Vec(6,7,8,9),a) && !contains(a,Vec(6,7,8,9)))
@test (in(Vec(4,5,6,7),a) && GeometryTypes.contains(a,Vec(4,5,6,7)))
@test (in(Vec(5,6,7,8),a) && GeometryTypes.contains(a,Vec(5,6,7,8)))
@test (!in(Vec(6,7,8,9),a) && !GeometryTypes.contains(a,Vec(6,7,8,9)))
end

@testset "from Points" begin
Expand Down
16 changes: 8 additions & 8 deletions test/simplices.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
@test min_euclidean(Vec(1.0, 1.0), s) ≈√(0.5)
@test (@inferred volume(s)) ≈1/2
# containment
@test contains(s, Vec(0.1, 0.0))
@test GeometryTypes.contains(s, Vec(0.1, 0.0))
for v in vertices(s)
@test contains(s, v)
@test GeometryTypes.contains(s, v)
end
@test !( contains(s, Vec(1.0,0.1)) )
@test contains(s, Vec(1.0,0.1), atol = 0.1)
@test !( GeometryTypes.contains(s, Vec(1.0,0.1)) )
@test GeometryTypes.contains(s, Vec(1.0,0.1), atol = 0.1)
end

@testset "counterexample" begin
Expand Down Expand Up @@ -43,8 +43,8 @@
@test min_euclidean(Vec(1.0, 1.0, 0.0), s) ≈ √(0.5)
@test min_euclidean(Vec(1.0, 1.0, 1.0), s) ≈ √(3)*(2/3)
@test (@inferred volume(s)) ≈ 1/6
@test !( contains(s, Vec(1.0, 0.0, 0.1)) )
@test contains(s, Vec(0.1, 0.0, 0.1))
@test !( GeometryTypes.contains(s, Vec(1.0, 0.0, 0.1)) )
@test GeometryTypes.contains(s, Vec(0.1, 0.0, 0.1))
end

@testset "1d simplex in 2d" begin
Expand All @@ -64,7 +64,7 @@
@test min_euclidean(Vec(1.0, 0.0, 0.0), s) ≈ √(2/3)
@test (@inferred volume(s)) ≈ √(3)

@test contains(s, Vec(0.2, 0.2, 0.2))
@test !(contains(s, Vec(0.1, 0.0999, 0.1)))
@test GeometryTypes.contains(s, Vec(0.2, 0.2, 0.2))
@test !(GeometryTypes.contains(s, Vec(0.1, 0.0999, 0.1)))
end
end