type unions on GenericFunctionNodeData

Author: Affie

src/entities/DFGFactor.jl

@@ -34,7 +34,7 @@ Designing (WIP)
 # in IIF.FunctorPairwiseMinimize <: InferenceType # DFG whatever, something, we'll figure it out
 # in Main/User, SomeFactor <: FunctorPairwiseMinimize
 """
-mutable struct GenericFunctionNodeData{T, S} #{T<:Union{PackedInferenceType, FunctorInferenceType, FactorOperationalMemory}, S<:Union{Symbol, AbstractString}}
+mutable struct GenericFunctionNodeData{T<:Union{PackedInferenceType, FunctorInferenceType, FactorOperationalMemory}, S<:Union{Symbol, AbstractString}}
     fncargvID::Vector{Symbol}
     eliminated::Bool
     potentialused::Bool

test/DataStoreTests.jl

@@ -8,7 +8,7 @@ dfg = LightDFG{NoSolverParams}()
 struct TestInferenceVariable1 <: InferenceVariable end
 v1 = DFGVariable(:a, TestInferenceVariable1())
 v2 = DFGVariable(:b, TestInferenceVariable1())
-f1 = DFGFactor{Int, :Symbol}(:f1)
+f1 = DFGFactor{TestFunctorInferenceType1, Symbol}(:f1)
 #add tags for filters
 union!(v1.tags, [:VARIABLE, :POSE])
 union!(v2.tags, [:VARIABLE, :LANDMARK])

test/compareTests.jl

@@ -42,9 +42,9 @@ v2.solvable = 0
 @test !(DFGVariable(:x1, TestSofttype1()) == DFGVariable(:x1, TestSofttype2()))
 
 # GenericFunctionNodeData
-gfnd1 = GenericFunctionNodeData([:a,:b], true, true, [1,2], :symbol, sin)
+gfnd1 = GenericFunctionNodeData([:a,:b], true, true, [1,2], :symbol, TestFunctorInferenceType1())
 gfnd2 = deepcopy(gfnd1)
-gfnd3 = GenericFunctionNodeData([:a,:b], true, true, [1,2], :symbol, cos)
+gfnd3 = GenericFunctionNodeData([:a,:b], true, true, [1,2], :symbol, TestFunctorInferenceType2())
 
 @test gfnd1 == gfnd2
 @test !(gfnd1 == gfnd3)
@@ -72,9 +72,9 @@ vnd2.val[1] = 0.1
 @test !compare(vnd1, vnd2)
 @test !compare(vnd1, vnd3)
 
-gfnd1 = GenericFunctionNodeData([:a,:b], true, true, [1,2], :symbol, sin)
+gfnd1 = GenericFunctionNodeData([:a,:b], true, true, [1,2], :symbol, TestFunctorInferenceType1())
 gfnd2 = deepcopy(gfnd1)
-gfnd3 = GenericFunctionNodeData([:a,:b], true, true, [1,2], :symbol, cos)
+gfnd3 = GenericFunctionNodeData([:a,:b], true, true, [1,2], :symbol, PackedTestFunctorInferenceType1())
 
 @test compare(gfnd1, gfnd2)
 @test_broken !(compare(gfnd1, gfnd3))

test/needsahomeTests.jl

@@ -10,7 +10,7 @@ struct TestInferenceVariable2 <: InferenceVariable end
     # Build a graph
     v1 = DFGVariable(:a, TestInferenceVariable1())
     v2 = DFGVariable(:b, TestInferenceVariable1())
-    f1 = DFGFactor{Int, :Symbol}(:f1)
+    f1 = DFGFactor{TestFunctorInferenceType1, Symbol}(:f1)
     addVariable!(dfg, v1)
     addVariable!(dfg, v2)
     addFactor!(dfg, [v1, v2], f1)

test/plottingTest.jl

@@ -10,7 +10,7 @@ numNodes = 10
 dfg = GraphsDFG{NoSolverParams}()
 verts = map(n -> DFGVariable(Symbol("x$n"), TestInferenceVariable1()), 1:numNodes)
 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))
+map(n -> addFactor!(dfg, [verts[n], verts[n+1]], DFGFactor{TestFunctorInferenceType1, Symbol}(Symbol("x$(n)x$(n+1)f1"))), 1:(numNodes-1))
 
 # Using GraphPlot plotting
 plot = dfgplot(dfg)

test/testBlocks.jl

@@ -61,7 +61,7 @@ struct TestCCW{T} <: FactorOperationalMemory where {T<:FunctorInferenceType}
 end
 Base.:(==)(a::TestCCW, b::TestCCW) = a.usrfnc! == b.usrfnc!
 
-DFG.getFactorOperationalMemoryType(par::NoSolverParams) = TestCCW 
+DFG.getFactorOperationalMemoryType(par::NoSolverParams) = TestCCW
 
 function Base.convert(::Type{DFG.FunctionNodeData{TestCCW{F}}},
                      d::DFG.PackedFunctionNodeData{<:PackedInferenceType}) where F<:FunctorInferenceType
@@ -1203,7 +1203,7 @@ function ProducingDotFiles(testDFGAPI,
         v2 = VARTYPE(:b, VariableNodeData{TestSofttype1}())
     end
     if f1 == nothing
-        f1 = (FACTYPE==DFGFactor) ? DFGFactor{Int, :Symbol}(:abf1) : FACTYPE(:abf1)
+        f1 = (FACTYPE==DFGFactor) ? DFGFactor{TestFunctorInferenceType1, Symbol}(:abf1) : FACTYPE(:abf1)
     end
 
     addVariable!(dotdfg, v1)