Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compat DFG 25 AMP 9 #759

Merged
merged 10 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:

- name: Run tests on Upstream Dev
run: |
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="IncrementalInference",rev="master"));'
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="IncrementalInference",rev="develop"));'
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="ApproxManifoldProducts",rev="master"));'
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(name="DistributedFactorGraphs",rev="master"));'
julia --project=@. --check-bounds=yes -e 'using Pkg; Pkg.test("RoME"; coverage=false)'
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ RoMEFluxExt = "Flux"
RoMEImageIOExt = "ImageIO"

[compat]
ApproxManifoldProducts = "0.8.5, 0.9"
ApproxManifoldProducts = "0.9"
CameraModels = "0.2"
CoordinateTransformations = "0.5, 0.6"
Dates = "1.10"
DelimitedFiles = "1"
DifferentialEquations = "7"
Distributed = "1.10"
DistributedFactorGraphs = "0.23, 0.24, 0.25"
DistributedFactorGraphs = "0.25"
Distributions = "0.24, 0.25"
DocStringExtensions = "0.8, 0.9"
FileIO = "1"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Please don't hesitate to open issues or suggestions in line with [JuliaRobotics
[rjl-cov-img]: https://codecov.io/github/JuliaRobotics/RoME.jl/coverage.svg?branch=master
[rjl-cov-url]: https://codecov.io/github/JuliaRobotics/RoME.jl?branch=master
[rjl-ci-dev-img]: https://github.com/JuliaRobotics/RoME.jl/actions/workflows/ci.yml/badge.svg
[rjl-ci-dev-url]: https://github.com/JuliaRobotics/RoME.jl/actions/workflows/ci.yml
[rjl-ci-dev-url]: https://github.com/JuliaRobotics/RoME.jl/actions/workflows/ci.yml?query=branch%3Amaster
[rjl-ver-img]: https://juliahub.com/docs/RoME/version.svg
[rjl-milestones]: https://github.com/JuliaRobotics/RoME.jl/milestones
[rjl-releases]: https://github.com/JuliaRobotics/RoME.jl/releases
Expand Down
2 changes: 1 addition & 1 deletion src/factors/Inertial/IMUDeltaFactor.jl
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ function (cf::CalcFactor{<:IMUDeltaFactor})(
Xhat = log_lie(M, Manifolds.compose(M, inv(M, Δi), Δhat))

Xc_hat = vee(M, Xhat)
@assert isapprox(Δi.x[4], Δhat.x[4], atol=1e-6) "Time descrepancy in IMUDeltaFactor: Δt = $(Xc_hat[10])"
@assert isapprox(Δi.x[4], Δhat.x[4], atol=1e-6) "Time descrepancy in IMUDeltaFactor: Δt = $(Xc_hat[10]), $(Δi.x[4]), $(Δhat.x[4])"
# should not include Δt only 1:9
return Xc_hat[SOneTo(9)]
end
Expand Down
4 changes: 2 additions & 2 deletions test/inertial/testIMUDeltaFactor.jl
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ a_b = SA[0.,0,0]
fg = initfg()
fg.solverParams.graphinit = false

timestamps = collect(range(0; step=dt+1e-7, length=N+1))
timestamps = collect(range(0; step=dt, length=N+1))
foreach(enumerate(Nanosecond.(round.(Int, timestamps[[1,end]] * 10^9)))) do (i, nanosecondtime)
addVariable!(fg, Symbol("x",i-1), RotVelPos; nanosecondtime)
end
Expand Down Expand Up @@ -333,4 +333,4 @@ R,v,r = uniform_integrate_check(gyros, accels, dt)
# test covariance propagation for IMU preintegration at
# - zero accel and rate
# - zero accel and constant rate,
# - zero rate and constant accel,
# - zero rate and constant accel,
11 changes: 10 additions & 1 deletion test/inertial/testInertialDynamic.jl
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ fac = RoME.InertialDynamic(
## build a basic factor graph

fg = initfg()
getSolverParams(fg).N = 50

addVariable!(fg, :w_P0, RotVelPos; timestamp = tst)
addVariable!(fg, :w_P1, RotVelPos; timestamp = tsp)
Expand Down Expand Up @@ -64,13 +65,21 @@ f1 = addFactor!(fg, [:w_P0; :w_P1], fac; graphinit=false)
doautoinit!(fg, :w_P0)
@test isInitialized(fg, :w_P0)

##

# flb = getLabel(f1)
# sampleFactor(fg, flb, 50)

##

try
P1 = approxConvBelief(fg, getLabel(f1), :w_P1)
catch
@error "FIXME first approxConv on InertialDynamic failed!"
@test_broken false
end

P1 = approxConvBelief(fg, getLabel(f1), :w_P1)
# P1 = approxConvBelief(fg, getLabel(f1), :w_P1)



Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ testfiles = [

# dev test first, for faster issues.
# Inertial
"inertial/testInertialDynamic.jl";
"inertial/testODE_INS.jl";
"inertial/testIMUDeltaFactor.jl";
"inertial/testInertialDynamic.jl";

# ...
# "testFluxModelsPose2.jl";
Expand Down
Binary file modified test/testdata/g2otest.tar.gz
Binary file not shown.
Loading