Adding variable and factor structures

Author: GearsAD

REQUIRE

@@ -5,3 +5,5 @@ DocStringExtensions 0.4.1
 Requires 0.5.2
 JSON2
 Graphs
+# Caesar/IIF specific imports
+Distributions

src/DistributedFactorGraphs.jl

@@ -3,6 +3,8 @@ module DistributedFactorGraphs
 using Base
 using DocStringExtensions
 using Requires
+using Dates
+using Distributions
 
 # Entities
 include("entities/AbstractTypes.jl")

src/entities/DFGFactor.jl

@@ -1,11 +1,29 @@
+"""
+$(TYPEDEF)
+"""
+mutable struct GenericFunctionNodeData{T, S}
+  fncargvID::Array{Int,1}
+  eliminated::Bool
+  potentialused::Bool
+  edgeIDs::Array{Int,1}
+  frommodule::S #Union{Symbol, AbstractString}
+  fnc::T
+  multihypo::String # likely to moved when GenericWrapParam is refactored
+  certainhypo::Vector{Int}
+  GenericFunctionNodeData{T, S}() where {T, S} = new{T,S}()
+  GenericFunctionNodeData{T, S}(x1, x2, x3, x4, x5::S, x6::T, x7::String="", x8::Vector{Int}=Int[]) where {T, S} = new{T,S}(x1, x2, x3, x4, x5, x6, x7, x8)
+  GenericFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, x7::String="", x8::Vector{Int}=Int[]) where {T, S} = new{T,S}(x1, x2, x3, x4, x5, x6, x7, x8)
+  # GenericFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, x7::String) where {T, S} = new{T,S}(x1, x2, x3, x4, x5, x6, x7)
+end
+
 """
     $(SIGNATURES)
 Fundamental structure for a DFG factor.
 """
-mutable struct DFGFactor <: DFGNode
+mutable struct DFGFactor{T, S} <: DFGNode
     label::Symbol
-    #TODO: Populate
+    data::GenericFunctionNodeData{T, S}
     _internalId::Int64
-    DFGFactor(label::Symbol) = new(label, 0)
-    DFGFactor(label::Symbol, _internalId::Int64) = new(label, _internalId)
+    DFGFactor{T, S}(label::Symbol) where {T, S} = new{T, S}(label, GenericFunctionNodeData{T, S}(), 0)
+    DFGFactor{T, S}(label::Symbol, _internalId::Int64) where {T, S} = new{T, S}(label, GenericFunctionNodeData{T, S}(), _internalId)
 end

src/entities/DFGVariable.jl

@@ -1,12 +1,55 @@
+"""
+$(TYPEDEF)
+"""
+mutable struct VariableNodeData
+  val::Array{Float64,2}
+  bw::Array{Float64,2}
+  BayesNetOutVertIDs::Array{Int,1}
+  dimIDs::Array{Int,1} # Likely deprecate
+  dims::Int
+  eliminated::Bool
+  BayesNetVertID::Int
+  separator::Array{Int,1}
+  groundtruth::Union{Nothing, Dict{ Tuple{Symbol, Vector{Float64}} } } # not packed yet
+  softtype
+  initialized::Bool
+  ismargin::Bool
+  dontmargin::Bool
+  VariableNodeData() = new()
+  # function VariableNodeData(x1,x2,x3,x4,x5,x6,x7,x8,x9)
+  #   @warn "Deprecated use of VariableNodeData(11 param), use 13 parameters instead"
+  #   new(x1,x2,x3,x4,x5,x6,x7,x8,x9, nothing, true, false, false) # TODO ensure this is initialized true is working for most cases
+  # end
+  VariableNodeData(x1::Array{Float64,2},
+                   x2::Array{Float64,2},
+                   x3::Vector{Int},
+                   x4::Vector{Int},
+                   x5::Int,
+                   x6::Bool,
+                   x7::Int,
+                   x8::Vector{Int},
+                   x9::Union{Nothing, Dict{ Tuple{Symbol, Vector{Float64}} } },
+                   x10,
+                   x11::Bool,
+                   x12::Bool,
+                   x13::Bool) =
+    new(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13)
+end
 
 """
     $(SIGNATURES)
 Fundamental structure for a DFG variable.
 """
 mutable struct DFGVariable <: DFGNode
     label::Symbol
-    #TODO: Populate
+    timestamp::DateTime
+    tags::Vector{Symbol}
+    estimates::Dict{Symbol, Vector{Float64}}
+    variableData::VariableNodeData
+    # variableDatas::VND
+    smallData::Any
+    bigData::Any
     _internalId::Int64
-    DFGVariable(label::Symbol) = new(label, 0)
-    DFGVariable(label::Symbol, _internalId::Int64) = new(label, _internalId)
+    DFGVariable(label::Symbol, _internalId::Int64) = new(label, now(), Symbol[], Dict{Symbol, Vector{Float64}}(), VariableNodeData(), nothing, nothing, _internalId)
+    DFGVariable(label::Symbol) = new(label, now(), Symbol[], Dict{Symbol, Vector{Float64}}(), VariableNodeData(), nothing, nothing, 0)
 end

test/interfaceTests.jl

@@ -1,7 +1,7 @@
 dfg = testDFGAPI()
 v1 = DFGVariable(:a)
 v2 = DFGVariable(:b)
-f1 = DFGFactor(:f1)
+f1 = DFGFactor{Int, :Symbol}(:f1)
 @testset "Creating Graphs" begin
     global dfg,v1,v2,f1
     addVariable!(dfg, v1)