update deprecations

Author: dehann

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -978,7 +978,7 @@ end
 
 export SkeletonDFG
 function SkeletonDFG(cfg::CloudGraphsDFG)
-    sfg = DefaultDFG{NoSolverParams, SkeletonDFGVariable, SkeletonDFGFactor}()
+    sfg = LocalDFG{NoSolverParams, SkeletonDFGVariable, SkeletonDFGFactor}()
     addVariable!.(sfg, _getSkeletonVariables(cfg))
     addFactor!.(sfg, _getSkeletonFactors(cfg))
     return sfg

src/Deprecated.jl

@@ -1,131 +1,14 @@
-##==============================================================================
-# deprecation staging area
-##==============================================================================
-##==============================================================================
-## Deprecated in v0.9 Remove in the v0.10 cycle
-##==============================================================================
-
-@deprecate listSolvekeys(x...) listSolveKeys(x...)
-
-##==============================================================================
-## Deprecated in v0.10 Remove in 0.11
-##==============================================================================
-
-@deprecate getMaxPPE(est::AbstractPointParametricEst) getPPEMax(est)
-@deprecate getMeanPPE(est::AbstractPointParametricEst) getPPEMean(est)
-@deprecate getSuggestedPPE(est::AbstractPointParametricEst) getPPESuggested(est)
-
-@deprecate addVariableSolverData!(dfg::AbstractDFG, variablekey::Symbol, vnd::VariableNodeData, solveKey::Symbol) addVariableSolverData!(dfg, variablekey, vnd)
-
-@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
-GeneralDataEntry(args...; kwargs...) = error("`GeneralDataEntry` is deprecated, use `BlobStoreEntry`")
-
-export InMemoryDataStore, FileDataStore
-
-struct FileDataStore <: AbstractDataStore end
-FileDataStore(args...; kwargs...) = error("`FileDataStore` is deprecated, use `FolderStore`")
-
-struct InMemoryDataStore <: AbstractDataStore end
-InMemoryDataStore(args...; kwargs...) = error("`InMemoryDataStore` is deprecated, use TBD")#TODO
-
-_uniqueKey(dfg::AbstractDFG, v::AbstractDFGVariable, key::Symbol)::Symbol = error("_uniqueKey is deprecated")
-
-getDataBlob(store::AbstractDataStore, entry::AbstractDataEntry) = error("AbstractDataStore $(typeof(store)) is deprecated.")
-addDataBlob!(store::AbstractDataStore, entry::AbstractDataEntry, data) = error("AbstractDataStore $(typeof(store)) is deprecated.")
-updateDataBlob!(store::AbstractDataStore, entry::AbstractDataEntry, data)  = error("AbstractDataStore $(typeof(store)) is deprecated.")
-deleteDataBlob!(store::AbstractDataStore, entry::AbstractDataEntry) = error("AbstractDataStore $(typeof(store)) is deprecated.")
-listDataBlobs(store::AbstractDataStore) = error("AbstractDataStore $(typeof(store)) is deprecated.")
-
-
-addData!(dfg::AbstractDFG,
-         lbl::Symbol,
-         datastore::Union{FileDataStore, InMemoryDataStore},
-         descr::Symbol,
-         mimeType::AbstractString,
-         data::Vector{UInt8} ) = error("This API, FileDataStore and in MemoryDataStore is deprecated use new api parameter order and FolderStore")
-
-export addDataElement!
-addDataElement!(dfg::AbstractDFG,
-                lbl::Symbol,
-                datastore::Union{FileDataStore, InMemoryDataStore},
-                descr::Symbol,
-                mimeType::AbstractString,
-                data::Vector{UInt8} ) = error("This API, FileDataStore and in MemoryDataStore is deprecated use addData! and FolderStore")
-
-
-
-export getDataEntryBlob
-getDataEntryBlob(dfg::AbstractDFG,
-                 dfglabel::Symbol,
-                 datastore::Union{FileDataStore, InMemoryDataStore},
-                 datalabel::Symbol) = error("This API, FileDataStore and in MemoryDataStore is deprecated use getData and FolderStore")
-
-export fetchDataEntryElement
-const fetchDataEntryElement = getDataEntryBlob
-export fetchData
-const fetchData = getDataEntryBlob
-
-#
-
-## softtype deprections
-function Base.getproperty(x::InferenceVariable, f::Symbol)
-  if f==:dims
-      Base.depwarn("varType $(typeof(x)), field dims is deprecated, extend and use `getDimension` instead",:getproperty)
-  elseif f==:manifolds
-      Base.depwarn("varType $(typeof(x)), field manifolds is deprecated, extend and use `getManifold` instead",:getproperty)
-  else
-    if !(@isdefined softtypeFieldsWarnOnce)
-      Base.depwarn("varType $(typeof(x)), will be required to be a singleton type in the future and can no longer have fields. *.$f called. Further warnings are suppressed",:getproperty)
-      global softtypeFieldsWarnOnce = true
-    end
-  end
-  return getfield(x,f)
-end
-
-
-
-# SmallData is now a Symbol Dict
-function createSymbolDict(d::Dict{String, String})
-  newsmalld = Dict{Symbol,SmallDataTypes}() 
-  for p in pairs(d)
-    push!(newsmalld, Symbol(p.first) => p.second)
-  end
-  return newsmalld
-end
+## ================================================================================
+## LEGACY ON TIMESTAMPS, TODO DEPRECATE
+##=================================================================================
 
