Update DataStructures to 0.18; Bump minor version 0.3.2

Author: dillondaudert

Project.toml

@@ -1,7 +1,7 @@
 name = "NearestNeighborDescent"
 uuid = "dd2c4c9e-a32f-5b2f-b342-08c2f244fce8"
 authors = ["Dillon Daudert <dillongdaudert@gmail.com>"]
-version = "0.3.1"
+version = "0.3.2"
 
 [deps]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -12,7 +12,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-DataStructures = "0.15, 0.17"
+DataStructures = "0.18"
 Distances = "0.8, 0.9"
 LightGraphs = "1.3"
 Reexport = "0.2"

src/knn_graph/heap_graph.jl

@@ -197,12 +197,12 @@ complexity of `𝒪(K)`.
 
 Try to add an edge `e`, indicating a new candidate nearest neighbor `e.dest` for
 vertex `e.src`, by pushing onto `e.src`'s heap. This will fail (return `false`) if
-`e` is already in the heap or if `e.weight > top(heap).weight`. Otherwise return `true`.
+`e` is already in the heap or if `e.weight > first(heap).weight`. Otherwise return `true`.
 """
 function LightGraphs.add_edge!(g::HeapKNNGraph, e::HeapKNNGraphEdge)
     # NOTE we can assume the invariants for heap knn graphs hold
-    if e < top(g.heaps[src(e)]) && !has_edge(g, src(e), dst(e))
-        # we know this edge is smaller than the top, so we can start by removing that
+    if e < first(g.heaps[src(e)]) && !has_edge(g, src(e), dst(e))
+        # we know this edge is smaller than the first, so we can start by removing that
         pop!(g.heaps[src(e)])
         push!(g.heaps[src(e)], e)
         return true
@@ -217,7 +217,7 @@ end
 Return the diameter of the set of KNNs of vertex `v`.
 """
 function knn_diameter(g::Union{HeapKNNGraph{V}, LockHeapKNNGraph{V}}, v::V) where V
-    return 2 * weight(top(g.heaps[v]))
+    return 2 * weight(first(g.heaps[v]))
 end
 
 """

src/knn_graph/threaded_heap_graph.jl

@@ -108,8 +108,8 @@ Similar to `add_edge!(g::HeapKNNGraph, e)`, but made thread-safe using locks.
 function LightGraphs.add_edge!(g::LockHeapKNNGraph, e::HeapKNNGraphEdge)
     # NOTE we can assume the invariants for heap knn graphs hold
     lock(g.locks[src(e)]) do
-        if e < top(g.heaps[src(e)]) && !has_edge(g, src(e), dst(e))
-            # we know this edge is smaller than the top, so we can start by removing that
+        if e < first(g.heaps[src(e)]) && !has_edge(g, src(e), dst(e))
+            # we know this edge is smaller than the first, so we can start by removing that
             pop!(g.heaps[src(e)])
             push!(g.heaps[src(e)], e)
             return true

test/knn_graph/utils_tests.jl

@@ -64,12 +64,12 @@
 
             KNNGraphs._heappush!(h, e, 1)
             @test length(h) == 1
-            @test top(h) == e
+            @test first(h) == e
 
             e2 = HeapKNNGraphEdge(1, 3, 1.) # new point, heappush! just replaces
             KNNGraphs._heappush!(h, e2, 1)
             @test length(h) == 1
-            @test top(h) == e2
+            @test first(h) == e2
         end
     end
 end # end utilities tests