Merge pull request #907 from JuliaRobotics/master

v0.18.7-rc1

Author: dehann

Project.toml

@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.18.6"
+version = "0.18.7"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/DataBlobs/services/AbstractDataEntries.jl

@@ -27,6 +27,8 @@ buildSourceString(dfg::AbstractDFG, label::Symbol) =
 """
     $(SIGNATURES)
 Get data entry
+
+Also see: [`addDataEntry`](@ref), [`getDataBlob`](@ref), [`listDataEntries`](@ref)
 """
 function getDataEntry(var::AbstractDFGVariable, key::Symbol)
     !hasDataEntry(var, key) && error("No dataEntry label $(key) found in variable $(getLabel(var))")
@@ -42,25 +44,23 @@ function getDataEntry(var::AbstractDFGVariable, blobId::UUID)
     error("No dataEntry with blobId $(blobId) found in variable $(getLabel(var))")
 end
 
-getDataEntry(dfg::AbstractDFG, label::Symbol, key::Union{Symbol,UUID}) = getDataEntry(getVariable(dfg, label), key)
+getDataEntry(dfg::AbstractDFG, label::Symbol, key::UUID) = getDataEntry(getVariable(dfg, label), key)
+getDataEntry(dfg::AbstractDFG, label::Symbol, key::Symbol) = getDataEntry(getVariable(dfg, label), key)
 
 
 """
     $(SIGNATURES)
 Add Data Entry to a DFG variable
+Should be extended if DFG variable is not returned by reference.
+
+Also see: [`getDataEntry`](@ref), [`addDataBlob`](@ref), [`mergeDataEntries!`](@ref)
 """
 function addDataEntry!(var::AbstractDFGVariable, bde::AbstractDataEntry)
     haskey(var.dataDict, bde.label) && error("Data entry $(bde.label) already exists in variable $(getLabel(var))")
     var.dataDict[bde.label] = bde
     return bde
 end
 
-
-"""
-    $(SIGNATURES)
-Add Data Entry to distributed factor graph.
-Should be extended if DFG variable is not returned by reference.
-"""
 function addDataEntry!(dfg::AbstractDFG, label::Symbol, bde::AbstractDataEntry)
     return addDataEntry!(getVariable(dfg, label), bde)
 end
