remove many dep warnings

Author: dehann

src/BigData/entities/AbstractBigDataEntries.jl

@@ -17,7 +17,7 @@ Internal function to generate a unique key for the entry - userId_robotId_sessio
 Simple symbol.
 """
 function _uniqueKey(dfg::G, v::V, key::Symbol)::Symbol where {G <: AbstractDFG, V <: AbstractDFGVariable}
-    key = join(String.([dfg.userId, dfg.robotId, dfg.sessionId, label(v), String(key)]), "_")
+    key = join(String.([dfg.userId, dfg.robotId, dfg.sessionId, getLabel(v), String(key)]), "_")
     return Symbol(key)
 end
 

src/CommonAccessors.jl

@@ -20,18 +20,6 @@ Return the label for a variable or factor.
 """
 getLabel(v::DataLevel0) = v.label
 
-"""
-$SIGNATURES
-
-Return the label for a variable or factor.
-
-DEPRECATED label -> getLabel
-"""
-function label(v::DataLevel0)
-  @warn "Deprecated label, use getLabel instead."
-  getLabel(v)
-end
-
 
 """
 $SIGNATURES
@@ -41,18 +29,6 @@ Return the tags for a variable.
 getTags(v::DataLevel0) = v.tags
 
 
-"""
-$SIGNATURES
-
-Return the tags for a variable.
-
-DEPRECATED, tags -> getTags
-"""
-function tags(v::DataLevel0)
-  @warn "tags deprecated, use getTags instead"
-  getTags(v)
-end
-
 """
 $SIGNATURES
 

src/Deprecated.jl

@@ -72,3 +72,62 @@ function softtype(v::VariableDataLevel1)
     @warn "Deprecated softtype, use getSofttype instead."
     getSofttype(v)
 end
+
+
+"""
+$SIGNATURES
+
+Return the label for a variable or factor.
+
+DEPRECATED label -> getLabel
+"""
+function label(v::DataLevel0)
+  @warn "Deprecated label, use getLabel instead."
+  getLabel(v)
+end
+
+
+"""
+$SIGNATURES
+
+Return the tags for a variable.
+
+DEPRECATED, tags -> getTags
+"""
+function tags(v::DataLevel0)
+  @warn "tags deprecated, use getTags instead"
+  getTags(v)
+end
+
+
+"""
+    $SIGNATURES
+
+Retrieve data structure stored in a variable.
+"""
+function getData(v::DFGVariable; solveKey::Symbol=:default)::VariableNodeData
+  @warn "getData is deprecated, please use solverData()"
+  return v.solverDataDict[solveKey]
+end
+
+
+"""
+    $SIGNATURES
+
+Set solver data structure stored in a variable.
+"""
+function setSolverData(v::DFGVariable, data::VariableNodeData, key::Symbol=:default)
+    @warn "Deprecated setSolverData, use setSolverData! instead."
+    setSolverData!(v, data, key)
+end
+
+
+"""
+    $SIGNATURES
+
+Retrieve solver data structure stored in a factor.
+"""
+function data(f::DFGFactor)::GenericFunctionNodeData
+  @warn "data() is deprecated, please use solverData()"
+  return f.data
+end

src/DistributedFactorGraphs.jl

@@ -15,7 +15,6 @@ include("entities/AbstractDFG.jl")
 include("entities/DFGFactor.jl")
 include("entities/DFGVariable.jl")
 include("entities/AbstractDFGSummary.jl")
-include("Deprecated.jl")
 
 export AbstractDFG
 export AbstractParams, NoSolverParams
@@ -81,6 +80,7 @@ include("services/AbstractDFG.jl")
 include("services/DFGVariable.jl")
 include("services/DFGFactor.jl")
 include("CommonAccessors.jl")
+include("Deprecated.jl")
 include("services/CompareUtils.jl")
 
 # Include the Graphs.jl API.

src/entities/DFGFactor.jl

@@ -103,15 +103,7 @@ Retrieve solver data structure stored in a factor.
 function solverData(f::F) where F <: DFGFactor
   return f.data
 end
-"""
-    $SIGNATURES
 
-Retrieve solver data structure stored in a factor.
-"""
-function data(f::DFGFactor)::GenericFunctionNodeData
-  @warn "data() is deprecated, please use solverData()"
-  return f.data
-end
 """
     $SIGNATURES
 

src/entities/DFGVariable.jl

@@ -282,27 +282,14 @@ getSofttype(v::DFGVariableSummary)::Symbol = v.softtypename
 Retrieve solver data structure stored in a variable.
 """
 solverData(v::DFGVariable, key::Symbol=:default) = haskey(v.solverDataDict, key) ? v.solverDataDict[key] : nothing
-"""
-    $SIGNATURES
 
-Retrieve data structure stored in a variable.
-"""
-function getData(v::DFGVariable; solveKey::Symbol=:default)::VariableNodeData
-  @warn "getData is deprecated, please use solverData()"
-  return v.solverDataDict[solveKey]
-end
-"""
-    $SIGNATURES
 
-Set solver data structure stored in a variable.
-"""
-setSolverData(v::DFGVariable, data::VariableNodeData, key::Symbol=:default) = v.solverDataDict[key] = data
 """
     $SIGNATURES
 
 Set solver data structure stored in a variable.
 """
