Tests and export softtype,

fix depreciation

Author: Affie

src/Common.jl

@@ -129,7 +129,7 @@ function getfnctype(data::GenericFunctionNodeData)
   return data.fnc.usrfnc!
 end
 function getfnctype(fact::DFGFactor; solveKey::Symbol=:default)
-  data = getData(fact) # TODO , solveKey=solveKey)
+  data = solverData(fact) # TODO , solveKey=solveKey)
   return getfnctype(data)
 end
 function getfnctype(dfg::T, lbl::Symbol; solveKey::Symbol=:default) where T <: AbstractDFG
@@ -145,7 +145,7 @@ Notes
 - Replaces older `getfnctype`.
 """
 getFactorType(data::GenericFunctionNodeData) = data.fnc.usrfnc!
-getFactorType(fct::DFGFactor) = getFactorType(getData(fct))
+getFactorType(fct::DFGFactor) = getFactorType(solverData(fct))
 function getFactorType(dfg::G, lbl::Symbol) where G <: AbstractDFG
   getFactorType(getFactor(dfg, lbl))
 end
@@ -190,7 +190,7 @@ function getSofttype(vnd::VariableNodeData)
   return vnd.softtype
 end
 function getSofttype(v::DFGVariable; solveKey::Symbol=:default)
-  return getSofttype(getData(v, solveKey=solveKey))
+  return getSofttype(solverData(v, solveKey))
 end
 
 """

src/DistributedFactorGraphs.jl

@@ -21,7 +21,7 @@ export AbstractParams, NoSolverParams
 export DFGNode, DFGVariable, DFGFactor
 export InferenceType, PackedInferenceType, FunctorInferenceType, InferenceVariable, ConvolutionObject
 export FunctorSingleton, FunctorPairwise, FunctorPairwiseMinimize
-export label, timestamp, tags, estimates, estimate, data, solverData, getData, solverDataDict, setSolverData, internalId, smallData, bigData
+export label, timestamp, tags, estimates, estimate, data, softtype, solverData, getData, solverDataDict, setSolverData, internalId, smallData, bigData
 export DFGVariableSummary, DFGFactorSummary, AbstractDFGSummary
 
 # Services/AbstractDFG Exports

test/LightDFGSummaryTypes.jl

@@ -13,6 +13,9 @@ append!(v1.tags, [:VARIABLE, :POSE])
 append!(v2.tags, [:VARIABLE, :LANDMARK])
 append!(f1.tags, [:FACTOR])
 
+#Force softtypename
+v1.softtypename = :Pose2
+
 # @testset "Creating Graphs" begin
 global dfg,v1,v2,f1
 addVariable!(dfg, v1)
@@ -95,6 +98,7 @@ end
     @test timestamp(v1) == v1.timestamp
     @test estimates(v1) == v1.estimateDict
     @test estimate(v1, :notfound) == nothing
+    @test softtype(v1) == :Pose2
     # @test solverData(v1) === v1.solverDataDict[:default]
     # @test getData(v1) === v1.solverDataDict[:default]
     # @test solverData(v1, :default) === v1.solverDataDict[:default]

test/interfaceTests.jl

@@ -8,6 +8,12 @@ append!(v1.tags, [:VARIABLE, :POSE])
 append!(v2.tags, [:VARIABLE, :LANDMARK])
 append!(f1.tags, [:FACTOR])
 
+#add types for softtypes
+st1 = (a=1,b=2)
+st2 = (a=1.0,b=2.0)
+v1.solverDataDict[:default].softtype = deepcopy(st1)
+v2.solverDataDict[:default].softtype = deepcopy(st2)
+
 # @testset "Creating Graphs" begin
 global dfg,v1,v2,f1
 addVariable!(dfg, v1)
@@ -96,6 +102,10 @@ end
     @test solverDataDict(v1) == v1.solverDataDict
     @test internalId(v1) == v1._internalId
 
+    @test softtype(v1) == Symbol(typeof(st1))
+    @test softtype(v2) == Symbol(typeof(st2))
+    @test getSofttype(v1) == st1
+
     @test label(f1) == f1.label
     @test tags(f1) == f1.tags
     @test solverData(f1) == f1.data
@@ -210,6 +220,11 @@ verts = map(n -> DFGVariable(Symbol("x$n")), 1:numNodes)
 #change ready and backendset for x7,x8 for improved tests on x7x8f1
 verts[7].ready = 1
 verts[8].backendset = 1
+
+#force softytypes to first 2 vertices.
+verts[1].solverDataDict[:default].softtype = deepcopy(st1)
+verts[2].solverDataDict[:default].softtype = deepcopy(st2)
+
 map(v -> addVariable!(dfg, v), verts)
 map(n -> addFactor!(dfg, [verts[n], verts[n+1]], DFGFactor{Int, :Symbol}(Symbol("x$(n)x$(n+1)f1"))), 1:(numNodes-1))
 
@@ -286,7 +301,7 @@ end
             if field != :softtypename
                 @test getfield(getVariable(dfg, v), field) == getfield(getVariable(summaryGraph, v), field)
             else
-                @info "skipping softtypename check"
+                @test softtype(getVariable(dfg, v)) == softtype(getVariable(summaryGraph, v))
             end
         end
     end