more FileDFG tests

Author: Affie

src/DistributedFactorGraphs.jl

@@ -212,7 +212,7 @@ export setSerializationModule!, getSerializationModule
 export packVariable, unpackVariable, packFactor, unpackFactor
 
 # File import and export
-export saveDFG, loadDFG
+export saveDFG, loadDFG!
 export toDot, toDotFile
 
 # Comparisons

test/consolInterfaceDev.jl

@@ -207,6 +207,29 @@ end
     CopyFunctionsTest(testDFGAPI)
 
 end
+
+@testset "Copy Functions" begin
+
+    filename = "/tmp/fileDFG"
+
+    dfg, vars, facs = connectivityTestGraph(testDFGAPI)
+
+    saveDFG(dfg, filename)
+
+    copyDfg = DistributedFactorGraphs._getDuplicatedEmptyDFG(dfg)
+
+    @info "Going to load $filename"
+
+    loadDFG!(copyDfg, filename)
+
+    for var in vars
+        @test getVariable(dfg, var.label) == getVariable(copyDfg, var.label)
+    end
+    for fac in facs
+        @test getFactor(dfg, fac.label) == getFactor(copyDfg, fac.label)
+        # @test getFactor(dfg, fac.label) == fac
+    end
+end
 #
 #=
 fg = fg1

test/fileDFGTests.jl

@@ -35,11 +35,19 @@ using Test
 
         facts = map(n -> addFactor!(dfg, [verts[n], verts[n+1]], LinearConditional(Normal(50.0,2.0))), 1:(numNodes-1))
 
+        #FIXME a lot of these makes test fail
+        # facts[4].solverData.solveInProgress = 1
+        # facts[4].solverData.multihypo = [1, 0.1, 0.9]
+        # facts[4].solverData.eliminated = true
+        # facts[4].solverData.potentialused = true
+        # updateFactor!(dfg, facts[4])
         # Save and load the graph to test.
         saveDFG(dfg, filename)
 
         copyDfg = DistributedFactorGraphs._getDuplicatedEmptyDFG(dfg)
         @info "Going to load $filename"
+
+        #FIXME loadDFG!(copyDfg, filename), but use this to test deprecation
         retDFG = loadDFG(filename, Main, copyDfg) #, loaddir="/tmp")
 
         @test issetequal(ls(dfg), ls(retDFG))

test/testBlocks.jl

@@ -1004,7 +1004,7 @@ function connectivityTestGraph(::Type{T}; VARTYPE=DFGVariable, FACTYPE=DFGFactor
         setSolvable!(dfg, :x8, 0)
         setSolvable!(dfg, :x9, 0)
 
-        gfnd = GenericFunctionNodeData(false, false, Int[], TestCCW(TestFunctorInferenceType1()))
+        gfnd = GenericFunctionNodeData(true, true, Int[], TestCCW(TestFunctorInferenceType1()), Float64[], Int[], 1)
         f_tags = Set([:FACTOR])
         # f1 = DFGFactor(f1_lbl, [:a,:b], gfnd, tags = f_tags)