test mergeGraph! and bump to 0.7.3

Author: Affie

Project.toml

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

src/services/AbstractDFG.jl

@@ -974,8 +974,8 @@ function mergeGraph!(destDFG::AbstractDFG,
     # find neighbors at distance to add
     allvarfacs = getNeighborhood(sourceDFG, union(variableLabels, factorLabels), distance; solvable=solvable)
 
-    sourceVariables = map(vId->getVariable(sourceDFG, vId), intersect(listVariables(sourceDFG), variableFactorLabels))
-    sourceFactors = map(fId->getFactor(sourceDFG, fId), intersect(listFactors(sourceDFG), variableFactorLabels))
+    sourceVariables = intersect(listVariables(sourceDFG), allvarfacs)
+    sourceFactors = intersect(listFactors(sourceDFG), allvarfacs)
 
     copyGraph!(destDFG, sourceDFG, sourceVariables, sourceFactors; deepcopyNodes=true, overwriteDest=true, kwargs...)
 

test/testBlocks.jl

@@ -1182,7 +1182,17 @@ function CopyFunctionsTest(testDFGAPI; kwargs...)
 
     deepcopyGraph!(dcdfg_part, dfg, Symbol[], [:x1x2f1]; overwriteDest=true)
 
+    vlbls1 = [:x1, :x2, :x3]
+    vlbls2 = [:x4, :x5, :x6]
+    dcdfg_part1 = deepcopyGraph(LightDFG, dfg, vlbls1)
+    dcdfg_part2 = deepcopyGraph(GraphsDFG, dfg, vlbls2)
 
+    mergedGraph = testDFGAPI()
+    mergeGraph!(mergedGraph, dcdfg_part1)
+    mergeGraph!(mergedGraph, dcdfg_part2)
+
+    @test issetequal(ls(mergedGraph), union(vlbls1, vlbls2))
+    @test issetequal(lsf(mergedGraph), union(lsf(dcdfg_part1), lsf(dcdfg_part2)))
     # convert to...
     # condfg = convert(GraphsDFG, dfg)
     # @test condfg isa GraphsDFG