Fix pop_point! for Tuple case when peeking (#54)

Fix pop_point! for Tuple case when peeking

Author: DanielVandH

Project.toml

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

src/operations/add_point.jl

@@ -67,13 +67,18 @@ function add_point!(tri::Triangulation, new_point;
         exterior_curve_index
     ),
     peek=Val(false))
-    if !(new_point isa Integer)
+    int_flag = new_point isa Integer
+    if !int_flag
         push_point!(tri, new_point)
         new_point = num_points(tri)
     end
     q = get_point(tri, new_point)
     flag = point_position_relative_to_triangle(tri, V, q)
-    return add_point_bowyer_watson_and_process_after_found_triangle!(tri, new_point, V, q, flag, update_representative_point, store_event_history, event_history, peek)
+    V = add_point_bowyer_watson_and_process_after_found_triangle!(tri, new_point, V, q, flag, update_representative_point, store_event_history, event_history, peek)
+    if !int_flag && is_true(peek)
+        pop_point!(tri)
+    end
+    return V
 end
 
 function add_point!(tri::Triangulation, new_point_x, new_point_y;

test/Project.toml

@@ -6,7 +6,6 @@ DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 ElasticArrays = "fdbdab4c-e67f-52f5-8c3f-e7b388dad3d4"
 ExactPredicates = "429591f6-91af-11e9-00e2-59fbe8cec110"
-GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 MakieCore = "20f20a25-4f0e-4fdf-b5d1-57303727442b"

test/operations/add_point.jl

@@ -62,7 +62,11 @@ end
             [(0.0, rand()) for _ in 1:50]..., [(rand(), 0.0) for _ in 1:50]..., [(rand(), 1.0) for _ in 1:50]..., [(1.0, rand()) for _ in 1:50]...,
             [(rand(), rand()) for _ in 1:500]...]
             empty!(history)
+            if rand() < 1/2
             add_point!(tri, x, y, store_event_history=Val(true), event_history=history, peek=Val(true))
+            else 
+                add_point!(tri, (x, y), store_event_history=Val(true), event_history=history, peek=Val(true))
+            end
             clear_empty_features!(tri)
             @test DT.compare_triangle_collections(get_triangles(_tri), get_triangles(tri))
             @test get_adjacent(tri) == get_adjacent(_tri)