Merge pull request #11 from JuliaGraphs/sbromberger/julia-1.0

julia 1.0 / LG 1.0.0 compatibility

Author: sbromberger

.travis.yml

@@ -4,8 +4,8 @@ os:
   - linux
 #  - osx
 julia:
-  - 0.6
-#  - nightly
+  - 1.0
+  - nightly
 notifications:
   email: false
 git:
@@ -30,4 +30,4 @@ git:
 #  - julia -e 'Pkg.clone(pwd()); Pkg.build("StaticGraphs"); Pkg.test("StaticGraphs"; coverage=true)'
 after_success:
   # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("StaticGraphs")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'using Pkg; cd(Pkg.dir("StaticGraphs")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

REQUIRE

@@ -1,3 +1,3 @@
-julia 0.6
-LightGraphs 0.11
+julia 1.0
+LightGraphs 1.0
 JLD2

src/StaticGraphs.jl

@@ -4,13 +4,13 @@ using LightGraphs
 using JLD2
 
 import Base:
-    convert, eltype, show, ==, Pair, Tuple, in, copy, length, start, next, done, issubset, zero, one,
+    convert, eltype, show, ==, Pair, Tuple, in, copy, length, issubset, zero, one,
     size, getindex, setindex!, length, IndexStyle
 
 import LightGraphs:
-    _NI, _insert_and_dedup!, AbstractEdge, AbstractEdgeIter,
+    _NI, AbstractEdge, AbstractEdgeIter,
     src, dst, edgetype, nv, ne, vertices, edges, is_directed,
-    has_vertex, has_edge, in_neighbors, out_neighbors,
+    has_vertex, has_edge, inneighbors, outneighbors,
     indegree, outdegree, degree, insorted, squash,
 
     AbstractGraphFormat, loadgraph, savegraph
@@ -57,7 +57,7 @@ indtype(g::AbstractStaticGraph{T, U}) where T where U = U
 eltype(x::AbstractStaticGraph) = vectype(x)
 
 function show(io::IO, g::AbstractStaticGraph)
-    dir = is_directed(g)? "directed" : "undirected"
+    dir = is_directed(g) ? "directed" : "undirected"
     print(io, "{$(nv(g)), $(ne(g))} $dir simple static {$(vectype(g)), $(indtype(g))} graph")
 end
 
@@ -69,23 +69,23 @@ end
 
 @inline function fadj(g::AbstractStaticGraph, s::Integer)
     r = _fvrange(g, s)
-    return fastview(g.f_vec, r)
+    return view(g.f_vec, r)
 end
 
 nv(g::AbstractStaticGraph{T, U}) where T where U = T(length(g.f_ind) - 1)
 vertices(g::AbstractStaticGraph{T, U}) where T where U = one(T):nv(g)
 
 
 has_edge(g::AbstractStaticGraph, e::AbstractStaticEdge) =
-    insorted(dst(e), out_neighbors(g, src(e)))
+    insorted(dst(e), outneighbors(g, src(e)))
 
 edgetype(g::AbstractStaticGraph{T}) where T = StaticEdge{T}
 edges(g::AbstractStaticGraph) = StaticEdgeIter(g)
 
 has_vertex(g::AbstractStaticGraph, v::Integer) = v in vertices(g)
 
-out_neighbors(g::AbstractStaticGraph, v::Integer) = fadj(g, v)
-in_neighbors(g::AbstractStaticGraph, v::Integer) = badj(g, v)
+outneighbors(g::AbstractStaticGraph, v::Integer) = fadj(g, v)
+inneighbors(g::AbstractStaticGraph, v::Integer) = badj(g, v)
 
 zero(g::T) where T<:AbstractStaticGraph = T()
 

src/staticdigraph.jl

@@ -18,7 +18,7 @@ end
 
 @inline function badj(g::StaticDiGraph, s)
     r = _bvrange(g, s)
-    return fastview(g.b_vec, r)
+    return view(g.b_vec, r)
 end
 
 ne(g::StaticDiGraph{T, U}) where T where U = U(length(g.f_vec))
