Skip to content

Commit

Permalink
more dispatches on mergeDataEntries
Browse files Browse the repository at this point in the history
  • Loading branch information
dehann committed Dec 6, 2022
1 parent ab3a71d commit 690570e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ManifoldsBase = "3362f125-f0bb-47a3-aa74-596ffd7ef2fb"
Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
RecursiveArrayTools = "731186ca-8d62-57ce-b412-fbd966d074cd"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
Expand All @@ -40,6 +41,7 @@ ManifoldsBase = "0.11, 0.12, 0.13"
Neo4j = "2"
OrderedCollections = "1.4"
Pkg = "1.4, 1.5"
ProgressMeter = "1"
RecursiveArrayTools = "2"
Reexport = "1"
Requires = "1"
Expand Down
12 changes: 12 additions & 0 deletions src/DataBlobs/services/AbstractDataEntries.jl
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,18 @@ function mergeDataEntries!(
end
end

function mergeDataEntries!(
dest::AbstractDFG,
src::AbstractDFG,
w...;
varList::AbstractVector = listVariables(dest) |> sortDFG
)
@showprogress 1 "merging data entries" for vl in varList
mergeDataEntries!(dest, vl, src, vl, w...)
end
varList
end

"""
$SIGNATURES
Expand Down
1 change: 1 addition & 0 deletions src/DistributedFactorGraphs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ using SparseArrays
using UUIDs
using Pkg
using TensorCast
using ProgressMeter

# used for @defVariable
import ManifoldsBase
Expand Down

0 comments on commit 690570e

Please sign in to comment.