Merge branch 'master' into test/20Q2/testCGDFG_both

Author: dehann

src/entities/DFGFactor.jl

@@ -41,7 +41,7 @@ mutable struct GenericFunctionNodeData{T<:Union{PackedInferenceType, FunctorInfe
     edgeIDs::Array{Int,1}
     frommodule::S # JT TODO remove frommodule, not used at all as far as i can tell
     fnc::T
-    multihypo::Array{Float64} # likely to moved when GenericWrapParam is refactored
+    multihypo::Vector{Float64} # likely to moved when GenericWrapParam is refactored
     certainhypo::Vector{Int}
     solveInProgress::Int
     GenericFunctionNodeData{T, S}() where {T, S} = new{T,S}()

src/services/AbstractDFG.jl

@@ -57,7 +57,8 @@ getSolverParams(dfg::AbstractDFG) = dfg.solverParams
 
 Method must be overloaded by the user for Serialization to work.  E.g. IncrementalInference uses `CommonConvWrapper <: FactorOperationalMemory`.
 """
-getFactorOperationalMemoryType(dummy) = error("Please define this function getFactorOperationalMemoryType for your usecase, e.g. = `IIF.CommonConvWrapper <: FactorOperationalMemory`")
+getFactorOperationalMemoryType(dummy) = error("Please extend your workspace with function getFactorOperationalMemoryType(<:AbstractParams) for your usecase, e.g. IncrementalInference uses `CommonConvWrapper <: FactorOperationalMemory`")
+getFactorOperationalMemoryType(dfg::AbstractDFG) = getFactorOperationalMemoryType(getSolverParams(dfg))
 
 
 ##------------------------------------------------------------------------------

test/consolInterfaceDev.jl

@@ -7,11 +7,6 @@ using Dates
 using UUIDs
 # using IncrementalInference
 
-## must overload the function
-import DistributedFactorGraphs: getFactorOperationalMemoryType
-# DF, dropping DFG. so that Main context is used and can be overridden by IIF.getFac...Type
-getFactorOperationalMemoryType(::CloudGraphsDFG) = TestCCW
-
 
 include("testBlocks.jl")