update IIF_TEST subgraph tests

Author: Affie

src/services/AbstractDFG.jl

@@ -954,15 +954,20 @@ function buildSubgraph(::Type{G},
                        variableFactorLabels::Vector{Symbol},
                        distance::Int=0;
                        solvable::Int=0,
+                       sessionId::String = "",
                        kwargs...) where G <: AbstractDFG
 
+    if sessionId == ""
+        sessionId = getSessionId(dfg) * "_sub_$(string(uuid4())[1:6])"
+    end
+
     #build up the neighborhood from variableFactorLabels
     allvarfacs = getNeighborhood(dfg, variableFactorLabels, distance; solvable=solvable)
 
     variableLabels = intersect(listVariables(dfg), allvarfacs)
     factorLabels = intersect(listFactors(dfg), allvarfacs)
     # Copy the section of graph we want
-    destDFG = deepcopyGraph(G, dfg, variableLabels, factorLabels; kwargs...)
+    destDFG = deepcopyGraph(G, dfg, variableLabels, factorLabels; sessionId=sessionId, kwargs...)
     return destDFG
 end
 

test/CGStructureTests.jl

@@ -69,8 +69,7 @@ f2 = addFactor!(dfg, [:b; :c], LinearConditional(Normal(50.0,2.0)) )
 sessions = lsSessions(dfg)
 @test map(s -> s.id, sessions) == [session.id]
 
-dfgLocal = GraphsDFG{SolverParams}(params=SolverParams())
-DistributedFactorGraphs.getSubgraph(dfg, union(ls(dfg), lsf(dfg)), true, dfgLocal)
+dfgLocal = buildSubgraph(LightDFG, dfg, union(ls(dfg), lsf(dfg)))
 # Confirm that with sentinels we still have the same graph (doesn't pull in the sentinels)
 @test symdiff(ls(dfgLocal), ls(dfg)) == []
 @test symdiff(lsf(dfgLocal), lsf(dfg)) == []

test/iifCompareTests.jl

@@ -85,7 +85,7 @@ end
     addVariable!(fg, :l1, ContinuousScalar)
     addFactor!(fg, [:x1;:l1], LinearConditional(Rayleigh()))
 
-    sfg = buildSubgraphFromLabels!(fg, [:x0;:x1])
+    sfg = buildSubgraph(LightDFG, fg, [:x0;:x1])
 
     @warn "FIXME This is NOT supposed to pass"
     @test_skip compareFactorGraphs(fg, sfg, skip=[:labelDict;:addHistory;:logpath])