Skip to content

Commit 9c8efd9

Browse files
etiennedeggdalle
andauthored
Fix steiner tree and Kruskal (#368)
* fix kruskal and steiner tree * fix eltype * formatting * Apply formatter * update test --------- Co-authored-by: Guillaume Dalle <[email protected]>
1 parent 0445886 commit 9c8efd9

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

src/spanningtrees/kruskal.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
kruskal_mst(g, distmx=weights(g); minimize=true)
2+
kruskal_mst(g, distmx=weights(g); minimize=true)
33
44
Return a vector of edges representing the minimum (by default) spanning tree of a connected,
55
undirected graph `g` with optional distance matrix `distmx` using [Kruskal's algorithm](https://en.wikipedia.org/wiki/Kruskal%27s_algorithm).
@@ -15,6 +15,7 @@ function kruskal_mst end
1515
connected_vs = IntDisjointSets(nv(g))
1616

1717
mst = Vector{edgetype(g)}()
18+
nv(g) <= 1 && return mst
1819
sizehint!(mst, nv(g) - 1)
1920

2021
weights = Vector{T}()

src/steinertree/steiner_tree.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
filter_non_term_leaves!(g, term_vert)
2+
filter_non_term_leaves!(g, term_vert)
33
44
Remove edges of `g` so that all non-isolated leaves of `g` are in the set `term_vert`
55
"""
@@ -44,6 +44,8 @@ function steiner_tree end
4444
g::AG::(!IsDirected), term_vert::Vector{<:Integer}, distmx::AbstractMatrix{U}=weights(g)
4545
) where {U<:Real,T,AG<:AbstractGraph{T}}
4646
nvg = nv(g)
47+
length(term_vert) == 0 && return SimpleGraph{T}()
48+
length(term_vert) == 1 && return SimpleGraph{T}(first(term_vert))
4749
term_to_actual = T.(term_vert)
4850
unique!(term_to_actual)
4951

test/spanningtrees/kruskal.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,13 @@
4444
@test sort([(src(e), dst(e)) for e in mst2]) == sort([(src(e), dst(e)) for e in vec2])
4545
@test sort([(src(e), dst(e)) for e in max_mst2]) == sort([(src(e), dst(e)) for e in max_vec2])
4646
end
47+
48+
# non regression test for #362
49+
g = Graph()
50+
mst = @inferred(kruskal_mst(g))
51+
@test isempty(mst)
52+
53+
g = Graph(1)
54+
mst = @inferred(kruskal_mst(g))
55+
@test isempty(mst)
4756
end

test/steinertree/steiner_tree.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
g_copy = SimpleGraph(g)
2020
Graphs.filter_non_term_leaves!(g_copy, [2, 5])
2121
@test ne(g_copy) == 2 # [Edge(2, 1), Edge(1, 5)]
22+
23+
# non regression test for #362
24+
g_st = @inferred(steiner_tree(g, [2]))
25+
@test ne(g_st) == 0
2226
end
2327

2428
g4 = path_graph(11)

0 commit comments

Comments
 (0)