Graphs.jl initial implementation

Author: GearsAD

REQUIRE

@@ -1,3 +1,6 @@
-julia 0.6
-Graphs 0.9.0
+julia 1.0
 DocStringExtensions 0.4.1
+LightGraphs 1.2.0
+MetaGraphs 0.6.1
+Requires 0.5.2
+DataFrames

src/DistributedFactorGraphs.jl

@@ -17,29 +17,31 @@ module DistributedFactorGraphs
 
 using Base
 using DocStringExtensions
+using Requires
 
 # Entities
 include("entities/AbstractTypes.jl")
-include("entities/DFGFactor.jl")
-include("entities/DFGVariable.jl")
-include("entities/DFGAPI.jl")
-include("entities/DistributedFactorGraph.jl")
-include("services/DistributedFactorGraph.jl")
+# include("entities/DFGFactor.jl")
+# include("entities/DFGVariable.jl")
+# include("entities/DFGAPI.jl")
+# include("entities/DistributedFactorGraph.jl")
+# include("services/DistributedFactorGraph.jl")
 
-export DFGAPI
-export DistributedFactorGraph
+export AbstractDFG
+# export DistributedFactorGraph
 
 export DFGNode
-export DFGFactor, GenericFunctionNodeData, FunctionNodeData, PackedFunctionNodeData
-export DFGVariable, ContinuousScalar, ContinuousMultivariate, VariableNodeData, PackedVariableNodeData
+export DFGFactor#, GenericFunctionNodeData, FunctionNodeData, PackedFunctionNodeData
+export DFGVariable#, ContinuousScalar, ContinuousMultivariate, VariableNodeData, PackedVariableNodeData
 
 # Exports for actual graph operations - we need a complete list here
-export addV!, addF!, getV, getF, deleteV!, deleteF!, neightbors, ls, subgraph, adjacencyMatrix
+export addVariable, addFactor
+# export addV!, addF!, getV, getF, deleteV!, deleteF!, neighbors, ls, subgraph, adjacencyMatrix
 
 # Basis of variable and factor - moved from IncrementalInference
-export InferenceType, PackedInferenceType, FunctorInferenceType, InferenceVariable
+# export InferenceType, PackedInferenceType, FunctorInferenceType, InferenceVariable
 
 # Include the Graphs.jl API.
-include("services/GraphsjlAPI.jl")
+include("services/GraphsDFG.jl")
 
 end

src/entities/AbstractTypes.jl

@@ -5,3 +5,21 @@ abstract type FunctorInferenceType <: Function end
 abstract type InferenceVariable end
 
 abstract type DFGNode end
+
+abstract type AbstractDFG
+end
+
+mutable struct DFGVariable <: DFGNode
+    label::Symbol
+    #TODO: Populate
+    _internalId::Int64
+    DFGVariable(label::Symbol) = new(label, 0)
+    DFGVariable(label::Symbol, _internalId::Int64) = new(label, _internalId)
+end
+mutable struct DFGFactor <: DFGNode
+    label::Symbol
+    #TODO: Populate
+    _internalId::Int64
+    DFGFactor(label::Symbol) = new(label, 0)
+    DFGFactor(label::Symbol, _internalId::Int64) = new(label, _internalId)
+end

src/entities/DFGAPI.jl

@@ -20,7 +20,8 @@ mutable struct DFGFactor <: DFGNode
     label::String
     edgeIds::Vector{Int64}
     nodeData::GenericFunctionNodeData
-    DFGFactor(label, factorFunction::R) where {R <: Union{FunctorInferenceType, InferenceType}} = new(-1, label, Vector{Int64}(), )
+    DFGFactor(label::String, factorFunction::R) where {R <: Union{FunctorInferenceType, InferenceType}} = new(-1, label, Vector{Int64}(), factorFunction)
+    DFGFactor(label::String, edgeIds::Vector{Int64}, factorFunction::R) where {R <: Union{FunctorInferenceType, InferenceType}} = new(-1, label, edgeIds, factorFunction)
 end
 
 FunctionNodeData{T <: Union{InferenceType, FunctorInferenceType}} = GenericFunctionNodeData{T, Symbol}

src/entities/DFGFactor.jl

@@ -14,6 +14,36 @@ function _validate(dfg::DistributedFactorGraph)::Void
     end
 end
 
