dfgplot with parameters

Author: Affie

src/DFGPlots/DFGPlots.jl

@@ -24,36 +24,58 @@ end
 DFGPlotProps() = DFGPlotProps(  (var=colorant"seagreen", fac=colorant"cyan3"),
                                 (var=1.0, fac=0.3),
                                 (var=:box, fac=:elipse),
-                                spring_layout,
+                                spectral_layout,
                                 true)
 
 
-function dfgplot(dfg::MetaGraphsDFG)
+function dfgplot(dfg::LightDFG, p::DFGPlotProps = DFGPlotProps())
 
-    nodesize = [has_prop(dfg.g,i,:factor) ? 0.3 : 1.0 for i=vertices(dfg.g)]
-    nodelabel = [has_prop(dfg.g,i,:factor) ? "" : string(get_prop(dfg.g,i,:label)) for i=vertices(dfg.g)]
-    nodefillc = [has_prop(dfg.g,i,:factor) ? colorant"seagreen" : colorant"cyan3" for i=vertices(dfg.g)]
+    nodetypes = [haskey(dfg.g.variables, s) for s in dfg.g.labels]
 
-    gplot(dfg.g, nodelabel=nodelabel, nodesize=nodesize, nodefillc=nodefillc, layout=spectral_layout)
+    nodesize = [isVar ? p.nodesize.var : p.nodesize.fac for isVar in nodetypes]
+    # nodelabel = [isVar ? string(get_prop(dfg.g,i,:label)) : "" for (i,isVar) in enumerate(nodetypes)]
+    if p.drawlabels
+        nodelabel = [nodetypes[i] ? string(s) : "" for (i,s) in enumerate(dfg.g.labels)]
+    else
+        nodelabel = nothing
+    end
+
+    nodefillc = [isVar ? p.nodefillc.var : p.nodefillc.fac for isVar in nodetypes]
+
+    gplot(dfg.g, nodelabel=nodelabel, nodesize=nodesize, nodefillc=nodefillc, layout=p.layout)
 
 end
 
-function gplot(dfg::MetaGraphsDFG; keyargs...)
-    gplot(dfg.g; keyargs...)
+function dfgplot(dfg::MetaGraphsDFG, p::DFGPlotProps = DFGPlotProps())
+
+    nodesize = [has_prop(dfg.g,i,:factor) ?  p.nodesize.fac : p.nodesize.var for i=vertices(dfg.g)]
+    if p.drawlabels
+        nodelabel = [has_prop(dfg.g,i,:factor) ? "" : string(get_prop(dfg.g,i,:label)) for i=vertices(dfg.g)]
+    else
+        nodelabel = nothing
+    end
+    nodefillc = [has_prop(dfg.g,i,:factor) ? p.nodefillc.fac : p.nodefillc.var for i=vertices(dfg.g)]
+
+    gplot(dfg.g, nodelabel=nodelabel, nodesize=nodesize, nodefillc=nodefillc, layout=p.layout)
+
 end
 
-function dfgplot(dfg::AbstractDFG)
+function dfgplot(dfg::AbstractDFG, p::DFGPlotProps = DFGPlotProps())
     # TODO implement convert functions
     @warn "TODO Implement convert"
     ldfg = MetaGraphsDFG{AbstractParams}()
     DistributedFactorGraphs._copyIntoGraph!(dfg, ldfg, union(getVariableIds(dfg), getFactorIds(dfg)), true)
 
-    nodesize = [has_prop(ldfg.g,i,:factor) ? 0.3 : 1.0 for i=vertices(ldfg.g)]
-    nodelabel = [has_prop(ldfg.g,i,:factor) ? "" : string(get_prop(ldfg.g,i,:label)) for i=vertices(ldfg.g)]
-    nodefillc = [has_prop(ldfg.g,i,:factor) ? colorant"seagreen" : colorant"cyan3" for i=vertices(ldfg.g)]
+    dfgplot(ldfg, p)
 
-    gplot(ldfg.g, nodelabel=nodelabel, nodesize=nodesize, nodefillc=nodefillc, layout=spectral_layout)
+end
+
+function gplot(dfg::MetaGraphsDFG; keyargs...)
+    gplot(dfg.g; keyargs...)
+end
 
+function gplot(dfg::LightDFG; keyargs...)
+    gplot(dfg.g; keyargs...)
 end
 
 end

src/LightDFG/FactorGraphs/BiMaps.jl

@@ -45,7 +45,7 @@ end
 Base.haskey(b::BiDictMap, s::Symbol) = haskey(b.sym_int, s)
 Base.haskey(b::BiDictMap, i::Int) = haskey(b.int_sym, i)
 
-
+Base.length(b::BiDictMap) = length(b.int_sym)
 Base.firstindex(v::BiDictMap) = 1
 Base.lastindex(v::BiDictMap) = length(v.int_sym)
 Base.iterate(v::BiDictMap, i=1) = (length(v.int_sym) < i ? nothing : (v.int_sym[i], i + 1))

src/LightDFG/services/LightDFG.jl

@@ -217,7 +217,19 @@ Related
 
 ls
 """
-getVariableIds(dfg::LightDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[])::Vector{Symbol} = map(v -> v.label, getVariables(dfg, regexFilter, tags=tags))
+
+function getVariableIds(dfg::LightDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[])::Vector{Symbol}
+
+	# variables = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGVariable, vertices(dfg.g)))
+	if length(tags) > 0
+		return map(v -> v.label, getVariables(dfg, regexFilter, tags=tags))
+	else
+		variables = collect(keys(dfg.g.variables))
+		regexFilter != nothing && (variables = filter(v -> occursin(regexFilter, String(v)), variables))
+		return variables
+    end
+end
+
 
 # Alias
 """
@@ -246,8 +258,14 @@ end
 Get a list of the IDs of the DFGFactors in the DFG.
 Optionally specify a label regular expression to retrieves a subset of the factors.
 """
-getFactorIds(dfg::LightDFG, regexFilter::Union{Nothing, Regex}=nothing)::Vector{Symbol} = map(f -> f.label, getFactors(dfg, regexFilter))
-
+function getFactorIds(dfg::LightDFG, regexFilter::Union{Nothing, Regex}=nothing)::Vector{Symbol}
+	# factors = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGFactor, vertices(dfg.g)))
+	factors = collect(keys(dfg.g.factors))
+	if regexFilter != nothing
+		factors = filter(f -> occursin(regexFilter, String(f)), factors)
+	end
+	return factors
+end
 """
     $(SIGNATURES)
 List the DFGFactors in the DFG.