fix #375

Author: Affie

src/Deprecated.jl

@@ -38,12 +38,7 @@ Base.getproperty(x::DFGFactor,f::Symbol) = begin
   elseif f == :_internalId
       getfield(x,:_dfgNodeParams)._internalId
   elseif f == :data
-
-      if !(@isdefined getFactorDataWarnOnce)
-          @warn "get: data field is deprecated, use getSolverData. Further warnings are suppressed"
-          global getFactorDataWarnOnce = true
-      end
-
+      Base.depwarn("DFGFactor get: data field is deprecated, use getSolverData", :getproperty)
       getfield(x, :solverData)
   else
       getfield(x,f)
@@ -57,12 +52,7 @@ Base.setproperty!(x::DFGFactor,f::Symbol, val) = begin
     elseif f == :_internalId
         getfield(x,:_dfgNodeParams)._internalId = val
     elseif f == :data
-
-        if !(@isdefined setFactorDataWarnOnce)
-            @warn "set: data field is deprecated, use ...TODO? Further warnings are suppressed"
-            global setFactorDataWarnOnce = true
-        end
-
+        Base.depwarn("DFGFactor set: data field is deprecated, use getSolverData", :getproperty)
         setfield!(x,:solverData, val)
     else
         setfield!(x,f,val)

src/GraphsDFG/services/GraphsDFG.jl

@@ -121,7 +121,9 @@ function getVariable(dfg::GraphsDFG, label::Union{Symbol, String})::DFGVariable
     if !haskey(dfg.labelDict, label)
         error("Variable label '$(label)' does not exist in the factor graph")
     end
-    return dfg.g.vertices[dfg.labelDict[label]].dfgNode
+    node = dfg.g.vertices[dfg.labelDict[label]].dfgNode
+    !isa(node, AbstractDFGVariable) && error("Node with label '$(label)' is not a variable")
+    return node
 end
 
 function getFactor(dfg::GraphsDFG, factorId::Int64)::DFGFactor
@@ -140,7 +142,9 @@ function getFactor(dfg::GraphsDFG, label::Union{Symbol, String})::DFGFactor
     if !haskey(dfg.labelDict, label)
         error("Factor label '$(label)' does not exist in the factor graph")
     end
-    return dfg.g.vertices[dfg.labelDict[label]].dfgNode
+    node = dfg.g.vertices[dfg.labelDict[label]].dfgNode
+    !isa(node, AbstractDFGFactor) && error("Node with label '$(label)' is not a factor")
+    return node
 end
 
 function updateVariable!(dfg::GraphsDFG, variable::DFGVariable)::DFGVariable

test/testBlocks.jl

@@ -24,6 +24,9 @@ struct TestFunctorSingleton <: FunctorSingleton end
 struct TestFunctorPairwise <: FunctorPairwise end
 struct TestFunctorPairwiseMinimize <: FunctorPairwiseMinimize end
 
+struct PackedTestFunctorInferenceType1 end
+Base.convert(::Type{GenericFunctionNodeData{PackedTestFunctorInferenceType1,AbstractString}}, d) = d
+
 struct TestCCW{T} <: ConvolutionObject where {T<:FunctorInferenceType}
     usrfnc!::T
 end
@@ -338,7 +341,7 @@ function  VariablesandFactorsCRUD_SET!(fg, v1, v2, v3, f0, f1, f2)
     #deletions
     @test getVariable(fg, :c) === deleteVariable!(fg, v3)
     @test_throws ErrorException deleteVariable!(fg, v3)
-    @test setdiff(ls(fg),[:a,:b]) == []
+    @test issetequal(ls(fg),[:a,:b])
     @test getFactor(fg, :bcf1) === deleteFactor!(fg, f2)
     @test_throws ErrorException deleteFactor!(fg, f2)
     @test lsf(fg) == [:abf1]
@@ -356,14 +359,14 @@ function  VariablesandFactorsCRUD_SET!(fg, v1, v2, v3, f0, f1, f2)
         @test_logs (:warn, r"supported for type DFGVariable") getVariable(fg, :a, :missingfoo)
     end
 
-    @test getFactor(fg, :abf1) === f1
+    @test getFactor(fg, :abf1) == f1
 
     @test_throws ErrorException getVariable(fg, :c)
     @test_throws ErrorException getFactor(fg, :bcf1)
 
     #test issue #375
-    @test_skip @test_throws ErrorException getVariable(fg, :abf1)
-    @test_skip @test_throws ErrorException getFactor(fg, :a)
+    @test_throws ErrorException getVariable(fg, :abf1)
+    @test_throws ErrorException getFactor(fg, :a)
 
     # Existence
     @test exists(fg, :a)