@@ -173,3 +173,46 @@ function listDataEntrySequence( dfg::AbstractDFG,
     entMsk = entReg .!== nothing
     ents_[findall(entMsk)] |> _sort
 end
+
+"""
+    $SIGNATURES
+
+Add a data entry into the destination variable which already exists 
+in a source variable.
+
+See also: [`addDataEntry!`](@ref), [`getDataEntry`](@ref), [`listDataEntries`](@ref), [`getDataBlob`](@ref)
+"""
+function mergeDataEntries!(
+    dst::AbstractDFG, 
+    dlbl::Symbol, 
+    src::AbstractDFG, 
+    slbl::Symbol, 
+    bllb::Union{Symbol, UUID, <:AbstractString, Regex}
+)
+    #
+    _makevec(s) = [s;]
+    _makevec(s::AbstractVector) = s
+    des_ = getDataEntry(src, slbl, bllb)
+    des = _makevec(des_)
+    # don't add data entries that already exist 
+    dde = listDataEntries(dst, dlbl)
+    uids = (s->s.id).(dde)
+    filter!(s -> !(s.id in uids), des)
+    # add any data entries not already in the destination variable, by uuid
+    addDataEntry!.(dst, dlbl, des)
+end
+
+function mergeDataEntries!(
+    dst::AbstractDFG, 
+    dlbl::Symbol, 
+    src::AbstractDFG, 
+    slbl::Symbol, 
+    ::Colon=:
+)
+    des = listDataEntries(src, slbl)
+    # don't add data entries that already exist 
+    dde = listDataEntries(dst, dlbl)
+    uids = (s->s.id).(dde)
+    filter!(s -> !(s.id in uids), des)
+    union(((s->mergeDataEntries!(dst, dlbl, src, slbl, s.id)).(des))...)
+end

src/DistributedFactorGraphs.jl

@@ -197,7 +197,7 @@ export copyGraph!, deepcopyGraph, deepcopyGraph!, buildSubgraph, mergeGraph!
 export addDataEntry!, getDataEntry, updateDataEntry!, deleteDataEntry!, getDataEntries, listDataEntries, hasDataEntry, hasDataEntry
 export listDataEntrySequence
 # convenience wrappers
-export addDataEntry!
+export addDataEntry!, mergeDataEntries!
 # aliases
 export addData!
 

src/GraphsDFG/services/GraphsDFG.jl

@@ -155,7 +155,7 @@ function deleteFactor!(dfg::GraphsDFG, label::Symbol; suppressGetFactor::Bool=fa
     return factor
 end
 
-function getVariables(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0)
+function getVariables(dfg::GraphsDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0, detail=nothing)
 
     # variables = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGVariable, vertices(dfg.g)))
     variables = collect(values(dfg.g.variables))

src/LightDFG/services/LightDFG.jl

@@ -155,7 +155,7 @@ function deleteFactor!(dfg::LightDFG, label::Symbol; suppressGetFactor::Bool=fal
     return factor
 end
 
-function getVariables(dfg::LightDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0)
+function getVariables(dfg::LightDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0, detail=nothing)
 
     # variables = map(v -> v.dfgNode, filter(n -> n.dfgNode isa DFGVariable, vertices(dfg.g)))
     variables = collect(values(dfg.g.variables))

src/Neo4jDFG/services/Neo4jDFG.jl

@@ -384,7 +384,7 @@ end
 # Alias
 deleteFactor!(dfg::Neo4jDFG, factor::DFGFactor; suppressGetFactor::Bool=false) = deleteFactor!(dfg, factor.label, suppressGetFactor=suppressGetFactor)
 
-function getVariables(dfg::Neo4jDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0)::Vector{DFGVariable}
+function getVariables(dfg::Neo4jDFG, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0, detail=nothing)::Vector{DFGVariable}
     variableIds = listVariables(dfg, regexFilter, tags=tags, solvable=solvable)
     # TODO: Optimize to use tags in query here!
     variables = map(vId->getVariable(dfg, vId), variableIds)

src/services/AbstractDFG.jl

@@ -295,7 +295,7 @@ List the DFGVariables in the DFG.
 Optionally specify a label regular expression to retrieves a subset of the variables.
 Tags is a list of any tags that a node must have (at least one match).
 """
-function getVariables(dfg::G, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0) where G <: AbstractDFG
+function getVariables(dfg::G, regexFilter::Union{Nothing, Regex}=nothing; tags::Vector{Symbol}=Symbol[], solvable::Int=0, detail=nothing) where G <: AbstractDFG
     error("getVariables not implemented for $(typeof(dfg))")
 end
 

test/consol_DataEntryBlobTests.jl

@@ -45,8 +45,23 @@ ade3,adb3 = updateData!(dfg, :x2, deepcopy(ade))
 @test ade == ade2 == ade3
 @test adb == adb2 == adb3
 
+
+@test :random in listDataEntries(dfg, :x2)
+@test length(listDataEntries(dfg, :x1)) === 0
+@test length(listDataEntries(dfg, :x2)) === 1
+
+mergeDataEntries!(dfg, :x1, dfg, :x2, :random)
+
+@test length(listDataEntries(dfg, :x1)) === 1
+@test :random in listDataEntries(dfg, :x1)
+@test length(listDataEntries(dfg, :x2)) === 1
+
+deleteData!(dfg, :x1, :random)
 deleteData!(dfg, :x2, :random)
 
+@test length(listDataEntries(dfg, :x1)) === 0
+@test length(listDataEntries(dfg, :x2)) === 0
+
 ##==============================================================================
 ## FileDataEntry
 ##==============================================================================