Merge pull request #6 from Circuitscape/vl/dev

fix graphs interface for weighted graphs
Circuitscape · Nov 15, 2021 · a4fd38a · a4fd38a
2 parents 987a6e8 + 2239a83
commit a4fd38a
Showing 1 changed file with 105 additions and 14 deletions.
diff --git a/src/graph_interface.jl b/src/graph_interface.jl
@@ -5,22 +5,99 @@ import Graphs:
     inneighbors, outneighbors, is_directed, add_edge!
 
 import SimpleWeightedGraphs:
-    add_edge!, get_weight, add_vertex!, vertices
+    add_edge!, get_weight, add_vertex!
 
 import Base: zero
 
 ### Graphs interface
-nv(g::AbstractSpatialGraph) = nv(g.graph)
-ne(g::AbstractSpatialGraph) = ne(g.graph)
-vertices(g::AbstractSpatialGraph) = vertices(g.graph)
-edges(g::AbstractSpatialGraph) = edges(g.graph)
-eltype(g::AbstractSpatialGraph) = eltype(g.graph)
-edgetype(g::AbstractSpatialGraph) = edgetype(g.graph)
-has_edge(g::AbstractSpatialGraph, s, d) = has_edge(g.graph, s, d)
-has_vertex(g::AbstractSpatialGraph, v) = has_vertex(g.graph, v)
-inneighbors(g::AbstractSpatialGraph, v) = inneighbors(g.graph, v)
-outneighbors(g::AbstractSpatialGraph, v) = outneighbors(g.graph, v)
-is_directed(g::AbstractSpatialGraph) = is_directed(g.graph)
+function nv(g::AbstractSpatialGraph) 
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.nv(g.graph)
+    else
+        nv(g.graph)
+    end
+end
+
+function ne(g::AbstractSpatialGraph) 
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.ne(g.graph)
+    else
+        ne(g.graph)
+    end
+end
+
+function vertices(g::AbstractSpatialGraph) 
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.vertices(g.graph)
+    else
+        vertices(g.graph)
+    end
+end
+
+function edges(g::AbstractSpatialGraph) 
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.edges(g.graph)
+    else
+        edges(g.graph)
+    end
+end
+
+function eltype(g::AbstractSpatialGraph) 
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.eltype(g.graph)
+    else
+        eltype(g.graph)
+    end
+end
+
+function edgetype(g::AbstractSpatialGraph) 
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.edgetype(g.graph)
+    else
+        edgetype(g.graph)
+    end
+end
+
+function has_edge(g::AbstractSpatialGraph, s, d)
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.has_edge(g.graph, s, d)
+    else
+        has_edge(g.graph, s, d)
+    end    
+end
+
+function has_vertex(g::AbstractSpatialGraph, v)
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.has_vertex(g.graph, v)
+    else
+        has_vertex(g.graph, v)
+    end    
+end
+
+function inneighbors(g::AbstractSpatialGraph, v)
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.inneighbors(g.graph, v)
+    else
+        inneighbors(g.graph, v)
+    end    
+end
+
+function outneighbors(g::AbstractSpatialGraph, v)
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.outneighbors(g.graph, v)
+    else
+        outneighbors(g.graph, v)
+    end    
+end
+
+function is_directed(g::AbstractSpatialGraph) 
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.is_directed(g.graph)
+    else
+        is_directed(g.graph)
+    end
+end
+
 function Base.zero(g::AbstractRasterGraph)
     if g.graph isa Graph
         RasterGraph(
@@ -44,8 +121,22 @@ function Base.zero(g::AbstractRasterGraph)
         )
     end
 end
-add_edge!(g::AbstractSpatialGraph, a::Integer, b::Integer, c::Number) = add_edge!(g.graph, a, b, c)
-add_vertex!(g::AbstractSpatialGraph) = add_vertex!(g.graph)
+
+function add_edge!(g::AbstractSpatialGraph, a::Integer, b::Integer, c::Number)
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.add_edge!(g.graph, a, b, c)
+    else
+        add_edge!(g.graph, a, b, c)
+    end
+end
+
+function add_vertex!(g::AbstractSpatialGraph) 
+    if typeof(g.graph) <: Union{SimpleWeightedGraph, SimpleWeightedDiGraph}
+        SimpleWeightedGraphs.add_vertex!(g.graph)
+    else
+        add_vertex!(g.graph)
+    end
+end
 
 ### SimpleWeightedGraphs
 get_weight(g::WeightedRasterGraph, a::Integer, b::Integer) = get_weight(g.graph, a, b)