Adjacency matrices

Author: GearsAD

src/services/GraphsDFG.jl

@@ -180,11 +180,22 @@ function getNeighbors(dfg::GraphsDFG, node::T)::Vector{Symbol}  where T <: DFGNo
     neighbors = in_neighbors(vert, dfg.g) #Don't use out_neighbors! It enforces directiveness even if we don't want it
     return map(n -> n.dfgNode.label, neighbors)
 end
+function getNeighbors(dfg::GraphsDFG, label::Symbol)::Vector{Symbol}  where T <: DFGNode
+    if !haskey(dfg.labelDict, label)
+        error("Variable/factor with label '$(label)' does not exist in the factor graph")
+    end
+    vert = dfg.g.vertices[dfg.labelDict[label]]
+    neighbors = in_neighbors(vert, dfg.g) #Don't use out_neighbors! It enforces directiveness even if we don't want it
+    return map(n -> n.dfgNode.label, neighbors)
+end
 
-# Alias
+# Aliases
 function ls(dfg::GraphsDFG, node::T)::Vector{Symbol} where T <: DFGNode
     return getNeighbors(dfg, node)
 end
+function ls(dfg::GraphsDFG, label::Symbol)::Vector{Symbol} where T <: DFGNode
+    return getNeighbors(dfg, label)
+end
 
 function _copyIntoGraph!(sourceDFG::GraphsDFG, destDFG::GraphsDFG, variableFactorLabels::Vector{Symbol}, includeOrphanFactors::Bool=false)::Nothing
     # Split into variables and factors
@@ -267,9 +278,18 @@ function __init__()
         if isdefined(Main, :DataFrames)
             export getAdjacencyMatrixDataFrame
             function getAdjacencyMatrixDataFrame(dfg::GraphsDFG)::Main.DataFrames.DataFrame
-                colNames = map(n -> n.dfgNode.label, vertices(dfg.g))
-                adjMat = adjacency_matrix(dfg.g)
-                return Main.DataFrames.DataFrame(adjMat, colNames)
+                varLabels = sort(map(v->v.label, getVariables(dfg)))
+                factLabels = sort(map(f->f.label, getFactors(dfg)))
+                adjDf = DataFrames.DataFrame(:Factor => Union{Missing, Symbol}[])
+                for varLabel in varLabels
+                    adjDf[varLabel] = Union{Missing, Symbol}[]
+                end
+                for (i, factLabel) in enumerate(factLabels)
+                    push!(adjDf, [factLabel, DataFrames.missings(length(varLabels))...])
+                    factVars = getNeighbors(dfg, getFactor(dfg, factLabel))
+                    map(vLabel -> adjDf[vLabel][i] = factLabel, factVars)
+                end
+                return adjDf
             end
         end
     end

test/runtests.jl

@@ -65,8 +65,9 @@ adjMat = getAdjacencyMatrixDataFrame(dfg)
 @test getNeighbors(dfg, verts[1]) == [:x1x2f1]
 neighbors = getNeighbors(dfg, getFactor(dfg, :x1x2f1))
 @test all([v in [:x1, :x2] for v in neighbors])
-# Testing alias
+# Testing aliases
 @test getNeighbors(dfg, getFactor(dfg, :x1x2f1)) == ls(dfg, getFactor(dfg, :x1x2f1))
+@test getNeighbors(dfg, :x1x2f1) == ls(dfg, :x1x2f1)
 
 # Subgraphs
 dfgSubgraph = getSubgraphAroundNode(dfg, verts[1], 2)
@@ -78,3 +79,17 @@ dfgSubgraph = getSubgraphAroundNode(dfg, verts[1], 1, true)
 # Test adding to the dfg
 dfgSubgraph = getSubgraphAroundNode(dfg, verts[1], 2, true, dfgSubgraph)
 @test all([v in [:x1, :x1x2f1, :x2] for v in map(n -> n.label, [ls(dfgSubgraph)..., lsf(dfgSubgraph)...])])
+
+# Adjacency matrix
+varLabels = sort(map(v->v.label, getVariables(dfg)))
+factLabels = sort(map(f->f.label, getFactors(dfg)))
+adjDf = DataFrame(:Factor => Union{Missing, Symbol}[])
+for varLabel in varLabels
+    adjDf[varLabel] = Union{Missing, Symbol}[]
+end
+for (i, factLabel) in enumerate(factLabels)
+    global adjDf
+    push!(adjDf, [factLabel, missings(length(varLabels))...])
+    factVars = getNeighbors(dfg, getFactor(dfg, factLabel))
+    map(vLabel -> adjDf[vLabel][i] = factLabel, factVars)
+end