Merge pull request #22 from JuliaGraphs/sbromberger/fix-21

fixes #21

Author: sbromberger

src/StaticGraphs.jl

@@ -72,6 +72,9 @@ end
     return view(g.f_vec, r)
 end
 
+
+@inline fadj(g::AbstractStaticGraph) = [fadj(g, v) for v in vertices(g)]
+
 nv(g::AbstractStaticGraph{T, U}) where T where U = T(length(g.f_ind) - 1)
 vertices(g::AbstractStaticGraph{T, U}) where T where U = Base.OneTo(nv(g))
 

src/staticdigraph.jl

@@ -21,6 +21,8 @@ end
     return view(g.b_vec, r)
 end
 
+@inline badj(g) = [badj(g, v) for v in vertices(g)]
+
 ne(g::StaticDiGraph{T, U}) where T where U = U(length(g.f_vec))
 
 # sorted src, dst vectors for forward and backward edgelists.
@@ -92,4 +94,4 @@ is_directed(::Type{StaticDiGraph{T}}) where T = true
 is_directed(::Type{StaticDiGraph{T, U}}) where T where U = true
 is_directed(g::StaticDiGraph) = true
 
-reverse(g::StaticDiGraph) = StaticDiGraph(copy(g.b_vec), copy(g.b_ind), copy(g.f_vec), copy(g.f_ind))
+reverse(g::StaticDiGraph) = StaticDiGraph(copy(g.b_vec), copy(g.b_ind), copy(g.f_vec), copy(g.f_ind))

src/staticgraph.jl

@@ -48,6 +48,7 @@ function StaticGraph()
 end
 
 badj(g::StaticGraph, s) = fadj(g, s)
+badj(g::StaticGraph) = fadj(g)
 
 ne(g::StaticGraph{T, U}) where T where U = U(length(g.f_vec) ÷ 2)
 

test/runtests.jl

@@ -52,6 +52,8 @@ const testdir = dirname(@__FILE__)
         @test @inferred !is_directed(hu)
         @test @inferred !is_directed(StaticGraph)
         @test @inferred collect(edges(hu)) == collect(edges(sg))
+        @test @inferred StaticGraphs.fadj(hu) == [StaticGraphs.fadj(hu, x) for x in vertices(hu)]
+        @test @inferred StaticGraphs.badj(hu) == StaticGraphs.fadj(hu)
 
         (g1, m1) = @inferred induced_subgraph(hu, [3,2,1])
         g2 = @inferred hu[3:-1:1]
@@ -74,7 +76,7 @@ const testdir = dirname(@__FILE__)
 
     @testset "staticdigraph" begin
         @test sprint(show, StaticDiGraph(DiGraph())) == "{0, 0} directed simple static {UInt8, UInt8} graph"
-        dg = PathDiGraph(5)
+        dg = path_digraph(5)
         dgu = squash(dg)
         dsg = StaticDiGraph(dg)
         dsgu = StaticDiGraph(dgu)
@@ -111,6 +113,8 @@ const testdir = dirname(@__FILE__)
         @test @inferred is_directed(dhu)
         @test @inferred is_directed(StaticDiGraph)
         @test @inferred collect(edges(dhu)) == collect(edges(dsg))
+        @test @inferred StaticGraphs.fadj(dhu) == [StaticGraphs.fadj(dhu, x) for x in vertices(dhu)]
+        @test @inferred StaticGraphs.badj(dhu) == [StaticGraphs.badj(dhu, x) for x in vertices(dhu)]
 
         (g1, m1) = @inferred induced_subgraph(dhu, [3,2,1])
         g2 = @inferred dhu[3:-1:1]