more fixes

Author: dehann

test/testBlocks.jl

@@ -57,7 +57,7 @@ function Base.convert(::Type{TestAbstractPrior}, d::PackedTestAbstractPrior)
     TestAbstractPrior()
 end
 
-struct TestCCW{T} <: FactorOperationalMemory where {T<:FunctorInferenceType}
+struct TestCCW{T <: AbstractFactor} <: FactorOperationalMemory
     usrfnc!::T
 end
 
@@ -69,7 +69,7 @@ DFG.getFactorOperationalMemoryType(par::NoSolverParams) = TestCCW
 DFG.rebuildFactorMetadata!(dfg::AbstractDFG{NoSolverParams}, fac::DFGFactor) = fac
 
 function Base.convert(::Type{DFG.FunctionNodeData{TestCCW{F}}},
-                     d::DFG.PackedFunctionNodeData{<:PackedInferenceType}) where F<:FunctorInferenceType
+                     d::DFG.PackedFunctionNodeData{<:PackedAbstractFactor}) where {F <: AbstractFactor}
 
     return DFG.FunctionNodeData(d.eliminated,
                                 d.potentialused,
@@ -78,19 +78,20 @@ function Base.convert(::Type{DFG.FunctionNodeData{TestCCW{F}}},
                                 d.multihypo,
                                 d.certainhypo,
                                 d.nullhypo,
-                                d.solveInProgress)
+                                d.solveInProgress,
+                                d.inflation)
 end
 
-function Base.convert(::Type{DFG.PackedFunctionNodeData{P}}, d::DFG.FunctionNodeData{<:FactorOperationalMemory}) where P <: PackedInferenceType
-  # mhstr = packmultihypo(d.fnc)  # this is where certainhypo error occurs
+function Base.convert(::Type{DFG.PackedFunctionNodeData{P}}, d::DFG.FunctionNodeData{<:FactorOperationalMemory}) where P <: PackedAbstractFactor
   return DFG.PackedFunctionNodeData(d.eliminated,
                                     d.potentialused,
                                     d.edgeIDs,
                                     convert(P, d.fnc.usrfnc!),
                                     d.multihypo,
                                     d.certainhypo,
                                     d.nullhypo,
-                                    d.solveInProgress)
+                                    d.solveInProgress,
+                                    d.inflation)
 end