Refactor collect(vertices(...)) (#1139)

Author: juliohm

src/discretization.jl

@@ -152,8 +152,8 @@ function discretize(polygon::Polygon, method::BoundaryTriangulationMethod)
 end
 
 function discretizewithin(ring::Ring, method::BoundaryTriangulationMethod)
-  # collect vertices to get rid of static containers
-  points = collect(vertices(ring))
+  # retrieve vertices of ring
+  points = collect(eachvertex(ring))
 
   # discretize within 2D ring with given method
   ring2D = Ring(_proj2D(manifold(ring), points))
@@ -197,7 +197,7 @@ function simplexify(chain::Chain)
   np = nvertices(chain) + isclosed(chain)
   ip = isperiodic(chain)
 
-  points = collect(vertices(chain))
+  points = collect(eachvertex(chain))
   topo = GridTopology((np - 1,), ip)
 
   SimpleMesh(points, topo)

src/discretization/dehn.jl

@@ -22,12 +22,8 @@ with small number of vertices.
 struct DehnTriangulation <: BoundaryTriangulationMethod end
 
 function discretizewithin(ring::Ring{𝔼{2}}, ::DehnTriangulation)
-  # points on resulting mesh
-  points = collect(vertices(ring))
-
-  # Dehn's recursion
+  points = collect(eachvertex(ring))
   connec = dehn1899(points, 1:length(points))
-
   SimpleMesh(points, connec)
 end
 

src/discretization/delaunay.jl

@@ -25,7 +25,7 @@ end
 DelaunayTriangulation(rng=Random.default_rng()) = DelaunayTriangulation(rng)
 
 function discretizewithin(ring::Ring{𝔼{2}}, method::DelaunayTriangulation)
-  points = vertices(ring)
+  points = collect(eachvertex(ring))
   coords = map(p -> ustrip.(to(p)), points)
   bnodes = [1:nvertices(ring); 1]
   triang = triangulate(coords, boundary_nodes=bnodes, rng=method.rng)

src/discretization/fan.jl

@@ -12,7 +12,7 @@ See [https://en.wikipedia.org/wiki/Fan_triangulation]
 struct FanTriangulation <: BoundaryTriangulationMethod end
 
 function discretizewithin(ring::Ring, ::FanTriangulation)
-  points = collect(vertices(ring))
+  points = collect(eachvertex(ring))
   connec = [connect((1, i, i + 1)) for i in 2:(nvertices(ring) - 1)]
   SimpleMesh(points, connec)
 end

src/discretization/held.jl

@@ -45,10 +45,10 @@ function discretizewithin(ring::Ring{𝔼{2}}, method::HeldTriangulation)
   𝒫 = ℛ |> StdCoords()
 
   # points of resulting mesh
-  points = collect(vertices(ℛ))
+  points = collect(eachvertex(ℛ))
 
   # standardized points for algorithm
-  stdpts = collect(vertices(𝒫))
+  stdpts = collect(eachvertex(𝒫))
 
   # keep track of global indices
   I = CircularVector(1:nvertices(𝒫))

test/discretization.jl

@@ -8,6 +8,10 @@
   @test eltype(mesh) <: Triangle
   @test vertices(mesh) == pts
   @test collect(elements(mesh)) == tris
+
+  # type stability tests
+  poly = PolyArea(cart(0, 0), cart(1, 0), cart(1, 1), cart(0, 1))
+  @inferred discretize(poly, FanTriangulation())
 end
 
 @testitem "DehnTriangulation" setup = [Setup] begin
@@ -26,10 +30,6 @@ end
   @test nelements(mesh) == 6
   @test eltype(mesh) <: Triangle
 
-  # type stability tests
-  poly = PolyArea(cart(0, 0), cart(1, 0), cart(1, 1), cart(0, 1))
-  @inferred discretize(poly, DehnTriangulation())
-
   octa = Octagon(
     cart(0.2, 0.2, 0.0),
     cart(0.5, -0.5, 0.0),
@@ -44,6 +44,10 @@ end
   @test nvertices(mesh) == 8
   @test nelements(mesh) == 6
   @test eltype(mesh) <: Triangle
+
+  # type stability tests
+  poly = PolyArea(cart(0, 0), cart(1, 0), cart(1, 1), cart(0, 1))
+  @inferred discretize(poly, DehnTriangulation())
 end
 
 @testitem "HeldTriangulation" setup = [Setup] begin
@@ -128,6 +132,10 @@ end
   mesh = discretize(poly, HeldTriangulation(rng))
   @test nvertices(mesh) == 5
   @test nelements(mesh) == 3
+
+  # type stability tests
+  poly = PolyArea(cart(0, 0), cart(1, 0), cart(1, 1), cart(0, 1))
+  @inferred discretize(poly, HeldTriangulation())
 end
 
 @testitem "DelaunayTriangulation" setup = [Setup] begin