Skip to content

Commit 89cb345

Browse files
authored
Merge pull request #1818 from JuliaRobotics/master
release v0.35.3-rc1
2 parents 04ce264 + 2652b2e commit 89cb345

15 files changed

+29
-26
lines changed

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The list below highlights breaking changes according to normal semver workflow -
2424
- Restore `DifferentialEquation.jl` factor `DERelative` functionality and tests that were suppressed in a previous upgrade (#1774, #1777).
2525
- Restore previously suppressed tests (#1781, #1721, #1780)
2626
- Improve DERelative factor on-manifold operations (#1775, #1802, #1803).
27+
- Fixed a typo via deprecation, `solveFactorParametric` replaces `solveFactorParameteric`.
2728

2829
# Changes in v0.34
2930

@@ -110,7 +111,7 @@ The list below highlights breaking changes according to normal semver workflow -
110111
- Upstream `calcHelix_T` canonical generator utility from RoME.jl.
111112
- Deserialization of factors with DFG needs new API and change of solverData and CCW type in factor.
112113
- Deprecate use of `getParametricMeasurement` and use `getMeasurementParametric` instead, and add `<:AbstractManifold` to API.
113-
- Deprecate use of `solveBinaryFactorParameteric`, instead use `solveFactorParameteric`.
114+
- Deprecate use of `solveBinaryFactorParameteric`, instead use `solveFactorParametric`.
114115
- Deprecating `approxConvBinary`, use `approxConvBelief` instead.
115116
- Removing obsolete `approxConvCircular`, use `approxConvBelief` instead.
116117
- `getSample` should return a single sample and no longer takes the N(number of samples) parameter.

Project.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name = "IncrementalInference"
22
uuid = "904591bb-b899-562f-9e6f-b8df64c7d480"
33
keywords = ["MM-iSAMv2", "Bayes tree", "junction tree", "Bayes network", "variable elimination", "graphical models", "SLAM", "inference", "sum-product", "belief-propagation"]
44
desc = "Implements the Multimodal-iSAMv2 algorithm."
5-
version = "0.35.2"
5+
version = "0.35.3"
66

77
[deps]
88
ApproxManifoldProducts = "9bbbb610-88a1-53cd-9763-118ce10c1f89"
@@ -78,8 +78,9 @@ FiniteDifferences = "0.12"
7878
FunctionalStateMachine = "0.2.9"
7979
JSON3 = "1"
8080
KernelDensityEstimate = "0.5.6"
81+
LinearAlgebra = "1.10"
8182
ManifoldDiff = "0.3"
82-
Manifolds = "0.9"
83+
Manifolds = "0.9.12"
8384
ManifoldsBase = "0.15"
8485
Manopt = "0.4.40"
8586
MetaGraphs = "0.7"
@@ -91,12 +92,12 @@ RecursiveArrayTools = "2.31.1, 3"
9192
Reexport = "1"
9293
SparseDiffTools = "2"
9394
StaticArrays = "1"
94-
Statistics = "1"
95+
Statistics = "1.10"
9596
StatsBase = "0.32, 0.33, 0.34"
9697
StructTypes = "1"
9798
TensorCast = "0.3.3, 0.4"
9899
TimeZones = "1.3.1"
99-
julia = "1.9"
100+
julia = "1.10"
100101

101102
[extras]
102103
AMD = "14f7f29c-3bd6-536c-9a0b-7339e30b5a3e"

src/Deprecated.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ end
123123
## Deprecate code below before v0.37
124124
##==============================================================================
125125

126+
@deprecate solveFactorParameteric(w...;kw...) solveFactorParametric(w...;kw...)
126127

127128
##==============================================================================
128129
## Deprecate code below before v0.36

src/ExportAPI.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ export approxDeconvBelief
344344
export cont2disc
345345
export rebaseFactorVariable!
346346
export accumulateFactorMeans
347-
export solveFactorParameteric
347+
export solveFactorParametric
348348

349349
export repeatCSMStep!
350350
export attachCSM!

src/parametric/services/ConsolidateParametricRelatives.jl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ DevNotes
1616
- TODO ensure type stability, likely returning types `Any` at this time.
1717
- TODO MeanMaxPPE currently stored as coordinates, complicating fast calculation.
1818
19-
Related:
20-
21-
[`getMeasurementParametric`](@ref), [`approxConv`](@ref), [`MutablePose2Pose2Gaussian`](@ref)
19+
Related: [`getMeasurementParametric`](@ref), [`approxConvBelief`](@ref), [`MutablePose2Pose2Gaussian`](@ref)
2220
"""
23-
function solveFactorParameteric(
21+
function solveFactorParametric(
2422
dfg::AbstractDFG,
2523
fct::DFGFactor,
2624
# currval::P1,

src/parametric/services/ParametricManopt.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,11 @@ function autoinitParametric!(
562562
end
563563

564564

565-
##
565+
"""
566+
$SIGNATURES
567+
568+
Batch parametric graph solve using Riemannian Levenberg Marquardt.
569+
"""
566570
solveGraphParametric(args...; kwargs...) = solve_RLM(args...; kwargs...)
567571

568572
function DFG.solveGraphParametric!(

src/parametric/services/ParametricUtils.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Notes
5252
- Originally written just for Lie Groups to support legacy, but future needs may well alter the design.
5353
- Original design driven by parametric solve and dead reckon tethering.
5454
55-
See also: [`accumulateFactorMeans`](@ref), [`solveFactorParameteric`](@ref)
55+
See also: [`accumulateFactorMeans`](@ref), [`solveFactorParametric`](@ref)
5656
"""
5757
function getMeasurementParametric end
5858

@@ -648,7 +648,7 @@ DevNotes
648648
- WIP
649649
- Relates to: https://github.com/JuliaRobotics/IncrementalInference.jl/issues/466#issuecomment-562556953
650650
- Consolidation
651-
- Definitely with [`solveFactorParameteric`](@ref)
651+
- Definitely with [`solveFactorParametric`](@ref)
652652
- Maybe with [`solveGraphParametric`](@ref)
653653
- https://github.com/JuliaRobotics/IncrementalInference.jl/pull/1588#issuecomment-1210406683
654654
"""

src/services/ApproxConv.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ DevNotes
7070
7171
Related
7272
73-
[`approxDeconv`](@ref), `LocalDFG.findShortestPathDijkstra`, [`evalFactor`](@ref)
73+
[`approxDeconv`](@ref), `findShortestPathDijkstra`
7474
"""
7575
function approxConvBelief(
7676
dfg::AbstractDFG,

src/services/CalcFactor.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ residual = calcFactorResidual(fg, :x1x2f1, [1.0], [0.0], [0.0])
118118
119119
Related
120120
121-
[`calcFactorResidualTemporary`](@ref), [`_evalFactorTemporary!`](@ref), [`evalFactor`](@ref), [`approxConv`](@ref)
121+
[`calcFactorResidualTemporary`](@ref), [`_evalFactorTemporary!`](@ref), [`approxConvBelief`](@ref)
122122
"""
123123
function calcFactorResidual(
124124
dfgfct::DFGFactor,
@@ -147,7 +147,7 @@ residual = calcFactorResidualTemporary(Pose2Pose2(...), (RoME.Pose2,RoME.Pose2),
147147
148148
Related
149149
150-
[`calcFactorResidual`](@ref), [`CalcResidual`](@ref), [`_evalFactorTemporary!`](@ref), [`approxConv`](@ref), [`_buildGraphByFactorAndTypes!`](@ref)
150+
[`calcFactorResidual`](@ref), [`CalcResidual`](@ref), [`_evalFactorTemporary!`](@ref), [`approxConvBelief`](@ref), [`_buildGraphByFactorAndTypes!`](@ref)
151151
"""
152152
function calcFactorResidualTemporary(
153153
fct::AbstractRelative,

src/services/DeconvUtils.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ Generalized deconvolution to find the predicted measurement values of the factor
168168
Inverse solve of predicted noise value and returns tuple of (newly predicted, and known "measured" noise) values.
169169
170170
Notes
171-
- Opposite operation contained in `approxConv`.
171+
- Opposite operation contained in `approxConvBelief`.
172172
- For more notes see [`solveFactorMeasurements`](@ref).
173173
174174
Related
175175
176-
[`approxConv`](@ref), `deconvSolveKey`
176+
[`approxConvBelief`](@ref), `deconvSolveKey`
177177
"""
178178
function approxDeconv(
179179
dfg::AbstractDFG,

src/services/EvalFactor.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -620,9 +620,7 @@ B = _evalFactorTemporary!(EuclidDistance, (ContinuousScalar, ContinuousScalar),
620620
# should return `B = 10`
621621
```
622622
623-
Related
624-
625-
[`evalFactor`](@ref), [`calcFactorResidual`](@ref), [`testFactorResidualBinary`](@ref), [`solveFactorParameteric`](@ref), [`approxConvBelief`](@ref)
623+
See also: [`calcFactorResidual`](@ref), [`testFactorResidualBinary`](@ref), [`solveFactorParametric`](@ref), [`approxConvBelief`](@ref)
626624
"""
627625
function _evalFactorTemporary!(
628626
fct::AbstractFactor,

src/services/FGOSUtils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ DevNotes
232232
233233
Related
234234
235-
[`getVariablePPE`](@ref), [`setVariablePosteriorEstimates!`](@ref), [`getVariablePPE!`](@ref), [`setPPE!`](@ref)
235+
[`getPPE`](@ref), [`setPPE!`](@ref), [`getVariablePPE`](@ref)
236236
"""
237237
function calcPPE(
238238
var::DFGVariable,

src/services/GraphProductOperations.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Notes
1111
1212
Related
1313
14-
[`approxConv`](@ref), [`proposalbeliefs!`](@ref), [`AMP.manifoldProduct`](@ref)
14+
[`approxConvBelief`](@ref), [`proposalbeliefs!`](@ref), [`AMP.manifoldProduct`](@ref)
1515
"""
1616
function propagateBelief(
1717
dfg::AbstractDFG,

src/services/SolverUtilities.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Notes
203203
- This function does not add new variables or factors to `fg`, user must do that themselves after.
204204
- Useful to use in combination with `setPPE!` on new variable.
205205
- At time of writing `accumulateFactorMeans` could only incorporate priors or binary relative factors.
206-
- internal info, see [`solveFactorParameteric`](@ref),
206+
- internal info, see [`solveFactorParametric`](@ref),
207207
- This means at time of writing `factor` must be a binary factor.
208208
- Tip, if simulations are inducing odometry bias, think of using two factors from caller (e.g. simPerfect and simBias).
209209

src/services/TetherUtils.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ DevNotes
114114
115115
Related:
116116
117-
[`approxConv`](@ref), [`solveFactorParameteric`](@ref), `RoME.MutablePose2Pose2Gaussian`
117+
[`approxConvBelief`](@ref), [`solveFactorParametric`](@ref), `RoME.MutablePose2Pose2Gaussian`
118118
"""
119119
function accumulateFactorMeans(
120120
dfg::AbstractDFG,
@@ -150,7 +150,7 @@ function accumulateFactorMeans(
150150
# first find direction of solve
151151
vars = getVariableOrder(fct)
152152
trgsym = setdiff(vars, [srcsym])[1]
153-
val = solveFactorParameteric(dfg, fct, [srcsym => val;], trgsym; solveKey)
153+
val = solveFactorParametric(dfg, fct, [srcsym => val;], trgsym; solveKey)
154154
srcsym = trgsym
155155
end
156156

0 commit comments

Comments
 (0)