Smalldata update

Author: GearsAD

src/entities/DFGVariable.jl

@@ -217,6 +217,8 @@ getEstimateFields(::MeanMaxPPE) = [:suggested, :max, :mean]
 ## DFG Variables
 ##==============================================================================
 
+const SmallDataType = Union{Int, Float64, String, Bool, Vector{Int}, Vector{Float64}, Vector{String}, Vector{Bool}}
+
 ##------------------------------------------------------------------------------
 ## DFGVariable lv2
 ##------------------------------------------------------------------------------
@@ -248,7 +250,7 @@ struct DFGVariable{T<:InferenceVariable} <: AbstractDFGVariable
     solverDataDict::Dict{Symbol, VariableNodeData{T}}
     """Dictionary of small data associated with this variable.
     Accessors: [`getSmallData`](@ref), [`setSmallData!`](@ref)"""
-    smallData::Dict{String, String}#Ref{Dict{String, String}} #why was Ref here?
+    smallData::Dict{String, SmallDataType}
     """Dictionary of large data associated with this variable.
     Accessors: [`addDataEntry!`](@ref), [`getDataEntry`](@ref), [`updateDataEntry!`](@ref), and [`deleteDataEntry!`](@ref)"""
     dataDict::Dict{Symbol, AbstractDataEntry}
@@ -270,7 +272,7 @@ function DFGVariable(label::Symbol, softtype::T;
             tags::Set{Symbol}=Set{Symbol}(),
             estimateDict::Dict{Symbol, <: AbstractPointParametricEst}=Dict{Symbol, MeanMaxPPE}(),
             solverDataDict::Dict{Symbol, VariableNodeData{T}}=Dict{Symbol, VariableNodeData{T}}(),
-            smallData::Dict{String, String}=Dict{String, String}(),
+            smallData::Dict{String, SmallDataType}=Dict{String, SmallDataType}(),
             dataDict::Dict{Symbol, AbstractDataEntry}=Dict{Symbol,AbstractDataEntry}(),
             solvable::Int=1) where {T <: InferenceVariable}
 
@@ -287,7 +289,7 @@ function DFGVariable(label::Symbol,
             nstime::Nanosecond = Nanosecond(0),
             tags::Set{Symbol}=Set{Symbol}(),
             estimateDict::Dict{Symbol, <: AbstractPointParametricEst}=Dict{Symbol, MeanMaxPPE}(),
-            smallData::Dict{String, String}=Dict{String, String}(),
+            smallData::Dict{String, SmallDataType}=Dict{String, SmallDataType}(),
             dataDict::Dict{Symbol, AbstractDataEntry}=Dict{Symbol,AbstractDataEntry}(),
             solvable::Int=1) where {T <: InferenceVariable}
     if timestamp isa DateTime

src/services/DFGVariable.jl

@@ -273,14 +273,14 @@ setSolverData!(v::DFGVariable, data::VariableNodeData, key::Symbol=:default) = v
     $(SIGNATURES)
 Get the small data for a variable.
 """
-getSmallData(v::DFGVariable)::Dict{String, String} = v.smallData
+getSmallData(v::DFGVariable)::Dict{String, SmallDataType} = v.smallData
 
 """
     $(SIGNATURES)
 Set the small data for a variable.
 This will overwrite old smallData.
 """
-function setSmallData!(v::DFGVariable, smallData::Dict{String, String})::Dict{String, String}
+function setSmallData!(v::DFGVariable, smallData::Dict{String, SmallDataType})
     empty!(v.smallData)
     merge!(v.smallData, smallData)
 end

src/services/Serialization.jl

@@ -39,7 +39,7 @@ function unpackVariable(dfg::G,
         tags = Symbol.(packedProps["tags"])
     end
     ppeDict = unpackPPEs ? JSON2.read(packedProps["ppeDict"], Dict{Symbol, MeanMaxPPE}) : Dict{Symbol, MeanMaxPPE}()
-    smallData = JSON2.read(packedProps["smallData"], Dict{String, String})
+    smallData = JSON2.read(packedProps["smallData"], Dict{String, SmallDataType})
 
     softtypeString = packedProps["softtype"]
     softtype = getTypeFromSerializationModule(dfg, Symbol(softtypeString))