-setSolverData!(v::DFGVariable, data::VariableNodeData, key::Symbol=:default) = setSolverData(v, data, key)
+setSolverData!(v::DFGVariable, data::VariableNodeData, key::Symbol=:default) = v.solverDataDict[key] = data
 
 """
     $SIGNATURES

test/iifInterfaceTests.jl

@@ -149,26 +149,29 @@ end
     @test updateFactor!(dfg, f1Prime) == getFactor(dfg, f1.label)
 
     # Accessors
-    @test label(v1) == v1.label
-    @test tags(v1) == v1.tags
+    @test getLabel(v1) == v1.label
+    @test getTags(v1) == v1.tags
     @test getTimestamp(v1) == v1.timestamp
-    @test getVariablePPE(v1) == v1.estimateDict
-    @test DistributedFactorGraphs.estimate(v1, :notfound) == nothing
+    @test getVariablePPEs(v1) == v1.ppeDict
+    @test DistributedFactorGraphs.getVariablePPE(v1, :notfound) == nothing
     @test solverData(v1) === v1.solverDataDict[:default]
     @test getData(v1) === v1.solverDataDict[:default]
     @test solverData(v1, :default) === v1.solverDataDict[:default]
     @test solverDataDict(v1) == v1.solverDataDict
     @test internalId(v1) == v1._internalId
+    # legacy compat test
+    @test getVariablePPE(v1) == v1.estimateDict
+
 
-    @test typeof(softtype(v1)) == ContinuousScalar
-    @test typeof(softtype(v2)) == ContinuousScalar
+    @test typeof(getSofttype(v1)) == ContinuousScalar
+    @test typeof(getSofttype(v2)) == ContinuousScalar
     @test typeof(getSofttype(v1)) == ContinuousScalar
 
-    @test label(f1) == f1.label
-    @test tags(f1) == f1.tags
+    @test getLabel(f1) == f1.label
+    @test getTags(f1) == f1.tags
     @test solverData(f1) == f1.data
     # Deprecated functions
-    @test data(f1) == f1.data
+    @test solverData(f1) == f1.data
     @test getData(f1) == f1.data
     # Internal function
     @test internalId(f1) == f1._internalId
@@ -444,7 +447,7 @@ end
                 @test getfield(getVariable(dfg, v), field) == getfield(getVariable(summaryGraph, v), field)
             else
                 # Special case to check the symbol softtype is equal to the full softtype.
-                @test Symbol(typeof(softtype(getVariable(dfg, v)))) == softtype(getVariable(summaryGraph, v))
+                @test Symbol(typeof(getSofttype(getVariable(dfg, v)))) == getSofttype(getVariable(summaryGraph, v))
         end
     end
     end

test/interfaceTests.jl

@@ -137,11 +137,11 @@ end
     f1 = getFactor(dfg, f1.label)
 
     # Accessors
-    @test label(v1) == v1.label
-    @test tags(v1) == v1.tags
+    @test getLabel(v1) == v1.label
+    @test getTags(v1) == v1.tags
     testTags = [:ha, :ha23]
     @test setTags!(v1, testTags) == testTags
-    @test tags(v1) == testTags
+    @test getTags(v1) == testTags
 
     @test getTimestamp(v1) == v1.timestamp
     testTimestamp = now()
@@ -153,26 +153,26 @@ end
     @test setTimestamp!(f1, testTimestamp) == testTimestamp
     @test getTimestamp(f1) == f1.timestamp
 
-    @test getVariablePPEs(v1) == v1.estimateDict
+    @test getVariablePPEs(v1) == v1.ppeDict
     @test getVariablePPE(v1, :notfound) == nothing
     @test solverData(v1) === v1.solverDataDict[:default]
     @test getData(v1) === v1.solverDataDict[:default]
     @test solverData(v1, :default) === v1.solverDataDict[:default]
     @test solverDataDict(v1) == v1.solverDataDict
     @test internalId(v1) == v1._internalId
 
-    @test softtype(v1) == st1
-    @test softtype(v2) == st2
+    @test getSofttype(v1) == st1
+    @test getSofttype(v2) == st2
     @test getSofttype(v1) == st1
 
-    @test label(f1) == f1.label
-    @test tags(f1) == f1.tags
+    @test getLabel(f1) == f1.label
+    @test getTags(f1) == f1.tags
     @test setTags!(v1, testTags) == testTags
-    @test tags(v1) == testTags
+    @test getTags(v1) == testTags
 
     @test solverData(f1) == f1.data
     # Deprecated functions
-    @test data(f1) == f1.data
+    @test solverData(f1) == f1.data
     @test getData(f1) == f1.data
     # Internal function
     @test internalId(f1) == f1._internalId
@@ -447,7 +447,7 @@ end
                 @test getfield(getVariable(dfg, v), field) == getfield(getVariable(summaryGraph, v), field)
             else
                 # Special case to check the symbol softtype is equal to the full softtype.
-                @test Symbol(typeof(softtype(getVariable(dfg, v)))) == softtype(getVariable(summaryGraph, v))
+                @test Symbol(typeof(getSofttype(getVariable(dfg, v)))) == getSofttype(getVariable(summaryGraph, v))
             end
         end
     end