+function getV(dfg::DistributedFactorGraph, vId::Int64)::DFGVariable
+    return DFGVariable("x0")
+end
+
+function getV(dfg::DistributedFactorGraph, vLabel::String)::DFGVariable
+    _validate(dfg)
+    return DFGVariable(vLabel)
+end
+
+function getVs(dfg::DistributedFactorGraph, regex::String)::Vector{DFGVariable}
+    _validate(dfg)
+    return [DFGVariable("x0")]
+end
+
+function getF(dfg::DistributedFactorGraph, fId::Int64)::DFGFactor
+    _validate(dfg)
+    return DFGFactor(fId, "x0f0", [], GenericFunctionNodeData{Int64, Symbol}())
+end
+
+function getF(dfg::DistributedFactorGraph, fLabel::String)::DFGFactor
+    _validate(dfg)
+    return DFGFactor(1, fLabel, [0], GenericFunctionNodeData{Int64, Symbol}())
+end
+
+function getFs(dfg::DistributedFactorGraph, regex::String)::Vector{DFGFactor}
+    _validate(dfg)
+    return [DFGFactor("x0x1f0", [0, 1], GenericFunctionNodeData{Int64, Symbol}())]
+end
+
+
 function addV!(dfg::DistributedFactorGraph, v::DFGVariable)::DFGVariable
     _validate(dfg)
     # Principal
@@ -52,30 +82,44 @@ function addF!(dfg::DistributedFactorGraph, f::DFGFactor)::DFGFactor
     return f
 end
 
-function addF!(dfg::DistributedFactorGraph, labelVariables::Vector{Symbol}, factorFunc::R)::DFGFactor where {R <: Union{FunctorInferenceType, InferenceType}}
-    variables = map(label -> gtV(dfg, label), labelVariables)
+function parseusermultihypo(multihypo::Union{Tuple,Vector{Float64}})
+  mh = nothing
+  if multihypo != nothing
+    multihypo2 = Float64[multihypo...]
+    # verts = Symbol.(multihypo[1,:])
+    for i in 1:length(multihypo)
+      if multihypo[i] > 0.999999
+        multihypo2[i] = 0.0
+      end
+    end
+    mh = Categorical(Float64[multihypo2...] )
+  end
+  return mh
+end
+
+function addF!(
+        dfg::DistributedFactorGraph,
+        labelVariables::Vector{Symbol},
+        factorFunc::R;
+        multihypo::Union{Nothing,Tuple,Vector{Float64}}=nothing)::DFGFactor
+        where {R <: Union{FunctorInferenceType, InferenceType}}
+    variables = map(label -> getV(dfg, String(label)), labelVariables)
     factName = _constructFactorName(dfg, labelVariables)
-    f = DFGFactor(-1, factName, map(v -> v.id, variables), factorFunc)
-    return f
-end
 
-function getV(vId::Int64)::DFGVariable
-    return DFGVariable(vId, "x0", VariableNodeData(), Vector{String}(), Dict{String, Any}())
-end
+    # Create the FunctionNodeData
+    ftyp = typeof(factorFunc) # maybe this can be T
+    # @show "setDefaultFactorNode!", usrfnc, ftyp, T
+    mhcat = parseusermultihypo(multihypo)
+    # gwpf = prepgenericwrapper(Xi, usrfnc, getSample, multihypo=mhcat)
+    ccw = prepgenericconvolution(Xi, usrfnc, multihypo=mhcat, threadmodel=threadmodel)
 
-function getV(d::DFGAPI, vLabel::String)::DFGVariable
-    _validate(dfg)
-    return DFGVariable(0, vLabel, VariableNodeData(), Vector{String}(), Dict{String, Any}())
-end
+    m = Symbol(ftyp.name.module)
 
-function getF(d::DFGAPI, fId::Int64)::DFGFactor
-    _validate(dfg)
-    return DFGFactor(fId, "x0f0", [], GenericFunctionNodeData{Int64, Symbol}())
-end
+    # experimental wip
+    data_ccw = FunctionNodeData{CommonConvWrapper{T}}(Int[], false, false, Int[], m, ccw)
 
-function getF(d::DFGAPI, fLabel::String)::DFGFactor
-    _validate(dfg)
-    return DFGFactor(1, fLabel, [0], GenericFunctionNodeData{Int64, Symbol}())
+    f = DFGFactor(-1, factName, map(v -> v.id, variables), data_ccw)
+    return f
 end
 
 function updateV!(d::DFGAPI, v::DFGVariable)::DFGVariable