Skip to content

Commit bb689ff

Browse files
authored
Merge pull request #1771 from JuliaRobotics/23Q3/fix/setValpartial
fix hms test
2 parents 9e320bc + bf60845 commit bb689ff

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ The list below highlights breaking changes according to normal semver workflow -
1818
- Standardization improvements surrounding weakdeps code extensions.
1919
- Code quality improvements along wiht refactoring and reorganizing of file names and locations.
2020
- Restoring `DERelative` factors, although further fixes necessary beyond anticipated patch release v0.34.1.
21+
- Switching to weakdep AMD.jl for `ccolmod` dependency, part of Julia 1.10 upgrade. Dropping `SuiteSparse_long` dependency. Further fixes necessary to restore full user constrained tree variable order functionality.
2122

2223
# Changes in v0.33
2324

src/services/FactorGraph.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ function setValKDE!(
283283
end
284284

285285
function setBelief!(vari::DFGVariable, bel::ManifoldKernelDensity, setinit::Bool=true,ipc::AbstractVector{<:Real}=[0.0;])
286-
setValKDE!(vari,getPoints(bel),setinit, ipc)
286+
setValKDE!(vari,getPoints(bel, false),setinit, ipc)
287287
end
288288

289289
"""

test/testSpecialEuclidean2Mani.jl

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ end
331331

332332
@testset "test propagateBelief w HeatmapSampler and init for PartialPriorPassThrough w Priors" begin
333333
##
334-
@test_broken begin
334+
335335
fg = initfg()
336336

337337
v0 = addVariable!(fg, :x0, SpecialEuclidean2)
@@ -390,8 +390,8 @@ doautoinit!(fg, :x0)
390390
@test length(getPoints(getBelief(fg, :x0))) == getSolverParams(fg).N # 120
391391
# @info "PassThrough transfers the full point count to the graph, unless a product is calculated during the propagateBelief step."
392392

393-
394-
393+
##
394+
# @test_broken begin
395395
## check the partials magic
396396

397397
dens, ipc = propagateBelief(fg,:x0,:)
@@ -438,13 +438,13 @@ solveGraph!(fg);
438438
## check saveDFG (check consistency of packing converters above)
439439

440440

441-
saveDFG("/tmp/passthru", fg)
442-
fg_ = loadDFG("/tmp/passthru.tar.gz")
443-
Base.rm("/tmp/passthru.tar.gz")
441+
saveDFG(joinpath(tempdir(),"passthru"), fg)
442+
fg_ = loadDFG(joinpath(tempdir(),"passthru.tar.gz"))
443+
Base.rm(joinpath(tempdir(),"passthru.tar.gz"))
444444

445-
@error "#FIXME test propagateBelief w HeatmapSampler ... broken on ci but not local"
446-
return true
447-
end
445+
# @error "#FIXME test propagateBelief w HeatmapSampler ... broken on ci but not local"
446+
# return true
447+
# end
448448

449449
##
450450
end
@@ -531,8 +531,8 @@ end
531531

532532

533533
@testset "Test SpecialEuclidean(2) to TranslationGroup(2) multihypo" begin
534-
535534
##
535+
536536
fg = initfg()
537537
# fg.solverParams.attemptGradients=false
538538

@@ -603,6 +603,7 @@ end
603603

604604
@testset "Test SpecialEuclidean(2) to SpecialEuclidean(2) multihypo" begin
605605
##
606+
606607
fg = initfg()
607608
# fg.solverParams.attemptGradients=false
608609

0 commit comments

Comments
 (0)