WIP, just need to fix comparator

Author: GearsAD

src/CommonAccessors.jl

@@ -5,7 +5,7 @@
 export getLabel, label
 export getTags, setTags!, tags
 export getTimestamp, setTimestamp!, timestamp
-export getInternalId, interalId
+export getInternalId, internalId
 
 
 const DataLevel0 = Union{VariableDataLevel0, FactorDataLevel0}
@@ -50,15 +50,18 @@ DEPRECATED, tags -> getTags
 """
 function tags(v::DataLevel0)
   @warn "tags deprecated, use getTags instead"
-  getTags
+  getTags(v)
 end
 
 """
 $SIGNATURES
 
 Set the tags for a factor.
 """
-setTags!(f::DataLevel0, tags::Vector{Symbol}) = f.tags = tags
+function setTags!(f::DataLevel0, tags::Vector{Symbol})
+  resize!(f.tags, length(tags))
+  f.tags .= tags
+end
 
 
 """

src/entities/DFGVariable.jl

@@ -248,22 +248,21 @@ end
 """
     $SIGNATURES
 
-Retrieve the soft type name symbol for a DFGVariable or DFGVariableSummary. ie :Point2, Pose2, etc.
-
+Retrieve the soft type name symbol for a DFGVariableSummary. ie :Point2, Pose2, etc.
 TODO, DO NOT USE v.softtypename in DFGVariableSummary
 """
-getSofttype(v::DFGVariableSummary) = v.softtypename
+getSofttype(v::DFGVariableSummary)::Symbol = v.softtypename
 
 
 
 """
 $SIGNATURES
 
-Return the softtype name for a variable.
+Return the softtype for a variable.
 
 DEPRECATED, softtype -> getSofttype
 """
-function softtype(v::VariableDataLevel1)::Symbol
+function softtype(v::VariableDataLevel1)
     @warn "Deprecated softtype, use getSofttype instead."
     getSofttype(v)
 end

test/iifInterfaceTests.jl

@@ -160,9 +160,9 @@ end
     @test solverDataDict(v1) == v1.solverDataDict
     @test internalId(v1) == v1._internalId
 
-    @test softtype(v1) == :ContinuousScalar#Symbol(typeof(st1))
-    @test softtype(v2) == :ContinuousScalar#Symbol(typeof(st2))
-    @test typeof(getSofttype(v1)) == typeof(ContinuousScalar())
+    @test typeof(softtype(v1)) == ContinuousScalar
+    @test typeof(softtype(v2)) == ContinuousScalar
+    @test typeof(getSofttype(v1)) == ContinuousScalar
 
     @test label(f1) == f1.label
     @test tags(f1) == f1.tags
@@ -441,9 +441,10 @@ end
     for v in ls(summaryGraph)
         for field in variableFields
             if field != :softtypename
-            @test getfield(getVariable(dfg, v), field) == getfield(getVariable(summaryGraph, v), field)
+                @test getfield(getVariable(dfg, v), field) == getfield(getVariable(summaryGraph, v), field)
             else
-                @test softtype(getVariable(dfg, v)) == softtype(getVariable(summaryGraph, v))
+                # Special case to check the symbol softtype is equal to the full softtype.
+                @test Symbol(typeof(softtype(getVariable(dfg, v)))) == softtype(getVariable(summaryGraph, v))
         end
     end
     end

test/interfaceTests.jl

@@ -161,8 +161,8 @@ end
     @test solverDataDict(v1) == v1.solverDataDict
     @test internalId(v1) == v1._internalId
 
-    @test softtype(v1) == Symbol(typeof(st1))
-    @test softtype(v2) == Symbol(typeof(st2))
+    @test softtype(v1) == st1
+    @test softtype(v2) == st2
     @test getSofttype(v1) == st1
 
     @test label(f1) == f1.label
@@ -446,7 +446,8 @@ end
             if field != :softtypename
                 @test getfield(getVariable(dfg, v), field) == getfield(getVariable(summaryGraph, v), field)
             else
-                @test softtype(getVariable(dfg, v)) == softtype(getVariable(summaryGraph, v))
+                # Special case to check the symbol softtype is equal to the full softtype.
+                @test Symbol(typeof(softtype(getVariable(dfg, v)))) == softtype(getVariable(summaryGraph, v))
             end
         end
     end

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"