-@deprecate setSmallData!(v::DFGVariable, smallData::Dict{String, String}) setSmallData!(v, createSymbolDict(smallData)) 
-
-#update deprecation with warn_if_absent
-function updateVariableSolverData!(dfg::AbstractDFG,
-                                   variablekey::Symbol,
-                                   vnd::VariableNodeData,
-                                   useCopy::Bool,
-                                   fields::Vector{Symbol},
-                                   verbose::Bool)
-  Base.depwarn("updateVariableSolverData! argument verbose is deprecated in favor of keyword argument `warn_if_absent`, see #643", :updateVariableSolverData!)
-  updateVariableSolverData!(dfg, variablekey, vnd, useCopy, fields; warn_if_absent = verbose)
-end
 
-function updateVariableSolverData!(dfg::AbstractDFG,
-                                   variablekey::Symbol,
-                                   vnd::VariableNodeData,
-                                   solveKey::Symbol,
-                                   useCopy::Bool,
-                                   fields::Vector{Symbol},
-                                   verbose::Bool)
-  Base.depwarn("updateVariableSolverData! argument verbose is deprecated in favor of keyword argument `warn_if_absent`, see #643", :updateVariableSolverData!)
-  updateVariableSolverData!(dfg, variablekey, vnd, solveKey, useCopy, fields; warn_if_absent = verbose)
+Base.promote_rule(::Type{DateTime}, ::Type{ZonedDateTime}) = DateTime
+function Base.convert(::Type{DateTime}, ts::ZonedDateTime)
+    @warn "DFG now uses ZonedDateTime, temporary promoting and converting to DateTime local time"
+    return DateTime(ts, Local)
 end
 
-
-
 ## ================================================================================
 ## Deprecate before v0.17
 ##=================================================================================
@@ -205,10 +88,12 @@ end
 const FunctorInferenceType = AbstractFactor       # will eventually deprecate
 const PackedInferenceType = AbstractPackedFactor  # will eventually deprecate
 
-Base.promote_rule(::Type{DateTime}, ::Type{ZonedDateTime}) = DateTime
-function Base.convert(::Type{DateTime}, ts::ZonedDateTime)
-    @warn "DFG now uses ZonedDateTime, temporary promoting and converting to DateTime local time"
-    return DateTime(ts, Local)
-end
+## ================================================================================
+## Deprecate before v0.20
+##=================================================================================
+
+export DefaultDFG
+
+const DefaultDFG = LightDFG
 
 #

src/DistributedFactorGraphs.jl

@@ -72,7 +72,7 @@ export updateUserData!, updateRobotData!, updateSessionData!, deleteUserData!, d
 export emptyUserData!, emptyRobotData!, emptySessionData!
 
 # Graph Types: exported from modules or @reexport
-export InMemoryDFGTypes, DefaultDFG
+export InMemoryDFGTypes, LocalDFG
 
 # AbstractDFG Interface
 export exists,
@@ -297,9 +297,10 @@ include("GraphsDFG/GraphsDFG.jl")
 
 include("LightDFG/LightDFG.jl")
 @reexport using .LightDFGs
+
 #supported in Memory fg types
 const InMemoryDFGTypes = Union{GraphsDFG, LightDFG}
-const DefaultDFG = LightDFG
+const LocalDFG = GraphsDFG
 
 # Common includes
 include("services/CommonAccessors.jl")

src/services/AbstractDFG.jl

@@ -1198,7 +1198,7 @@ function buildSubgraph(dfg::AbstractDFG,
                        variableFactorLabels::Vector{Symbol},
                        distance::Int=0;
                        kwargs...)
-    return buildSubgraph(DefaultDFG, dfg, variableFactorLabels, distance; kwargs...)
+    return buildSubgraph(LocalDFG, dfg, variableFactorLabels, distance; kwargs...)
 end
 
 """

src/services/DFGVariable.jl

@@ -812,6 +812,9 @@ addPPE!(dfg::AbstractDFG, sourceVariable::DFGVariable, ppekey::Symbol=:default)
 """
     $(SIGNATURES)
 Update PPE data if it exists, otherwise add it -- one call per `key::Symbol=:default`.
+
+Notes
+- uses `ppe.solveKey` as solveKey.
 """
 function updatePPE!(dfg::AbstractDFG, variablekey::Symbol, ppe::AbstractPointParametricEst; warn_if_absent::Bool=true)
     var = getVariable(dfg, variablekey)

test/testBlocks.jl

@@ -642,9 +642,9 @@ function  PPETestBlock!(fg, v1)
     # Delete it
     @test deletePPE!(fg, :a, :default) == ppe
     # Update add it
-    updatePPE!(fg, :a, ppe, :default)
+    updatePPE!(fg, :a, ppe) #, :default)
     # Update update it
-    updatePPE!(fg, :a, ppe, :default)
+    updatePPE!(fg, :a, ppe) #, :default)
 
     v1.ppeDict[:default] = deepcopy(ppe)
     # Bulk copy PPE's for x0 and x1