Merge branch 'master' into jt/develop

Author: Affie

Project.toml

@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.3.1"
+version = "0.3.2"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

src/DFGPlots/DFGPlots.jl

@@ -0,0 +1,59 @@
+module DFGPlots
+
+using Colors
+using LightGraphs
+using MetaGraphs
+using GraphPlot
+import GraphPlot: gplot
+
+using ...DistributedFactorGraphs
+
+export
+    dfgplot,
+    DFGPlotProps
+
+struct DFGPlotProps
+    nodefillc::NamedTuple{(:var,:fac),Tuple{RGB,RGB}}
+    nodesize::NamedTuple{(:var,:fac),Tuple{Float64,Float64}}
+    shape::NamedTuple{(:var,:fac),Tuple{Symbol,Symbol}} #not upported yet
+
+    layout::Function #spring_layout, spectral_layout
+    drawlabels::Bool
+end
+
+DFGPlotProps() = DFGPlotProps(  (var=colorant"seagreen", fac=colorant"cyan3"),
+                                (var=1.0, fac=0.3),
+                                (var=:box, fac=:elipse),
+                                spring_layout,
+                                true)
+
+
+function dfgplot(dfg::LightGraphsDFG)
+
+    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)]
+
+    gplot(dfg.g, nodelabel=nodelabel, nodesize=nodesize, nodefillc=nodefillc, layout=spectral_layout)
+
+end
+
+function gplot(dfg::LightGraphsDFG; keyargs...)
+    gplot(dfg.g; keyargs...)
+end
+
+function dfgplot(dfg::AbstractDFG)
+    # TODO implement convert functions
+    @warn "TODO Implement convert"
+    ldfg = LightGraphsDFG{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)]
+
+    gplot(ldfg.g, nodelabel=nodelabel, nodesize=nodesize, nodefillc=nodefillc, layout=spectral_layout)
+
+end
+
+end

src/DistributedFactorGraphs.jl

@@ -86,6 +86,12 @@ function __init__()
     include("CloudGraphsDFG/CloudGraphsDFG.jl")
   end
 =#
+
+    @require GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231" begin
+        include("DFGPlots/DFGPlots.jl")
+        @reexport using .DFGPlots
+    end
+
 end
 
 #FIXME JT not sure how to handle this, is it not lightweitgh enought to always include?

src/NeedsAHome.jl

@@ -1,5 +1,5 @@
 
-export hasFactor, hasVariable, isInitialized
+export hasFactor, hasVariable, isInitialized, getFactorFunction, isVariable, isFactor
 
 """
     $SIGNATURES
@@ -38,3 +38,37 @@ end
 function isInitialized(dfg::G, label::Symbol; key::Symbol=:default)::Bool where G <: AbstractDFG
   return isInitialized(getVariable(dfg, label), key=key)
 end
+
+
+"""
+    $SIGNATURES
+
+Return whether `sym::Symbol` represents a variable vertex in the graph.
+"""
+isVariable(dfg::G, sym::Symbol) where G <: AbstractDFG = hasVariable(dfg, sym)
+
+"""
+    $SIGNATURES
+
+Return whether `sym::Symbol` represents a factor vertex in the graph.
+"""
+isFactor(dfg::G, sym::Symbol) where G <: AbstractDFG = hasFactor(dfg, sym)
+
+"""
+    $SIGNATURES
+
+Return reference to the user factor in `<:AbstractDFG` identified by `::Symbol`.
+"""
+getFactorFunction(fcd::GenericFunctionNodeData) = fcd.fnc.usrfnc!
+getFactorFunction(fc::DFGFactor) = getFactorFunction(getData(fc))
+function getFactorFunction(dfg::G, fsym::Symbol) where G <: AbstractDFG
+  getFactorFunction(getFactor(dfg, fsym))
+end
+
+
+"""
+    $SIGNATURES
+
+Display and return to console the user factor identified by tag name.
+"""
+showFactor(fgl::G, fsym::Symbol) where G <: AbstractDFG = @show getFactor(fgl,fsym)

test/interfaceTests.jl

@@ -131,6 +131,9 @@ end
 numNodes = 10
 dfg = testDFGAPI{NoSolverParams}()
 verts = map(n -> DFGVariable(Symbol("x$n")), 1:numNodes)
+#change ready and backendset for x7,x8 for improved tests on x7x8f1
+verts[7].ready = 1
+verts[8].backendset = 1
 map(v -> addVariable!(dfg, v), verts)
 map(n -> addFactor!(dfg, [verts[n], verts[n+1]], DFGFactor{Int, :Symbol}(Symbol("x$(n)x$(n+1)f1"))), 1:(numNodes-1))
 # map(n -> addFactor!(dfg, [verts[n], verts[n+2]], DFGFactor(Symbol("x$(n)x$(n+2)f2"))), 1:2:(numNodes-2))
@@ -147,12 +150,15 @@ map(n -> addFactor!(dfg, [verts[n], verts[n+1]], DFGFactor{Int, :Symbol}(Symbol(
     @test getNeighbors(dfg, getFactor(dfg, :x1x2f1)) == ls(dfg, getFactor(dfg, :x1x2f1))
     @test getNeighbors(dfg, :x1x2f1) == ls(dfg, :x1x2f1)
 
-    # TODO @Dehann, I don't know exactly what wil be in it, so testing with 0 and 1
     # ready and backendset
     @test getNeighbors(dfg, :x5, ready=1) == Symbol[]
     @test getNeighbors(dfg, :x5, ready=0) == [:x4x5f1,:x5x6f1]
     @test getNeighbors(dfg, :x5, backendset=1) == Symbol[]
     @test getNeighbors(dfg, :x5, backendset=0) == [:x4x5f1,:x5x6f1]
+    @test getNeighbors(dfg, :x7x8f1, ready=0) == [:x8]
+    @test getNeighbors(dfg, :x7x8f1, backendset=0) == [:x7]
+    @test getNeighbors(dfg, :x7x8f1, ready=1) == [:x7]
+    @test getNeighbors(dfg, :x7x8f1, backendset=1) == [:x8]
     @test getNeighbors(dfg, verts[1], ready=0) == [:x1x2f1]
     @test getNeighbors(dfg, verts[1], ready=1) == Symbol[]
     @test getNeighbors(dfg, verts[1], backendset=0) == [:x1x2f1]