Fix warning from DataStructures.jl, bump compat for it

Author: juliohm

Project.toml

@@ -21,7 +21,7 @@ GraphsSharedArraysExt = "SharedArrays"
 
 [compat]
 ArnoldiMethod = "0.4"
-DataStructures = "0.18, 0.19"
+DataStructures = "0.19"
 Distributed = "1"
 Inflate = "0.1.3"
 LinearAlgebra = "1"

src/Graphs.jl

@@ -8,7 +8,7 @@ using Statistics: mean
 
 using Inflate: InflateGzipStream
 using DataStructures:
-    IntDisjointSets,
+    IntDisjointSet,
     PriorityQueue,
     dequeue!,
     dequeue_pair!,

src/editdist.jl

@@ -149,16 +149,16 @@ function _edit_distance(
     # initialize open set
     OPEN = PriorityQueue{Vector{Tuple},Float64}()
     for v in vertices(G₂)
-        enqueue!(OPEN, [(T(1), v)], vertex_subst_cost(1, v) + h([(T(1), v)]))
+        push!(OPEN, [(T(1), v)] => vertex_subst_cost(1, v) + h([(T(1), v)]))
     end
-    enqueue!(OPEN, [(T(1), U(0))], vertex_delete_cost(1) + h([(T(1), U(0))]))
+    push!(OPEN, [(T(1), U(0))] => vertex_delete_cost(1) + h([(T(1), U(0))]))
 
     c = 0
     while true
         # minimum (partial) edit path
-        λ, cost = peek(OPEN)
+        λ, cost = first(OPEN)
         c += 1
-        dequeue!(OPEN)
+        popfirst!(OPEN)
 
         if is_complete_path(λ, G₁, G₂)
             return cost, λ
@@ -177,7 +177,7 @@ function _edit_distance(
                     end
                     new_cost += association_cost(u1, u1, v1, v1) # handle self-loops
 
-                    enqueue!(OPEN, λ⁺, new_cost)
+                    push!(OPEN, λ⁺ => new_cost)
                 end
                 # we try deleting v1
                 λ⁺ = [λ; (u1, U(0))]
@@ -194,7 +194,7 @@ function _edit_distance(
                         new_cost += edge_delete_cost(Edge(u2, u1))
                     end
                 end
-                enqueue!(OPEN, λ⁺, new_cost)
+                push!(OPEN, λ⁺ => new_cost)
             else
                 # add remaining vertices of G₂ to the path by deleting them
                 λ⁺ = [λ; [(T(0), v) for v in vs]]

src/graphcut/karger_min_cut.jl

@@ -23,7 +23,7 @@ function karger_min_cut(g::AbstractGraph{T}) where {T<:Integer}
     nvg < 2 && return zeros(Int, nvg)
     nvg == 2 && return [1, 2]
 
-    connected_vs = IntDisjointSets(nvg)
+    connected_vs = IntDisjointSet(nvg)
     num_components = nvg
 
     for e in shuffle(collect(edges(g)))

src/shortestpaths/dijkstra.jl

@@ -95,7 +95,7 @@ function dijkstra_shortest_paths(
     sizehint!(closest_vertices, nvg)
 
     while !isempty(H)
-        u = dequeue!(H)
+        u = popfirst!(H).first
 
         if trackvertices
             push!(closest_vertices, u)

src/spanningtrees/boruvka.jl

@@ -15,7 +15,7 @@ function boruvka_mst end
 @traitfn function boruvka_mst(
     g::AG::(!IsDirected), distmx::AbstractMatrix{T}=weights(g); minimize=true
 ) where {T<:Number,U,AG<:AbstractGraph{U}}
-    djset = IntDisjointSets(nv(g))
+    djset = IntDisjointSet(nv(g))
     # maximizing Z is the same as minimizing -Z
     # mode will indicate the need for the -1 multiplication
     mode = minimize ? 1 : -1

src/spanningtrees/kruskal.jl

@@ -12,7 +12,7 @@ function kruskal_mst end
 @traitfn function kruskal_mst(
     g::AG::(!IsDirected), distmx::AbstractMatrix{T}=weights(g); minimize=true
 ) where {T<:Number,U,AG<:AbstractGraph{U}}
-    connected_vs = IntDisjointSets(nv(g))
+    connected_vs = IntDisjointSet(nv(g))
 
     mst = Vector{edgetype(g)}()
     nv(g) <= 1 && return mst

src/traversals/maxadjvisit.jl

@@ -30,7 +30,7 @@ assumed to be 1.
     # still appearing in fadjlist. When iterating neighbors, is_merged makes sure we
     # don't consider them
     is_merged = falses(nvg)
-    merged_vertices = IntDisjointSets(U(nvg))
+    merged_vertices = IntDisjointSet(U(nvg))
     graph_size = nvg
     # We need to mutate the weight matrix,
     # and we need it clean (0 for non edges)

src/vertexcover/degree_vertex_cover.jl

@@ -36,8 +36,8 @@ function vertex_cover(g::AbstractGraph{T}, alg::DegreeVertexCover) where {T<:Int
     length_cover = 0
     degree_queue = PriorityQueue(Base.Order.Reverse, enumerate(degree(g)))
 
-    while !isempty(degree_queue) && peek(degree_queue)[2] > 0
-        v = dequeue!(degree_queue)
+    while !isempty(degree_queue) && first(degree_queue)[2] > 0
+        v = popfirst!(degree_queue).first
         in_cover[v] = true
         length_cover += 1