Merge branch 'master' of ssh://github.com/sbromberger/StaticGraphs.jl

Author: sbromberger

README.md

@@ -1,8 +1,8 @@
 # StaticGraphs
 
-[![Build Status](https://travis-ci.org/sbromberger/StaticGraphs.jl.svg?branch=master)](https://travis-ci.org/sbromberger/StaticGraphs.jl)
+[![Build Status](https://travis-ci.org/JuliaGraphs/StaticGraphs.jl.svg?branch=master)](https://travis-ci.org/JuliaGraphs/StaticGraphs.jl)
 
-[![codecov.io](http://codecov.io/github/sbromberger/StaticGraphs.jl/coverage.svg?branch=master)](http://codecov.io/github/sbromberger/StaticGraphs.jl?branch=master)
+[![codecov.io](http://codecov.io/github/JuliaGraphs/StaticGraphs.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaGraphs/StaticGraphs.jl?branch=master)
 
 Memory-efficient, performant graph structures optimized for large networks. 
 Uses [LightGraphs](https://github.com/JuliaGraphs/LightGraphs.jl).

src/StaticGraphs.jl

@@ -57,16 +57,8 @@ indtype(g::AbstractStaticGraph{T, U}) where T where U = U
 eltype(x::AbstractStaticGraph) = vectype(x)
 
 function show(io::IO, g::AbstractStaticGraph)
-    if is_directed(g)
-        dir = "directed"
-    else
-        dir = "undirected"
-    end
-    if nv(g) == 0
-        print(io, "empty $dir simple static {$(vectype(g)), $(indtype(g))} graph")
-    else
-        print(io, "{$(nv(g)), $(ne(g))} $dir simple static {$(vectype(g)), $(indtype(g))} graph")
-    end
+    dir = is_directed(g)? "directed" : "undirected"
+    print(io, "{$(nv(g)), $(ne(g))} $dir simple static {$(vectype(g)), $(indtype(g))} graph")
 end
 
 @inline function _fvrange(g::AbstractStaticGraph, s::Integer)

test/runtests.jl

@@ -12,7 +12,7 @@ const testdir = dirname(@__FILE__)
     dhu = loadgraph(joinpath(testdir, "testdata", "pathdg-uint8.jsg"), SDGFormat())
 
     @testset "staticgraph" begin
-        @test sprint(show, StaticGraph(Graph())) == "empty undirected simple static {UInt8, UInt8} graph"
+        @test sprint(show, StaticGraph(Graph())) == "{0, 0} undirected simple static {UInt8, UInt8} graph"
         g = smallgraph(:house)
         gu = squash(g)
         sg = StaticGraph(g)
@@ -52,7 +52,7 @@ const testdir = dirname(@__FILE__)
     end # staticgraph
 
     @testset "staticdigraph" begin
-        @test sprint(show, StaticDiGraph(DiGraph())) == "empty directed simple static {UInt8, UInt8} graph"
+        @test sprint(show, StaticDiGraph(DiGraph())) == "{0, 0} directed simple static {UInt8, UInt8} graph"
         dg = PathDiGraph(5)
         dgu = squash(dg)
         dsg = StaticDiGraph(dg)