Merge pull request #6 from JuliaGraphs/sbromberger/conversion-and-bugfix

fixes bug in mintype and allows upconversion of staticgraphs

Author: sbromberger

src/staticdigraph.jl

@@ -31,8 +31,8 @@ function StaticDiGraph(n_v, f_ss::AbstractVector, f_ds::AbstractVector, b_ss::Ab
     push!(f_ind, length(f_ss)+1)
     b_ind = [searchsortedfirst(b_ss, x) for x in 1:n_v]
     push!(b_ind, length(b_ss)+1)
-    T = mintype(f_ds)
-    U = mintype(f_ind)
+    T = mintype(maximum(f_ds))
+    U = mintype(f_ind[end])
     return StaticDiGraph{T, U}(
         convert(Vector{T}, f_ds), 
         convert(Vector{U}, f_ind), 
@@ -57,7 +57,16 @@ function StaticDiGraph(g::LightGraphs.SimpleGraphs.SimpleDiGraph)
 
     StaticDiGraph(nv(g), f_sd, b_sd)
 end
-    
+
+function StaticDiGraph{T, U}(s::StaticDiGraph) where T <: Integer where U <: Integer
+    new_fvec = T.(s.f_vec)
+    new_find = U.(s.f_ind)
+    new_bvec = T.(s.b_vec)
+    new_bind = U.(s.b_ind)
+    return StaticDiGraph(new_fvec, new_find, new_bvec, new_bind)
+end
+
+
 #
 ==(g::StaticDiGraph, h::StaticDiGraph) = g.f_vec == h.f_vec && g.f_ind == h.f_ind && g.b_vec == h.b_vec && g.b_ind == h.b_ind
 

src/staticgraph.jl

@@ -18,11 +18,17 @@ function StaticGraph(n_v, ss::AbstractVector, ds::AbstractVector)
     (n_v == 0 || length(ss) == 0) && return StaticGraph(UInt8[], UInt8[1])
     f_ind = [searchsortedfirst(ss, x) for x in 1:n_v]
     push!(f_ind, length(ss)+1)
-    T = mintype(ds)
-    U = mintype(f_ind)
+    T = mintype(maximum(ds))
+    U = mintype(f_ind[end])
     return StaticGraph{T, U}(convert(Vector{T},ds), convert(Vector{U}, f_ind))
 end
 
+function StaticGraph{T, U}(s::StaticGraph) where T <: Integer where U <: Integer
+    new_fvec = T.(s.f_vec)
+    new_find = U.(s.f_ind)
+    return StaticGraph(new_fvec, new_find)
+end
+
 # sorted src, dst tuples
 function StaticGraph(n_v, sd::Vector{Tuple{T, T}}) where T <: Integer
     ss = [x[1] for x in sd]

src/utils.jl

@@ -29,19 +29,14 @@ end
 """
     mintype(v)
 
-Returns the minimum integer type required to fit all elements
-in sorted vector `v`.
-
-### Implementation Notes
-`v` is assumed to be sorted.
+Returns the minimum integer type required to represent integer `v`.
 """
-function mintype(v::AbstractVector)
+function mintype(v::T) where T <: Integer
     validtypes = [UInt8, UInt16, UInt32, UInt64, UInt128]
-    l = v[end]
-    for T in validtypes
-        l <= typemax(T) && return T
+    for U in validtypes
+        v <= typemax(U) && return U
     end
-    return eltype(v)
+    return T
 end
 
 

test/runtests.jl

@@ -17,6 +17,7 @@ const testdir = dirname(@__FILE__)
         gu = squash(g)
         sg = StaticGraph(g)
         sgu = StaticGraph(gu)
+        @test eltype(StaticGraph{UInt128, UInt128}(sgu)) == UInt128
         @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...) =
@@ -57,6 +58,7 @@ const testdir = dirname(@__FILE__)
         dgu = squash(dg)
         dsg = StaticDiGraph(dg)
         dsgu = StaticDiGraph(dgu)
+        @test eltype(StaticDiGraph{UInt128, UInt128}(dsgu)) == UInt128
         @test sprint(show, dsg) == "{5, 4} directed simple static {UInt8, UInt8} graph"
         @test sprint(show, dsgu) == "{5, 4} directed simple static {UInt8, UInt8} graph"
         dhu = loadgraph(joinpath(testdir, "testdata", "pathdg-uint8.jsg"), SDGFormat())