Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit 17334c4

Browse files
authored
Merge pull request #23 from JuliaGraphs/sbromberger/newshow
change show() for empty graphs (ref https://github.com/JuliaGraphs/Me…
2 parents 558c7bb + c7afe2c commit 17334c4

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/MetaGraphs.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ abstract type AbstractMetaGraph{T} <: AbstractGraph{T} end
4949

5050
function show(io::IO, g::AbstractMetaGraph)
5151
dir = is_directed(g) ? "directed" : "undirected"
52-
if nv(g) == 0
53-
print(io, "empty $dir $(eltype(g)) metagraph with $(weighttype(g)) weights defined by :$(g.weightfield) (default weight $(g.defaultweight))")
54-
else
55-
print(io, "{$(nv(g)), $(ne(g))} $dir $(eltype(g)) metagraph with $(weighttype(g)) weights defined by :$(g.weightfield) (default weight $(g.defaultweight))")
56-
end
52+
print(io, "{$(nv(g)), $(ne(g))} $dir $(eltype(g)) metagraph with $(weighttype(g)) weights defined by :$(g.weightfield) (default weight $(g.defaultweight))")
5753
end
5854

5955
@inline fadj(g::AbstractMetaGraph, x...) = fadj(g.graph, x...)

test/metagraphs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ importall MetaGraphs
145145
mg = MetaGraph(g)
146146
T = eltype(mg)
147147
U = weighttype(mg)
148-
@test sprint(show, mg) == "empty undirected $T metagraph with $U weights defined by :$(mg.weightfield) (default weight $(mg.defaultweight))"
148+
@test sprint(show, mg) == "{0, 0} undirected $T metagraph with $U weights defined by :$(mg.weightfield) (default weight $(mg.defaultweight))"
149149
@test @inferred(add_vertices!(g, 5)) == 5
150150
@test sprint(show, mg) == "{5, 0} undirected $T metagraph with $U weights defined by :$(mg.weightfield) (default weight $(mg.defaultweight))"
151151
end
@@ -154,7 +154,7 @@ importall MetaGraphs
154154
mg = MetaDiGraph(g)
155155
T = eltype(mg)
156156
U = weighttype(mg)
157-
@test sprint(show, mg) == "empty directed $T metagraph with $U weights defined by :$(mg.weightfield) (default weight $(mg.defaultweight))"
157+
@test sprint(show, mg) == "{0, 0} directed $T metagraph with $U weights defined by :$(mg.weightfield) (default weight $(mg.defaultweight))"
158158
@test @inferred(add_vertices!(mg, 5)) == 5
159159
@test sprint(show, mg) == "{5, 0} directed $T metagraph with $U weights defined by :$(mg.weightfield) (default weight $(mg.defaultweight))"
160160
end

0 commit comments

Comments
 (0)