From ed09b39f1a0e65b5b005d2d076bd14c05fb22e49 Mon Sep 17 00:00:00 2001 From: dehann Date: Mon, 13 Mar 2023 01:37:06 -0700 Subject: [PATCH] updates for DFG v0.20.1 --- Project.toml | 4 ++-- test/testScatterAlignParched.jl | 8 ++++---- test/testStashing_SAP.jl | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Project.toml b/Project.toml index 8d155dfe3..3949e4b9f 100644 --- a/Project.toml +++ b/Project.toml @@ -64,7 +64,7 @@ ColorVectorSpace = "0.9" Combinatorics = "1" CoordinateTransformations = "0.5, 0.6" DataStructures = "0.17, 0.18" -DistributedFactorGraphs = "0.19, 0.20" +DistributedFactorGraphs = "0.20.1" Distributions = "0.25" DocStringExtensions = "0.8, 0.9" FFTW = "1" @@ -73,7 +73,7 @@ GeometryBasics = "0.4" GeometricalPredicates = "0.4" ImageCore = "0.8, 0.9" ImageMagick = "1" -IncrementalInference = "0.31, 0.32, 0.33" +IncrementalInference = "0.32, 0.33" Interpolations = "0.14" JLD2 = "0.3, 0.4" JSON = "0.20, 0.21" diff --git a/test/testScatterAlignParched.jl b/test/testScatterAlignParched.jl index 28c52f05f..347295275 100644 --- a/test/testScatterAlignParched.jl +++ b/test/testScatterAlignParched.jl @@ -86,8 +86,8 @@ sap = Caesar.ScatterAlignPose3(; cloud2=bel_m, sample_count=100, useStashing=true, - dataEntry_cloud1=string(deb0[1].id), - dataEntry_cloud2=string(deb1[1].id), + dataEntry_cloud1=string(deb0.id), + dataEntry_cloud2=string(deb1.id), ) ## this line checks blob store access via preambleCache specifically for ScatterAlign which will internally access the blob store @@ -119,8 +119,8 @@ v0 = addVariable!(tfg, :x0, Pose3) v1 = addVariable!(tfg, :x1, Pose3) # To load from stashed blobs attached to variables, those variables need the associated dataEntries -Caesar.addDataEntry!(v0,deb0[1]) -Caesar.addDataEntry!(v1,deb1[1]) +Caesar.addDataEntry!(v0,deb0) +Caesar.addDataEntry!(v1,deb1) # test unpacking of factor pulling data from blobstore during preambleCache pf_ = Caesar.unpackFactor(tfg,pf) diff --git a/test/testStashing_SAP.jl b/test/testStashing_SAP.jl index a3235870b..b016b633c 100644 --- a/test/testStashing_SAP.jl +++ b/test/testStashing_SAP.jl @@ -77,10 +77,10 @@ sap = ScatterAlignPose2(bIM1, bIM2, (x,y); ## must store the stashed data entry blobs before the preambleCache function runs on addFactor db = Vector{UInt8}( convert(String, sap.align.cloud1) ) -de0, = addData!(fg, :test_stashing_store, :x0, :hgd_stash_x0, db, mimeType="application/json/octet-stream") +de0 = addData!(fg, :test_stashing_store, :x0, :hgd_stash_x0, db, mimeType="application/json/octet-stream") db = Vector{UInt8}( convert(String,sap.align.cloud2) ) -de1, = addData!(fg, :test_stashing_store, :x1, :hgd_stash_x1, db, mimeType="application/json/octet-stream") +de1 = addData!(fg, :test_stashing_store, :x1, :hgd_stash_x1, db, mimeType="application/json/octet-stream") ##