Clear empty features

Author: DanielVandH

Project.toml

@@ -1,7 +1,7 @@
 name = "DelaunayTriangulation"
 uuid = "927a84f5-c5f4-47a5-9785-b46e178433df"
 authors = ["Daniel VandenHeuvel <[email protected]>"]
-version = "0.1.2"
+version = "0.2.0"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

src/bowyerwatson.jl

@@ -89,6 +89,7 @@ function triangulate_bowyer(pts;
     randomise=true,
     trim=true,
     try_last_inserted_point=true,
+    trim_empty_features = true,
     skip_pts=Set{Int64}()) where {I,E,V,Es,Ts}
     !all_points_are_unique(pts) && throw("The points must all be unique.")
     pt_order = randomise ? shuffle(_eachindex(pts)) : collect(_eachindex(pts))
@@ -120,6 +121,8 @@ function triangulate_bowyer(pts;
             pt_idx, m, initial_search_point)
         update_centroid_after_new_point!(pts, new_point)
     end
+    trim_empty_features && clear_empty_keys!(adj)
+    trim_empty_features && clear_empty_points!(DG)
     trim && remove_ghost_triangles!(T, adj, adj2v, DG)
     return T, adj, adj2v, DG
 end

src/deberg.jl

@@ -31,6 +31,7 @@ function triangulate_berg(pts;
     TrianglesType::Type{Ts}=Set{TriangleType},
     randomise=true,
     trim=true,
+    trim_empty_features=true,
     skip_pts=Set{Int64}()) where {I,E,V,Es,Ts}
     !all_points_are_unique(pts) && throw("The points must all be unique.")
     pt_order = randomise ? shuffle(_eachindex(pts)) : collect(_eachindex(pts))
@@ -44,6 +45,8 @@ function triangulate_berg(pts;
     for r in pt_order
         add_point_berg!(T, adj, adj2v, DG, HG, pts, r)
     end
+    trim_empty_features && clear_empty_keys!(adj)
+    trim_empty_features && clear_empty_points!(DG)
     trim && remove_bounding_triangle!(T, adj, adj2v, DG)
     return T, adj, adj2v, DG, HG
 end

test/triangulate.jl

@@ -29,8 +29,7 @@
                 (4, 2) => 3, (2, 3) => 4, (3, 4) => 2,
                 (4, 5) => 2, (5, 2) => 4, (2, 4) => 5,
                 (4, 6) => 5, (6, 5) => 4, (5, 4) => 6,
-                (((1, 5), (5, 6), (6, 4), (4, 3), (3, 1)) .=> DT.BoundaryIndex)...,
-                (((1, -1), (3, -1), (-1, 2), (2, -2), (2, 6), (-3, 2), (3, 6)) .=> DT.DefaultAdjacentValue)...
+                (((1, 5), (5, 6), (6, 4), (4, 3), (3, 1)) .=> DT.BoundaryIndex)...
             )
         )
         true_adj2v = Dict{IntegerType,EdgesType}(
@@ -93,9 +92,6 @@
         )
         true_adj = DefaultDict(DT.DefaultAdjacentValue,
             Dict{EdgeType,IntegerType}(
-                (((-2, 1), (6, -2), (8, -1), (6, 5), (3, 9),
-                    (3, -1), (-1, 6), (9, 6), (-3, 8), (5, 3),
-                    (8, 6), (8, -2), (-3, 5), (8, 5)) .=> DT.DefaultAdjacentValue)...,
                 (5, 10) => 2, (10, 2) => 5, (2, 5) => 10,
                 (5, 9) => 7, (9, 7) => 5, (7, 5) => 9,
                 (3, 6) => 2, (6, 2) => 3, (2, 3) => 6,
@@ -722,4 +718,17 @@ end
         T, adj, adj2v, dg, HG = DT.triangulate_berg(cells)
         @test DT.validate_triangulation(T, adj, adj2v, dg, cells)
     end
+end
+
+@testset "Edges all exist" begin
+    pts = rand(2, 500)
+    T, adj, adj2v, DG = triangulate_bowyer(pts)
+    for e in edges(adj)
+        @test e ∈ edges(DG) || reverse(e) ∈ edges(DG)
+    end
+    for e in edges(DG)
+        if DT.BoundaryIndex ∉ e
+            @test e ∈ edges(adj)
+        end
+    end
 end

test/utils.jl

@@ -81,7 +81,7 @@ end
     p10 = (4.26, 0.0)
     pts = [p1, p2, p3, p4, p5, p6, p7, p8, p9, p10]
     Random.seed!(928881)
-    T, adj, adj2v, DG, HG = DT.triangulate_berg(pts)
+    T, adj, adj2v, DG, HG = DT.triangulate_berg(pts; trim_empty_features=false)
     p11 = (6.0, 2.5)
     push!(pts, p11)
     r = 11