Remove allocation in add_vertex! (#163)

Author: DanielVandH

NEWS.md

@@ -16,6 +16,7 @@
 - Improved the error message for an incorrect orientation. See [#144](https://github.com/JuliaGeometry/DelaunayTriangulation.jl/pull/144).
 - Added a CONTRIBUTING.md file and issue templates. See [#160](https://github.com/JuliaGeometry/DelaunayTriangulation.jl/pull/160).
 - Added `is_point2` and `is_point3` to detect if a given input is a point. This allows vector coordinates to be passed to `convert_boundary_points_to_indices`. See [#161](https://github.com/JuliaGeometry/DelaunayTriangulation.jl/pull/161).
+- Removed an allocation from `add_vertex!`. See [#163](https://github.com/JuliaGeometry/DelaunayTriangulation.jl/pull/163).
 
 ## v1.0.5 
 

src/data_structures/triangulation/adjacent2vertex.jl

@@ -13,14 +13,14 @@ The map taking `w` to the set of all `(u, v)` such that `(u, v, w)` is a positiv
     Adjacent2Vertex(adj2v::Dict{IntegerType, EdgesType})
 """
 struct Adjacent2Vertex{I,Es}
-  adjacent2vertex::Dict{I,Es}
-  Adjacent2Vertex(adj2v::Dict{I,Es}) where {I,Es} = new{I,Es}(adj2v)
+    adjacent2vertex::Dict{I,Es}
+    Adjacent2Vertex(adj2v::Dict{I,Es}) where {I,Es} = new{I,Es}(adj2v)
 end
 Adjacent2Vertex{I,Es}() where {I,Es} = Adjacent2Vertex(Dict{I,Es}())
 Base.:(==)(adj2v::Adjacent2Vertex, adj2v2::Adjacent2Vertex) = get_adjacent2vertex(adj2v) == get_adjacent2vertex(adj2v2)
 function Base.show(io::IO, m::MIME"text/plain", adj2v::Adjacent2Vertex{I,Es}) where {I,Es}
-  println(io, "Adjacent2Vertex{", I, ", ", Es, "} with map:")
-  show(io, m, get_adjacent2vertex(adj2v))
+    println(io, "Adjacent2Vertex{", I, ", ", Es, "} with map:")
+    show(io, m, get_adjacent2vertex(adj2v))
 end
 Base.sizehint!(adj2v::Adjacent2Vertex, n) = Base.sizehint!(get_adjacent2vertex(adj2v), n)
 
@@ -86,8 +86,8 @@ Set{Tuple{Int64, Int64}} with 3 elements:
 ```
 """
 function get_adjacent2vertex(adj2v::Adjacent2Vertex, w)
-  dict = get_adjacent2vertex(adj2v)
-  return dict[w]
+    dict = get_adjacent2vertex(adj2v)
+    return dict[w]
 end
 
 """
@@ -123,15 +123,15 @@ Dict{Int64, Set{Tuple{Int64, Int64}}} with 2 entries:
 ```
 """
 function add_adjacent2vertex!(adj2v::Adjacent2Vertex{I,Es}, w, uv) where {I,Es}
-  dict = get_adjacent2vertex(adj2v)
-  existing_edges = get!(Es, dict, w)
-  add_edge!(existing_edges, uv)
-  return adj2v
+    dict = get_adjacent2vertex(adj2v)
+    existing_edges = get!(Es, dict, w)
+    add_edge!(existing_edges, uv)
+    return adj2v
 end
 function add_adjacent2vertex!(adj2v::Adjacent2Vertex{I,Es}, w, u, v) where {I,Es}
-  E = edge_type(Es)
-  uv = construct_edge(E, u, v)
-  return add_adjacent2vertex!(adj2v, w, uv)
+    E = edge_type(Es)
+    uv = construct_edge(E, u, v)
+    return add_adjacent2vertex!(adj2v, w, uv)
 end
 
 """
@@ -165,14 +165,14 @@ Dict{Int64, Set{Tuple{Int64, Int64}}} with 2 entries:
 ```
 """
 function delete_adjacent2vertex!(adj2v::Adjacent2Vertex, w, uv)
-  existing_edges = get_adjacent2vertex(adj2v, w)
-  delete_edge!(existing_edges, uv)
-  return adj2v
+    existing_edges = get_adjacent2vertex(adj2v, w)
+    delete_edge!(existing_edges, uv)
+    return adj2v
 end
 function delete_adjacent2vertex!(adj2v::Adjacent2Vertex{I,Es}, w, u, v) where {I,Es}
-  E = edge_type(Es)
-  uv = construct_edge(E, u, v)
-  return delete_adjacent2vertex!(adj2v, w, uv)
+    E = edge_type(Es)
+    uv = construct_edge(E, u, v)
+    return delete_adjacent2vertex!(adj2v, w, uv)
 end
 
 """
@@ -201,9 +201,9 @@ Dict{Int64, Set{Tuple{Int64, Int64}}}()
 ```
 """
 function delete_adjacent2vertex!(adj2v::Adjacent2Vertex, w)
-  dict = get_adjacent2vertex(adj2v)
-  delete!(dict, w)
-  return adj2v
+    dict = get_adjacent2vertex(adj2v)
+    delete!(dict, w)
+    return adj2v
 end
 
 """
@@ -238,10 +238,10 @@ Dict{Int32, Set{Tuple{Int32, Int32}}} with 5 entries:
 ```
 """
 function add_triangle!(adj2v::Adjacent2Vertex, u::Integer, v::Integer, w::Integer)
-  add_adjacent2vertex!(adj2v, u, v, w)
-  add_adjacent2vertex!(adj2v, v, w, u)
-  add_adjacent2vertex!(adj2v, w, u, v)
-  return adj2v
+    add_adjacent2vertex!(adj2v, u, v, w)
+    add_adjacent2vertex!(adj2v, v, w, u)
+    add_adjacent2vertex!(adj2v, w, u, v)
+    return adj2v
 end
 add_triangle!(adj2v::Adjacent2Vertex, T) = add_triangle!(adj2v, geti(T), getj(T), getk(T))
 
@@ -295,10 +295,10 @@ Dict{Int32, Set{Tuple{Int32, Int32}}} with 5 entries:
 ```
 """
 function delete_triangle!(adj2v::Adjacent2Vertex, u::Integer, v::Integer, w::Integer)
-  delete_adjacent2vertex!(adj2v, u, v, w)
-  delete_adjacent2vertex!(adj2v, v, w, u)
-  delete_adjacent2vertex!(adj2v, w, u, v)
-  return adj2v
+    delete_adjacent2vertex!(adj2v, u, v, w)
+    delete_adjacent2vertex!(adj2v, v, w, u)
+    delete_adjacent2vertex!(adj2v, w, u, v)
+    return adj2v
 end
 delete_triangle!(adj2v::Adjacent2Vertex, T) = delete_triangle!(adj2v, geti(T), getj(T), getk(T))
 
@@ -335,15 +335,15 @@ Dict{Int64, Set{Tuple{Int64, Int64}}}()
 ```
 """
 function clear_empty_keys!(adj2v::Adjacent2Vertex)
-  dict = get_adjacent2vertex(adj2v)
-  for (w, S) in dict
-    isempty(S) && delete_adjacent2vertex!(adj2v, w)
-  end
-  return adj2v
+    dict = get_adjacent2vertex(adj2v)
+    foreach(dict) do (w, S)
+        isempty(S) && delete_adjacent2vertex!(adj2v, w)
+    end
+    return adj2v
 end
 
 function Base.empty!(adj2v::Adjacent2Vertex)
-  dict = get_adjacent2vertex(adj2v)
-  empty!(dict)
-  return adj2v
+    dict = get_adjacent2vertex(adj2v)
+    empty!(dict)
+    return adj2v
 end

src/data_structures/triangulation/graph.jl

@@ -116,13 +116,19 @@ has_vertex(G::Graph, u) = u ∈ get_vertices(G)
 
 Adds the vertices `u...` to `G`.
 """
-function add_vertex!(G::Graph{I}, u...) where {I}
+function add_vertex!(G::Graph{I}, v) where {I}
+    has_vertex(G, v) && return G 
     V = get_vertices(G)
+    push!(V, v) 
     N = get_neighbours(G)
-    for v in u
-        has_vertex(G, v) && continue
-        push!(V, v)
-        !haskey(N, v) && (N[v] = Set{I}())
+    get!(N, v) do 
+        Set{I}() # in case N is empty, let's add it here 
+    end
+    return G
+end
+function add_vertex!(G::Graph{I}, u...) where {I}
+    foreach(u) do v 
+        add_vertex!(G, v)
     end
     return G
 end
@@ -167,7 +173,7 @@ function add_neighbour!(G::Graph{I}, u, v) where {I}
     return G
 end
 function add_neighbour!(G::Graph{I}, u, v...) where {I}
-    for w in v
+    foreach(v) do w
         add_neighbour!(G, u, w)
     end
     return G
@@ -188,7 +194,7 @@ function delete_neighbour!(G::Graph{I}, u, v) where {I}
     return G
 end
 function delete_neighbour!(G::Graph{I}, u, v...) where {I}
-    for w in v
+    foreach(v) do w
         delete_neighbour!(G, u, w)
     end
     return G
@@ -229,7 +235,7 @@ Deletes the vertices `u...` from `G`.
 function delete_vertex!(G::Graph{I}, u) where {I}
     N = get_neighbours(G)
     u_N = get!(Set{I}, N, u)
-    for v in u_N
+    foreach(u_N) do v
         v_N = get!(Set{I}, N, v)
         delete!(v_N, u) # don't use delete_neighbour! because it will delete u_N[v] as well
     end
@@ -239,7 +245,7 @@ function delete_vertex!(G::Graph{I}, u) where {I}
     return G
 end
 function delete_vertex!(G::Graph, u...)
-    for v in u
+    foreach(u) do v
         delete_vertex!(G, v)
     end
     return G
@@ -276,7 +282,7 @@ Deletes all empty vertices from `G`.
 """
 function clear_empty_vertices!(G::Graph)
     V = get_vertices(G)
-    for i in V
+    foreach(V) do i
         n = num_neighbours(G, i)
         iszero(n) && delete_vertex!(G, i)
     end