Triangle type and edge type for the AbstractEachX iterators

Author: DanielVandH

Project.toml

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

src/data_structures/triangulation/edges.jl

@@ -68,6 +68,7 @@ Returns the number of solid edges in `tri`.
 num_solid_edges(tri::Triangulation) = num_edges(tri) - num_ghost_edges(tri)
 
 abstract type AbstractEachEdge{E} end
+edge_type(itr::AbstractEachEdge) = edge_type(itr.tri)
 Base.IteratorSize(::Type{<:AbstractEachEdge}) = Base.HasLength()
 Base.IteratorEltype(::Type{<:AbstractEachEdge{E}}) where {E} = Base.IteratorEltype(E)
 Base.eltype(::Type{<:AbstractEachEdge{E}}) where {E} = edge_type(E)

src/data_structures/triangulation/triangles.jl

@@ -67,6 +67,7 @@ Returns the number of solid triangles in `tri`.
 @inline num_solid_triangles(tri::Triangulation) = num_triangles(tri) - num_ghost_triangles(tri)
 
 abstract type AbstractEachTriangle{T} end
+triangle_type(itr::AbstractEachTriangle) = triangle_type(itr.tri)
 Base.IteratorSize(::Type{<:AbstractEachTriangle}) = Base.HasLength()
 Base.IteratorEltype(::Type{<:AbstractEachTriangle{T}}) where {T} = Base.IteratorEltype(T)
 Base.eltype(::Type{<:AbstractEachTriangle{T}}) where {T} = triangle_type(T)

test/data_structures/triangulation.jl

@@ -265,6 +265,8 @@ end
             @test sort(collect(filter(!DT.is_ghost_triangle, each_triangle(___tri)))) == sort(collect(each_solid_triangle(___tri)))
             @test sort(collect(filter(DT.is_ghost_triangle, each_triangle(___tri)))) == sort(collect(each_ghost_triangle(___tri)))
             @test DelaunayTriangulation.sort_triangles(each_solid_triangle(tri)) == DelaunayTriangulation.sort_triangles(get_triangles(___tri))
+            @test DelaunayTriangulation.triangle_type(_ghost_itr) == DelaunayTriangulation.triangle_type(_ghost_itr)
+            @test DelaunayTriangulation.triangle_type(_solid_itr) == DelaunayTriangulation.triangle_type(_solid_itr)
       end
 
       @testset "Edges" begin
@@ -303,6 +305,8 @@ end
             @test length(collect(each_ghost_edge(___tri))) == num_edges(___tri) .- length(sort(collect(filter(!DT.is_ghost_edge, each_edge(___tri)))))
             @test length(collect(each_ghost_edge(___tri))) == DT.num_ghost_edges(___tri)== length(_ghost_itr)
             @test length(collect(each_solid_edge(___tri))) == DT.num_solid_edges(___tri) == length(_solid_itr)
+            @test DelaunayTriangulation.edge_type(_ghost_itr) == DelaunayTriangulation.edge_type(_ghost_itr)
+            @test DelaunayTriangulation.edge_type(_solid_itr) == DelaunayTriangulation.edge_type(_solid_itr)
       end
 
       @testset "Points" begin