Skip to content

Commit 7de8985

Browse files
committed
depr predictbelief for propagateBelief
1 parent 6a76249 commit 7de8985

File tree

4 files changed

+50
-29
lines changed

4 files changed

+50
-29
lines changed

src/Deprecated.jl

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,49 @@ end
123123
## Deprecate code below before v0.35
124124
##==============================================================================
125125

126+
126127
@deprecate _prepCCW(w...;kw...) _createCCW(w...;kw...)
128+
@deprecate predictbelief(w...;asPartial::Bool=false,kw...) ((bel,ipc)=getPoints(propagateBelief(w...;asPartial,kw...)), (getPoints(bel),ipc))
129+
130+
# """
131+
# $SIGNATURES
132+
133+
# This is an old function name that will be replaced by [`propagateBelief`](@ref).
134+
# """
135+
# function predictbelief(
136+
# dfg::AbstractDFG,
137+
# destvert::DFGVariable,
138+
# factors::AbstractVector; #{<:DFGFactor};
139+
# asPartial::Bool = false,
140+
# kw...,
141+
# )
142+
# #
143+
# # new
144+
# mkd, ifd = propagateBelief(dfg, destvert, factors; kw...)
145+
146+
# # legacy interface
147+
# return getPoints(mkd, asPartial), ifd
148+
# end
149+
150+
# function predictbelief(
151+
# dfg::AbstractDFG,
152+
# destlbl::Symbol,
153+
# fctlbls::AbstractVector{Symbol};
154+
# kw...,
155+
# )
156+
# return predictbelief(
157+
# dfg,
158+
# getVariable(dfg, destlbl),
159+
# map(x -> getFactor(dfg, x), fctlbls);
160+
# kw...,
161+
# )
162+
# end
163+
# #
164+
165+
# function predictbelief(dfg::AbstractDFG, destlbl::Symbol, ::Colon; kw...)
166+
# return predictbelief(dfg, destlbl, getNeighbors(dfg, destlbl); kw...)
167+
# end
168+
#
127169

128170
##==============================================================================
129171
## Deprecate code below before v0.34

src/ExportAPI.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ export CSMHistory,
240240
getCliqNumAssocFactorsPerVar,
241241

242242
# user functions
243-
predictbelief,
244243
propagateBelief,
245244
getCliqMat,
246245
getCliqAssocMat,

src/services/GraphInit.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,14 @@ end
363363
function initVariable!(
364364
dfg::AbstractDFG,
365365
label::Symbol,
366-
usefcts::Vector{Symbol},
366+
usefcts::AbstractVector{Symbol},
367367
solveKey::Symbol = :default;
368368
N::Int = getSolverParams(dfg).N,
369369
kwargs...,
370370
)
371371
#
372-
pts = predictbelief(dfg, label, usefcts; solveKey = solveKey)[1]
372+
pts = propagateBelief(dfg, label, usefcts; solveKey = solveKey)[1]
373+
# pts = predictbelief(dfg, label, usefcts; solveKey = solveKey)[1]
373374
vert = getVariable(dfg, label)
374375
Xpre = manikde!(getManifold(getVariableType(vert)), pts)
375376
return initVariable!(vert, Xpre, solveKey; N, kwargs...)

src/services/GraphProductOperations.jl

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,33 +59,13 @@ function propagateBelief(
5959
return mkd, ipc
6060
end
6161

62-
"""
63-
$SIGNATURES
64-
65-
This is an old function name that will be replaced by [`propagateBelief`](@ref).
66-
"""
67-
function predictbelief(
68-
dfg::AbstractDFG,
69-
destvert::DFGVariable,
70-
factors::AbstractVector; #{<:DFGFactor};
71-
asPartial::Bool = false,
72-
kw...,
73-
)
74-
#
75-
# new
76-
mkd, ifd = propagateBelief(dfg, destvert, factors; kw...)
77-
78-
# legacy interface
79-
return getPoints(mkd, asPartial), ifd
80-
end
81-
82-
function predictbelief(
62+
function propagateBelief(
8363
dfg::AbstractDFG,
8464
destlbl::Symbol,
8565
fctlbls::AbstractVector{Symbol};
8666
kw...,
8767
)
88-
return predictbelief(
68+
return propagateBelief(
8969
dfg,
9070
getVariable(dfg, destlbl),
9171
map(x -> getFactor(dfg, x), fctlbls);
@@ -94,10 +74,9 @@ function predictbelief(
9474
end
9575
#
9676

97-
function predictbelief(dfg::AbstractDFG, destlbl::Symbol, ::Colon; kw...)
98-
return predictbelief(dfg, destlbl, getNeighbors(dfg, destlbl); kw...)
99-
end
100-
#
77+
propagateBelief(dfg::AbstractDFG, destlbl::Symbol, ::Colon; kw...) = return propagateBelief(dfg, destlbl, getNeighbors(dfg, destlbl); kw...)
78+
79+
10180

10281
"""
10382
$(SIGNATURES)

0 commit comments

Comments
 (0)