@@ -52,6 +52,7 @@ function StaticDiGraph(n_v, f_sd::Vector{Tuple{T, T}}, b_sd::Vector{Tuple{T, T}}
 end
 
 function StaticDiGraph(g::LightGraphs.SimpleGraphs.SimpleDiGraph)
+    ne(g) == 0 && return StaticDiGraph(nv(g), Array{Tuple{UInt8, UInt8},1}(), Array{Tuple{UInt8, UInt8},1}())
     f_sd = [Tuple(e) for e in edges(g)]
     b_sd = sort([Tuple(reverse(e)) for e in edges(g)])
 

src/staticgraph.jl

@@ -37,6 +37,7 @@ function StaticGraph(n_v, sd::Vector{Tuple{T, T}}) where T <: Integer
 end
 
 function StaticGraph(g::LightGraphs.SimpleGraphs.SimpleGraph)
+    ne(g) == 0 && return StaticGraph(nv(g), Array{Tuple{UInt8, UInt8},1}())
     sd1 = [Tuple(e) for e in edges(g)]
     ds1 = [Tuple(reverse(e)) for e in edges(g)]
 

src/utils.jl

@@ -1,31 +1,3 @@
-struct UnsafeVectorView{T,U} <: AbstractVector{T}
-    offset::U
-    len::U
-    ptr::Ptr{T}
-end
-
-@inline UnsafeVectorView(parent::Union{Vector, Base.FastContiguousSubArray}, range::UnitRange) = UnsafeVectorView(start(range) - 1, length(range), pointer(parent))
-@inline Base.size(v::UnsafeVectorView) = (v.len,)
-@inline Base.getindex(v::UnsafeVectorView, idx) = unsafe_load(v.ptr, idx + v.offset)
-@inline Base.setindex!(v::UnsafeVectorView, value, idx) = unsafe_store!(v.ptr, value, idx + v.offset)
-@inline Base.length(v::UnsafeVectorView) = v.len
-Base.IndexStyle(::Type{V}) where V <: UnsafeVectorView = IndexLinear()
-
-"""
-UnsafeVectorView only works for isbits types. For other types, we're already
-allocating lots of memory elsewhere, so creating a new SubArray is fine.
-This function looks type-unstable, but the isbits(T) test can be evaluated
-by the compiler, so the result is actually type-stable.
-From https://github.com/rdeits/NNLS.jl/blob/0a9bf56774595b5735bc738723bd3cb94138c5bd/src/NNLS.jl#L218.
-"""
-@inline function fastview(parent::Union{Vector{T}, Base.FastContiguousSubArray{T}}, range::UnitRange) where T
-    if isbits(T)
-        UnsafeVectorView(parent, range)
-    else
-        view(parent, range)
-    end
-end
-
 """
     mintype(v)
 

test/runtests.jl

@@ -1,7 +1,7 @@
 using StaticGraphs
 using LightGraphs
 using LightGraphs.SimpleGraphs
-using Base.Test
+using Test
 
 const testdir = dirname(@__FILE__)
 
@@ -30,8 +30,8 @@ const testdir = dirname(@__FILE__)
         @test @inferred eltype(hu) == UInt8
         @test testfn(ne)
         @test testfn(nv)
-        @test testfn(in_neighbors, 1)
-        @test testfn(out_neighbors, 1)
+        @test testfn(inneighbors, 1)
+        @test testfn(outneighbors, 1)
         @test testfn(vertices)
         @test testfn(degree)
         @test testfn(degree, 1)
@@ -73,8 +73,8 @@ const testdir = dirname(@__FILE__)
         @test @inferred eltype(dhu) == UInt8
         @test dtestfn(ne)
         @test dtestfn(nv)
-        @test dtestfn(in_neighbors, 1)
-        @test dtestfn(out_neighbors, 1)
+        @test dtestfn(inneighbors, 1)
+        @test dtestfn(outneighbors, 1)
         @test dtestfn(vertices)
         @test dtestfn(degree)
         @test dtestfn(degree, 1)
@@ -95,12 +95,12 @@ const testdir = dirname(@__FILE__)
 
     @testset "utils" begin
         A = [1:5;]
-        B = StaticGraphs.fastview(A, 2:3)
+        B = StaticGraphs.view(A, 2:3)
         @test @inferred B == [2,3]
         B[1] = 5
         @test @inferred A == [1,5,3,4,5]
         A = ["a", "b", "c", "d"]
-        @test @inferred StaticGraphs.fastview(A, 2:3) == ["b", "c"]
+        @test @inferred StaticGraphs.view(A, 2:3) == ["b", "c"]
     end # utils
 
     @testset "persistence" begin