Fixes

Author: GearsAD

src/entities/DFGFactor.jl

@@ -44,7 +44,7 @@ mutable struct DFGFactor{T, S} <: AbstractDFGFactor
     _internalId::Int64
     _variableOrderSymbols::Vector{Symbol}
     # TODO back to front ts and _internalId for legacy reasons
-    DFGFactor{T, S}(label::Symbol, _internalId::Int64=0, ts::DateTime=now()) where {T, S} = new{T, S}(label, Symbol[], GenericFunctionNodeData{T, S}(), 0, ts, 0, Symbol[])
+    DFGFactor{T, S}(label::Symbol, _internalId::Int64=0, timestamp::DateTime=now()) where {T, S} = new{T, S}(label, Symbol[], GenericFunctionNodeData{T, S}(), 0, timestamp, 0, Symbol[])
     # DFGFactor{T, S}(label::Symbol, _internalId::Int64) where {T, S} = new{T, S}(label, Symbol[], GenericFunctionNodeData{T, S}(), 0, now(), _internalId, Symbol[])
 end
 

src/services/DFGFactor.jl

@@ -8,6 +8,7 @@ function packFactor(dfg::G, f::DFGFactor)::Dict{String, Any} where G <: Abstract
     # Construct the properties to save
     props = Dict{String, Any}()
     props["label"] = string(f.label)
+    props["timestamp"] = string(f.timestamp)
     props["tags"] = JSON2.write(f.tags)
     # Pack the node data
     fnctype = f.data.fnc.usrfnc!
@@ -32,6 +33,7 @@ end
 
 function unpackFactor(dfg::G, packedProps::Dict{String, Any}, iifModule)::DFGFactor where G <: AbstractDFG
     label = packedProps["label"]
+    timestamp = DateTime(packedProps["timestamp"])
     tags = JSON2.read(packedProps["tags"], Vector{Symbol})
 
     data = packedProps["data"]
@@ -56,7 +58,7 @@ function unpackFactor(dfg::G, packedProps::Dict{String, Any}, iifModule)::DFGFac
     solvable = packedProps["solvable"]
 
     # Rebuild DFGVariable
-    factor = DFGFactor{typeof(fullFactor.fnc), Symbol}(Symbol(label))
+    factor = DFGFactor{typeof(fullFactor.fnc), Symbol}(Symbol(label), 0, timestamp)
     factor.tags = tags
     factor.data = fullFactor
     factor._variableOrderSymbols = _variableOrderSymbols

test/runtests.jl

@@ -17,44 +17,44 @@ using Dates
 # global_logger(logger)
 
 # Test each interface
-# apis = [
-#     GraphsDFG,
-#     DistributedFactorGraphs.SymbolDFG,
-#     LightDFG
-#     ]
-# for api in apis
-#     @testset "Testing Driver: $(api)" begin
-#         @info "Testing Driver: $(api)"
-#         global testDFGAPI = api
-#         include("interfaceTests.jl")
-#     end
-# end
-#
-# @testset "Deprecated Drivers Test" begin
-#     @test_throws UndefVarError SymbolDFG{NoSolverParams}()
-# end
-#
-# # Test special cases
-#
-# @testset "Plotting Tests" begin
-#     include("plottingTest.jl")
-# end
-#
-# @testset "Data Store Tests" begin
-#     include("DataStoreTests.jl")
-# end
-#
-#
-# @testset "LightDFG subtype tests" begin
-#     for type in [(var=DFGVariableSummary, fac=DFGFactorSummary), (var=SkeletonDFGVariable,fac=SkeletonDFGFactor)]
-#         @testset "$(type.var) and $(type.fac) tests" begin
-#             @info "Testing $(type.var) and $(type.fac)"
-#             global VARTYPE = type.var
-#             global FACTYPE = type.fac
-#             include("LightDFGSummaryTypes.jl")
-#         end
-#     end
-# end
+apis = [
+    GraphsDFG,
+    DistributedFactorGraphs.SymbolDFG,
+    LightDFG
+    ]
+for api in apis
+    @testset "Testing Driver: $(api)" begin
+        @info "Testing Driver: $(api)"
+        global testDFGAPI = api
+        include("interfaceTests.jl")
+    end
+end
+
+@testset "Deprecated Drivers Test" begin
+    @test_throws UndefVarError SymbolDFG{NoSolverParams}()
+end
+
+# Test special cases
+
+@testset "Plotting Tests" begin
+    include("plottingTest.jl")
+end
+
+@testset "Data Store Tests" begin
+    include("DataStoreTests.jl")
+end
+
+
+@testset "LightDFG subtype tests" begin
+    for type in [(var=DFGVariableSummary, fac=DFGFactorSummary), (var=SkeletonDFGVariable,fac=SkeletonDFGFactor)]
+        @testset "$(type.var) and $(type.fac) tests" begin
+            @info "Testing $(type.var) and $(type.fac)"
+            global VARTYPE = type.var
+            global FACTYPE = type.fac
+            include("LightDFGSummaryTypes.jl")
+        end
+    end
+end
 
 if get(ENV, "IIF_TEST", "") == "true"