type indication for adjusted mintype, tests empty constructor

Author: matbesancon

src/staticdigraph.jl

@@ -24,7 +24,7 @@ end
 ne(g::StaticDiGraph{T, U}) where T where U = U(length(g.f_vec))
 
 # sorted src, dst vectors for forward and backward edgelists.
-function StaticDiGraph(nvtx::I, f_ss::AbstractVector, f_ds::AbstractVector, b_ss::AbstractVector, b_ds::AbstractVector) where {I<:Integer}
+function StaticDiGraph(nvtx::I, f_ss::AbstractVector{F}, f_ds::AbstractVector{D}, b_ss::AbstractVector{B}, b_ds::AbstractVector{S}) where {I<:Integer,S<:Integer,D<:Integer,B<:Integer,F<:Integer}
     length(f_ss) == length(f_ds) == length(b_ss) == length(b_ds) || error("source and destination vectors must be equal length")
     (nvtx == 0 || length(f_ss) == 0) && return StaticDiGraph(UInt8[], UInt8[1], UInt8[], UInt8[1])
     f_ind = [searchsortedfirst(f_ss, x) for x in 1:nvtx]

src/staticgraph.jl

@@ -11,8 +11,8 @@ struct StaticGraph{T<:Integer, U<:Integer} <: AbstractStaticGraph{T, U}
 end
 
 # sorted src, dst vectors
-# note: this requires reverse edges included in the sorted vector.  
-function StaticGraph(nvtx::I, ss::AbstractVector, ds::AbstractVector) where {I<:Integer}
+# note: this requires reverse edges included in the sorted vector.
+function StaticGraph(nvtx::I, ss::AbstractVector{S}, ds::AbstractVector{D}) where {I<:Integer,S<:Integer,D<:Integer}
     length(ss) != length(ds) && error("source and destination vectors must be equal length")
     (nvtx == 0 || length(ss) == 0) && return StaticGraph()
     f_ind = [searchsortedfirst(ss, x) for x in 1:nvtx]
@@ -29,7 +29,7 @@ function StaticGraph(nvtx::I, sd::Vector{Tuple{T, T}}) where {T<:Integer, I<:Int
     return StaticGraph(nvtx, ss, ds)
 end
 
-function StaticGraph(g::LightGraphs.SimpleGraphs.SimpleGraph)
+function StaticGraph(g::LightGraphs.SimpleGraph)
     sd1 = [Tuple(e) for e in edges(g)]
     ds1 = [Tuple(reverse(e)) for e in edges(g)]
     sd = sort(vcat(sd1, ds1))

test/runtests.jl

@@ -17,6 +17,7 @@ const testdir = dirname(@__FILE__)
         gu = squash(g)
         sg = StaticGraph(g)
         sgu = StaticGraph(gu)
+        gempty = StaticGraph()
         @test sprint(show, sg) == "{5, 6} undirected simple static {UInt8, UInt8} graph"
         @test sprint(show, sgu) == "{5, 6} undirected simple static {UInt8, UInt8} graph"
         testfn(fn, args...) =
@@ -49,6 +50,9 @@ const testdir = dirname(@__FILE__)
         @test @inferred !is_directed(hu)
         @test @inferred !is_directed(StaticGraph)
         @test @inferred collect(edges(hu)) == collect(edges(sg))
+        @test nv(gempty) == 0
+        @test typeof(LightGraphs.nv(gempty)) == UInt8
+        @test length(LightGraphs.edges(gempty)) === 0x00
     end # staticgraph
 
     @testset "staticdigraph" begin