From 72ce605c7bcd1577b3718f9a6bafaa65e150f2b6 Mon Sep 17 00:00:00 2001 From: dehann Date: Fri, 3 Mar 2023 17:48:10 -0800 Subject: [PATCH 1/3] tests not broken w dfg 20 --- test/testCompareVariablesFactors.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/testCompareVariablesFactors.jl b/test/testCompareVariablesFactors.jl index 6cf5f463..188b55a3 100644 --- a/test/testCompareVariablesFactors.jl +++ b/test/testCompareVariablesFactors.jl @@ -46,7 +46,7 @@ fg2 = deepcopy(fg) @test compareSimilarFactors(fg, fg2; skip=[:particleidx]) @test compareFactorGraphs(fg, fg) -@test_broken compareFactorGraphs(fg, fg2; skip=[:particleidx; :varidx]) +@test compareFactorGraphs(fg, fg2; skip=[:particleidx; :varidx]) # easier error messages getSolverParams(fg).multiproc = false @@ -113,7 +113,7 @@ sfg = buildSubgraph(fg, [:x0;:x1], 1) # distance=1 to include factors #FIXME JT - this doesn't make sense to pass, it is a subgraph so should it not rather be ⊂ [subset]? # compareDFG(fg1, fg2, by=⊂, skip=...) @test fg.sessionLabel == sfg.sessionLabel[1:length(fg.sessionLabel)] -@test_broken compareFactorGraphs(fg, sfg, skip=[:labelDict;:addHistory;:logpath;:sessionLabel; :particleidx; :varidx]) +@test compareFactorGraphs(fg, sfg, skip=[:labelDict;:addHistory;:logpath;:sessionLabel; :particleidx; :varidx]) # drawGraph(sfg) From 7ed94082763a8ab53a803472fb67f2c4ea9125c3 Mon Sep 17 00:00:00 2001 From: Dehann Fourie <6412556+dehann@users.noreply.github.com> Date: Mon, 6 Mar 2023 11:51:07 -0800 Subject: [PATCH 2/3] min compat dfg v0.20, bump v0.33 --- Project.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index e3ffc679..53c579e4 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "IncrementalInference" uuid = "904591bb-b899-562f-9e6f-b8df64c7d480" keywords = ["MM-iSAMv2", "Bayes tree", "junction tree", "Bayes network", "variable elimination", "graphical models", "SLAM", "inference", "sum-product", "belief-propagation"] desc = "Implements the Multimodal-iSAMv2 algorithm." -version = "0.32.3" +version = "0.33.0" [deps] ApproxManifoldProducts = "9bbbb610-88a1-53cd-9763-118ce10c1f89" @@ -52,7 +52,7 @@ ApproxManifoldProducts = "0.6.3" BSON = "0.2, 0.3" Combinatorics = "1.0" DataStructures = "0.16, 0.17, 0.18" -DistributedFactorGraphs = "0.19.3, 0.20" +DistributedFactorGraphs = "0.20" Distributions = "0.24, 0.25" DocStringExtensions = "0.8, 0.9" FileIO = "1" From 96a21f2e588b814dcec26278bb64988436aee8ef Mon Sep 17 00:00:00 2001 From: Johannes Terblanche <6612981+Affie@users.noreply.github.com> Date: Wed, 8 Mar 2023 09:03:47 +0200 Subject: [PATCH 3/3] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 53c579e4..5f2c31f3 100644 --- a/Project.toml +++ b/Project.toml @@ -52,7 +52,7 @@ ApproxManifoldProducts = "0.6.3" BSON = "0.2, 0.3" Combinatorics = "1.0" DataStructures = "0.16, 0.17, 0.18" -DistributedFactorGraphs = "0.20" +DistributedFactorGraphs = "0.19.3, 0.20" Distributions = "0.24, 0.25" DocStringExtensions = "0.8, 0.9" FileIO = "1"