Skip to content

Commit 87abfee

Browse files
authored
remove v0.6 deprecations (#324)
* remove v0.6 deprecations * export const DFG = DistributedFactorGraphs
1 parent 7b429cc commit 87abfee

File tree

5 files changed

+8
-41
lines changed

5 files changed

+8
-41
lines changed

src/Deprecated.jl

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,6 @@
22
# deprecation staging area
33
##==============================================================================
44

5-
#TODO look what should already be removed
6-
7-
##==============================================================================
8-
## Remove in 0.6.0 or 0.6.1?
9-
##==============================================================================
10-
11-
@deprecate getfnctype(args...) getFactorType(args...)
12-
13-
@deprecate getEstimate(v::VariableDataLevel1, key::Symbol=:default) getVariablePPE(v, key)
14-
15-
@deprecate estimate(v::VariableDataLevel1, key::Symbol=:default) getVariablePPE(v, key)
16-
17-
@deprecate getEstimates(v::VariableDataLevel1) getPPEDict(v)
18-
19-
@deprecate estimates(v::VariableDataLevel1) getPPEDict(v)
20-
21-
@deprecate softtype(v::VariableDataLevel1) getSofttype(v)
22-
23-
@deprecate label(v::DataLevel0) getLabel(v)
24-
25-
@deprecate tags(v::DataLevel0) getTags(v)
26-
27-
@deprecate getData(v::DFGVariable; solveKey::Symbol=:default) getSolverData(v, solveKey)
28-
29-
@deprecate setSolverData(v::DFGVariable, data::VariableNodeData, key::Symbol=:default) setSolverData!(v, data, key)
30-
31-
@deprecate data(f::DFGFactor) getSolverData(f)
32-
33-
34-
@deprecate getData(f::DFGFactor) getSolverData(f)
35-
36-
375
##==============================================================================
386
## Remove in 0.7
397
##==============================================================================
@@ -190,3 +158,7 @@ function buildSubgraphFromLabels(dfg::G,
190158
end
191159

192160
@deprecate sortVarNested(vars::Vector{Symbol}) sortDFG(vars)
161+
162+
163+
#NOTE This one is still used in IIF so maybe leave a bit longer
164+
@deprecate getfnctype(args...) getFactorType(args...)

src/DistributedFactorGraphs.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ using SparseArrays
3030
##==============================================================================
3131
# Exports
3232
##==============================================================================
33-
33+
const DFG = DistributedFactorGraphs
34+
export DFG
3435
##------------------------------------------------------------------------------
3536
## DFG
3637
##------------------------------------------------------------------------------

src/services/DFGFactor.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Return `::Bool` on whether given factor `fc::Symbol` is a prior in factor graph
139139
"""
140140
function isPrior(dfg::G, fc::Symbol)::Bool where G <: AbstractDFG
141141
fco = getFactor(dfg, fc)
142-
getfnctype(fco) isa FunctorSingleton
142+
getFactorType(fco) isa FunctorSingleton
143143
end
144144

145145

test/iifInterfaceTests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ end
189189
@test getVariablePPEs(v1) == v1.ppeDict
190190
@test_throws Exception DistributedFactorGraphs.getVariablePPE(v1, :notfound)
191191
@test solverData(v1) === v1.solverDataDict[:default]
192-
@test getData(v1) === v1.solverDataDict[:default]
192+
@test getSolverData(v1) === v1.solverDataDict[:default]
193193
@test solverData(v1, :default) === v1.solverDataDict[:default]
194194
@test getSolverDataDict(v1) == v1.solverDataDict
195195
@test getInternalId(v1) == v1._internalId

test/testBlocks.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,8 @@ function DFGVariableSCA()
217217
#no accessors on BigData, only CRUD
218218

219219
#deprecated
220-
@test @test_deprecated getData(v1) === v1.solverDataDict[:default]
221220
@test @test_deprecated solverData(v1, :default) === v1.solverDataDict[:default]
222221

223-
#what TODO
224-
# @test_deprecated setSolverData()
225-
# setSolverData!()
226222

227223
# #TODO sort out
228224
# getPPEs
@@ -302,7 +298,6 @@ function DFGFactorSCA()
302298

303299
# Deprecated functions
304300
@test @test_deprecated solverData(f1) === f1.solverData
305-
@test @test_deprecated getData(f1) === f1.data
306301

307302
# create f0 here for a later timestamp
308303
f0 = DFGFactor(:af1, [:a], gfnd_prior, tags = Set([:PRIOR]))
@@ -591,7 +586,6 @@ function VSDTestBlock!(fg, v1)
591586

592587
#FIXME copied from lower
593588
@test getSolverData(v1) === v1.solverDataDict[:default]
594-
@test @test_logs (:warn, r"[Dd]eprecate") getData(v1) === v1.solverDataDict[:default]
595589
@test @test_logs (:warn, r"[Dd]eprecate") solverData(v1, :default) === v1.solverDataDict[:default]
596590

597591
# Add new VND of type ContinuousScalar to :x0

0 commit comments

Comments
 (0)