Merge pull request #562 from JuliaRobotics/bugfix/20Q3/fix#558

Fix add- update- VariableSolverData and PPE deprecation

Author: Affie

src/Deprecated.jl

@@ -57,6 +57,23 @@ const AbstractBigDataEntry = AbstractDataEntry
 ##==============================================================================
 ## Remove in 0.11
 ##==============================================================================
+
+@deprecate addVariableSolverData!(dfg::AbstractDFG, variablekey::Symbol, vnd::VariableNodeData, solverKey::Symbol) addVariableSolverData!(dfg, variablekey, vnd)
+
+@deprecate updateVariableSolverData!(dfg::AbstractDFG,
+                                     variablekey::Symbol,
+                                     vnd::VariableNodeData,
+                                     solverKey::Symbol,
+                                     useCopy::Bool=true,
+                                     fields::Vector{Symbol}=Symbol[],
+                                     verbose::Bool=true  ) updateVariableSolverData!(dfg, variablekey, vnd, useCopy, fields, verbose)
+
+
+@deprecate updatePPE!(dfg::AbstractDFG, variablekey::Symbol, ppe::AbstractPointParametricEst, ppekey::Symbol) updatePPE!(dfg, variablekey, ppe)
+
+@deprecate addPPE!(dfg::AbstractDFG, variablekey::Symbol, ppe::AbstractPointParametricEst, ppekey::Symbol) addPPE!(dfg, variablekey, ppe)
+
+
 export AbstractDataStore
 abstract type AbstractDataStore end
 struct GeneralDataEntry <: AbstractDataEntry end

src/services/DFGVariable.jl

@@ -339,15 +339,6 @@ function getVariableSolverData(dfg::AbstractDFG, variablekey::Symbol, solvekey::
 end
 
 
-"""
-    $(SIGNATURES)
-Deprecated: Add variable solver data, errors if it already exists.
-"""
-function addVariableSolverData!(dfg::AbstractDFG, variablekey::Symbol, vnd::VariableNodeData, solverKey::Symbol=:default)::VariableNodeData
-    @warn "This function is deprecated and will be removed in the next version, please use addVariableSolverData!(dfg::AbstractDFG, variablekey::Symbol, vnd::VariableNodeData)"
-    return addVariableSolverData!(dfg, variablekey, vnd)
-end
-
 """
     $(SIGNATURES)
 Add variable solver data, errors if it already exists.
@@ -369,28 +360,6 @@ NOTE: Copies the solver data.
 addVariableSolverData!(dfg::AbstractDFG, sourceVariable::DFGVariable, solverKey::Symbol=:default) =
     addVariableSolverData!(dfg, sourceVariable.label, deepcopy(getSolverData(sourceVariable, solverKey)))
 
-"""
-    $(SIGNATURES)
-Update variable solver data if it exists, otherwise add it.
-
-Notes:
-- `useCopy=true` to copy solver data and keep separate memory.
-- Use `fields` to updated only a few VND.fields while adhering to `useCopy`.
-
-Related
-
-mergeVariableSolverData!
-"""
-function updateVariableSolverData!(dfg::AbstractDFG,
-                                   variablekey::Symbol,
-                                   vnd::VariableNodeData,
-                                   solverKey::Symbol=:default,
-                                   useCopy::Bool=true,
-                                   fields::Vector{Symbol}=Symbol[],
-                                   verbose::Bool=true  )
-    @warn "This function is deprecated, please use updateVariableSolverData!(dfg::AbstractDFG, variablekey::Symbol, vnd::VariableNodeData, solverKey::Symbol=:default, useCopy::Bool=true, fields::Vector{Symbol}=Symbol, verbose::Bool=true)"
-    return updateVariableSolverData!(dfg, variablekey, vnd, useCopy, fields, verbose)
-end
 
 """
     $(SIGNATURES)
@@ -553,15 +522,6 @@ end
 # Not the most efficient call but it at least reuses above (in memory it's probably ok)
 getPPE(dfg::AbstractDFG, sourceVariable::VariableDataLevel1, ppekey::Symbol=default)::AbstractPointParametricEst = getPPE(dfg, sourceVariable.label, ppekey)
 
-"""
-    $(SIGNATURES)
-Add variable PPE, errors if it already exists.
-"""
-function addPPE!(dfg::AbstractDFG, variablekey::Symbol, ppe::P, ppekey::Symbol=:default)::AbstractPointParametricEst where P <: AbstractPointParametricEst
-    @warn("This function is deprecated, please call addPPE!(dfg::AbstractDFG, variablekey::Symbol, ppe::P)")
-    return addPPE!(dfg, variablekey, ppe)
-end
-
 """
     $(SIGNATURES)
 Add variable PPE, errors if it already exists.
@@ -583,14 +543,6 @@ NOTE: Copies the PPE.
 addPPE!(dfg::AbstractDFG, sourceVariable::DFGVariable, ppekey::Symbol=:default) =
     addPPE!(dfg, sourceVariable.label, deepcopy(getPPE(sourceVariable, ppekey)))
 
-"""
-    $(SIGNATURES)
-Update PPE data if it exists, otherwise add it -- one call per `key::Symbol=:default`.
-"""
-function updatePPE!(dfg::AbstractDFG, variablekey::Symbol, ppe::P, ppekey::Symbol=:default)::P where P <: AbstractPointParametricEst
-    @warn("This function is deprecated, please call updatePPE!(dfg::AbstractDFG, variablekey::Symbol, ppe::P)")
-    return updatePPE!(dfg, variablekey, ppe)
-end
 
 """
     $(SIGNATURES)