Merge pull request #15 from JuliaGraphs/sbromberger/adjmx

adjacency matrices. Fixes #8

Author: sbromberger

src/StaticGraphs.jl

@@ -2,6 +2,7 @@ module StaticGraphs
 
 using LightGraphs
 using JLD2
+using SparseArrays
 
 import Base:
     convert, eltype, show, ==, Pair, Tuple, in, copy, length, issubset, zero, one,
@@ -12,8 +13,7 @@ import LightGraphs:
     src, dst, edgetype, nv, ne, vertices, edges, is_directed,
     has_vertex, has_edge, inneighbors, outneighbors,
     indegree, outdegree, degree, insorted, squash,
-
-    AbstractGraphFormat, loadgraph, savegraph
+    AbstractGraphFormat, loadgraph, savegraph, reverse
 
 import LightGraphs.SimpleGraphs: 
     AbstractSimpleGraph, 

src/overrides.jl

@@ -1,7 +1,13 @@
-function adjacency_matrix(g::StaticGraph)
-    SparseMatrixCSC{Bool,UInt32}(nv(g), nv(g), g.f_ind, g.f_vec, ones(Bool, ne(g)*2))
-end
+import LightGraphs.LinAlg: adjacency_matrix
+
+adjacency_matrix(g::StaticGraph{I,U}, T::DataType; dir = :out) where I<:Integer where U<:Integer =
+    SparseMatrixCSC{T,I}(nv(g), nv(g), g.f_ind, g.f_vec, ones(T, ne(g)*2))
 
-function adjacency_matrix(g::StaticDiGraph)
-    SparseMatrixCSC{Bool,UInt32}(nv(g), nv(g), g.f_ind, g.f_vec, ones(Bool, ne(g)))
+function adjacency_matrix(g::StaticDiGraph{I,U}, T::DataType; dir = :out) where I<:Integer where U<:Integer
+    if dir == :in
+        return SparseMatrixCSC{T,I}(nv(g), nv(g), g.f_ind, g.f_vec, ones(T, ne(g)*2))
+    end
+    z = SparseMatrixCSC{T,I}(nv(g), nv(g), g.b_ind, g.b_vec, ones(T, ne(g)))
+    dir != :out && @warn("direction `$dir` not defined for adjacency matrices on StaticGraphs; defaulting to `out`")
+    return z
 end

src/staticdigraph.jl

@@ -91,3 +91,5 @@ is_directed(::Type{StaticDiGraph}) = true
 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))

test/runtests.jl

@@ -52,12 +52,19 @@ const testdir = dirname(@__FILE__)
         @test @inferred !is_directed(hu)
         @test @inferred !is_directed(StaticGraph)
         @test @inferred collect(edges(hu)) == collect(edges(sg))
+
+        z = @inferred(adjacency_matrix(hu, Bool, dir=:out))
+        @test z[1,2]
+        @test !z[1,4]
+        @test z == adjacency_matrix(hu, Bool, dir=:in) == adjacency_matrix(hu, Bool, dir=:both)
+
         # empty constructors
         @test nv(gempty) === 0x00
         @test typeof(LightGraphs.nv(gempty)) == UInt8
         @test length(LightGraphs.edges(gempty)) === 0x00
         @test nv(gdempty) === 0x00
         @test length(LightGraphs.edges(gdempty)) === 0x00
+
     end # staticgraph
 
     @testset "staticdigraph" begin
@@ -99,6 +106,15 @@ const testdir = dirname(@__FILE__)
         @test @inferred is_directed(dhu)
         @test @inferred is_directed(StaticDiGraph)
         @test @inferred collect(edges(dhu)) == collect(edges(dsg))
+
+        z = @inferred(adjacency_matrix(dhu, Bool, dir=:out))
+        @test z[1,2]
+        @test !z[2,1]
+        z = @inferred(adjacency_matrix(dhu, Bool, dir=:in))
+        @test z[2,1]
+        @test !z[1,2]
+        @test_logs (:warn, r".*") adjacency_matrix(dhu, Bool, dir=:both) == adjacency_matrix(dhu, Bool)
+
     end # staticdigraph
 
     @testset "utils" begin