Skip to content

Commit

Permalink
Merge pull request #349 from JuliaRobotics/maint/4Q20/iif017
Browse files Browse the repository at this point in the history
fix deprecations
  • Loading branch information
dehann committed Oct 29, 2020
2 parents 2fa5bb9 + 7d69a5c commit 19f69db
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Distributions = "0.20, 0.21, 0.22, 0.23, 0.24"
DocStringExtensions = "0.7, 0.8, 0.9, 0.10, 1"
FileIO = "1.0.2, 1.1, 1.2"
Graphs = "0.10.2, 0.11, 1"
IncrementalInference = "0.15, 0.16, 0.17"
IncrementalInference = "0.16, 0.17"
JLD2 = "0.1, 0.2, 0.3, 1.0"
KernelDensityEstimate = "0.5.1, 0.6"
Optim = "0.19, 0.20, 0.21, 0.22, 1.0"
Expand Down
4 changes: 2 additions & 2 deletions test/testDidsonFunctions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ccw.cpt[1].res = zeros(1)

@time for n in 1:N
ccw.cpt[Threads.threadid()].particleidx = n
numericRootGenericRandomizedFnc!( ccw ) #fr
numericSolutionCCW!( ccw ) #fr
end


Expand Down Expand Up @@ -75,7 +75,7 @@ ccw.cpt[1].res = zeros(1)

@time for n in 1:N
ccw.cpt[Threads.nthreads()].particleidx = n
numericRootGenericRandomizedFnc!( ccw )
numericSolutionCCW!( ccw )
end


Expand Down
2 changes: 1 addition & 1 deletion test/testhigherdimroots.jl
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ global n = 1
for n in 1:N

ccw.cpt[Threads.threadid()].particleidx = n
numericRootGenericRandomizedFnc!( ccw )
numericSolutionCCW!( ccw )

# test the result
global qq = convert(Quaternion, Euler(eul[:,ccw.cpt[Threads.threadid()].particleidx]...))
Expand Down
2 changes: 2 additions & 0 deletions test/testpartialpose3.jl
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ end
global estmu1mean = Statistics.mean(val[collect(DFG.getSolverData(f1).fnc.usrfnc!.partial),:],dims=2)
global estmu2mean = Statistics.mean(val[collect(DFG.getSolverData(f2).fnc.usrfnc!.partial),:],dims=2)

@show estmu1mean
@show estmu2mean
@test sum(abs.(estmu1mean - mu1[[3;1;2]]) .< [0.7; 0.1; 0.1]) == 3
@test sum(abs.(estmu2mean - mu2) .< [0.7; 0.7; 0.15] ) == 3

Expand Down

0 comments on commit 19f69db

Please sign in to comment.