Additional filtering test until this is refactored

Author: GearsAD

src/needsahome.jl

@@ -24,13 +24,15 @@ function buildSubgraphFromLabels!(dfg::G,
     #Same type
     cliqSubFg = G(params=getSolverParams(dfg))
   else
-    #Default
+    #Default if not in-memory
     cliqSubFg = destType{typeof(getSolverParms(dfg))}(params=getSolverParams(dfg))
   end
 
   # add a little too many variables (since we need the factors)
   for sym in syms
-    getSubgraphAroundNode(dfg, getVariable(dfg, sym), 2, false, cliqSubFg, solvable=solvable)
+    if getSolvable(dfg, sym) >= solvable
+      getSubgraphAroundNode(dfg, getVariable(dfg, sym), 2, false, cliqSubFg, solvable=solvable)
+    end
   end
 
   # remove excessive variables that were copied by neighbors distance 2

test/needsahomeTests.jl

@@ -6,18 +6,27 @@ using Test
     struct TestInferenceVariable1 <: InferenceVariable end
     struct TestInferenceVariable2 <: InferenceVariable end
 
+    # Build a graph
     v1 = DFGVariable(:a, TestInferenceVariable1())
     v2 = DFGVariable(:b, TestInferenceVariable1())
     f1 = DFGFactor{Int, :Symbol}(:f1)
     addVariable!(dfg, v1)
     addVariable!(dfg, v2)
     addFactor!(dfg, [v1, v2], f1)
 
+    # Standard tests
     newdfg = buildSubgraphFromLabels!(dfg, [:b])
     @test ls(newdfg) == [:b]
     # Okay it looks like this function only accepts variables, is that right?
     @test_throws Exception newdfg = buildSubgraphFromLabels!(dfg, [:b, :f1])
     newdfg = buildSubgraphFromLabels!(dfg, [:b, :a])
     @test symdiff(ls(newdfg), [:b, :a]) == []
+    @test lsf(newdfg) == [:f1]
 
+    # Check solvable filter
+    @test setSolvable!(getVariable(dfg, :a), 1) == 1
+    @test setSolvable!(getVariable(dfg, :b), 0) == 0
+    @test setSolvable!(getFactor(dfg, :f1), 1) == 1
+    newdfg = buildSubgraphFromLabels!(dfg, [:b, :a]; solvable = 1)
+    @test ls(newdfg) == [:a]
 end