Skip to content

Commit 9b5369a

Browse files
committed
remove approxConvCircular
1 parent 2e6530c commit 9b5369a

File tree

4 files changed

+44
-51
lines changed

4 files changed

+44
-51
lines changed

NEWS.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ The list below highlights major breaking changes, and please note that significa
2323
- Deprecate use of `getParametricMeasurement` and use `getMeasurementParametric` instead, and add `<:AbstractManifold` to API.
2424
- Deprecate use of `solveBinaryFactorParameteric`, instead use `solveFactorParameteric`.
2525
- Deprecating `approxConvBinary`, use `approxConvBelief` instead.
26-
- Deprecating `accumulateFactorChain`, use `approxConvBelief` instead.
27-
26+
- Removing obsolete `approxConvCircular`, use `approxConvBelief` instead.
2827

2928
# Major changes in v0.24
3029

src/AdditionalUtils.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

2-
export approxConvCircular
32

43
"""
54
$SIGNATURES

src/Deprecated.jl

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,49 @@ end
2626
##==============================================================================
2727

2828

29+
30+
# """
31+
# $SIGNATURES
32+
33+
# Build an approximate density `[Y|X,DX,.]=[X|Y,DX][DX|.]` as proposed by the conditional convolution.
34+
35+
# Notes
36+
# - Assume both are on circular manifold, `manikde!(pts, (:Circular,))`
37+
# """
38+
# function approxConvCircular(pX::ManifoldKernelDensity,
39+
# pDX::ManifoldKernelDensity; N::Int=100)
40+
# #
41+
42+
# # building basic factor graph
43+
# tfg = initfg()
44+
# addVariable!(tfg, :s1, Sphere1)
45+
# addVariable!(tfg, :s2, Sphere1)
46+
# addFactor!(tfg, [:s1;:s2], Sphere1Sphere1(pDX), graphinit=false)
47+
# initManual!(tfg,:s1, pX)
48+
49+
# # solve for outgoing proposal value
50+
# approxConv(tfg,:s1s2f1,:s2)
51+
# end
52+
53+
# function approxConvCircular(pX::ManifoldKernelDensity,
54+
# pDX::SamplableBelief; N::Int=100)
55+
# #
56+
# pts = reshape(rand(pDX, N), 1, :)
57+
# pC = manikde!(pts, Sphere1)
58+
# approxConvCircular(pX, pC)
59+
# end
60+
61+
62+
# function approxConvCircular(pX::SamplableBelief,
63+
# pDX::ManifoldKernelDensity; N::Int=100)
64+
# #
65+
# pts = reshape(rand(pX, N), 1, :)
66+
# pC = manikde!(pts, Sphere1)
67+
# approxConvCircular(pC, pDX)
68+
# end
69+
70+
71+
2972
@deprecate printGraphSummary(dfg::AbstractDFG, logger=ConsoleLogger()) show(logger.stream, MIME("text/plain"), dfg)
3073
@deprecate printSummary(dfg::AbstractDFG, logger=ConsoleLogger()) show(logger.stream, MIME("text/plain"), dfg)
3174

src/services/ApproxConv.jl

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -312,54 +312,6 @@ end
312312

313313

314314

315-
## ==========================================================================================
316-
## DEPRECATE / REFACTOR BELOW
317-
## ==========================================================================================
318-
319-
320-
321-
322-
"""
323-
$SIGNATURES
324-
325-
Build an approximate density `[Y|X,DX,.]=[X|Y,DX][DX|.]` as proposed by the conditional convolution.
326-
327-
Notes
328-
- Assume both are on circular manifold, `manikde!(pts, (:Circular,))`
329-
"""
330-
function approxConvCircular(pX::ManifoldKernelDensity,
331-
pDX::ManifoldKernelDensity; N::Int=100)
332-
#
333-
334-
# building basic factor graph
335-
tfg = initfg()
336-
addVariable!(tfg, :s1, Sphere1)
337-
addVariable!(tfg, :s2, Sphere1)
338-
addFactor!(tfg, [:s1;:s2], Sphere1Sphere1(pDX), graphinit=false)
339-
initManual!(tfg,:s1, pX)
340-
341-
# solve for outgoing proposal value
342-
approxConv(tfg,:s1s2f1,:s2)
343-
end
344-
345-
function approxConvCircular(pX::ManifoldKernelDensity,
346-
pDX::SamplableBelief; N::Int=100)
347-
#
348-
pts = reshape(rand(pDX, N), 1, :)
349-
pC = manikde!(pts, Sphere1)
350-
approxConvCircular(pX, pC)
351-
end
352-
353-
354-
function approxConvCircular(pX::SamplableBelief,
355-
pDX::ManifoldKernelDensity; N::Int=100)
356-
#
357-
pts = reshape(rand(pX, N), 1, :)
358-
pC = manikde!(pts, Sphere1)
359-
approxConvCircular(pC, pDX)
360-
end
361-
362-
363315

364316

365317
#

0 commit comments

Comments
 (0)