listSolveKeys -> listStates (#1896)

Author: Affie

IncrementalInference/src/CliqueStateMachine/services/CliqueStateMachine.jl

@@ -170,7 +170,7 @@ function presolveChecklist_StateMachine(csmc::CliqStateMachineContainer)
 
   # check if solveKey is available in all variables?
   for var in getVariable.(csmc.cliqSubFg, ls(csmc.cliqSubFg))
-    if !(csmc.solveKey in listSolveKeys(var))
+    if !(csmc.solveKey in listStates(var))
       logCSM(
         csmc,
         "CSM-0b create empty data for $(getLabel(var)) on solveKey=$(csmc.solveKey)",
@@ -188,7 +188,7 @@ function presolveChecklist_StateMachine(csmc::CliqStateMachineContainer)
       )
       #
       @info "create vnd solveKey" csmc.solveKey N
-      @info "also" listSolveKeys(var)
+      @info "also" listStates(var)
     end
   end
 

IncrementalInference/src/ExportAPI.jl

@@ -109,14 +109,6 @@ export CSMHistory,
   deepcopyGraph,
   deepcopyGraph!,
   copyGraph!,
-  getSolverData,
-  getTags,
-
-  # using either dictionary or cloudgraphs
-  normalfromstring,
-  categoricalfromstring,
-  # extractdistribution,
-
   SolverParams,
   getSolvable,
   setSolvable!,

IncrementalInference/src/services/AnalysisTools.jl

@@ -21,7 +21,7 @@ function shrinkFactorGraph(fg; upto::Int = 6)
   delVars = filter(x -> isSolvable(getVariable(fgs, x)) == 0, ls(fgs))
   todel = setdiff(lsf(fgs; solvable = 0), lsf(fgs; solvable = 1))
   delFcts = intersect(lsf(fgs), todel)
-  allMags = filter(x -> :MAGNETOMETER in getTags(getFactor(fgs, x)), lsfPriors(fgs))
+  allMags = filter(x -> :MAGNETOMETER in listTags(getFactor(fgs, x)), lsfPriors(fgs))
   union!(delFcts, filter(x -> length(ls(fgs, x)) == 0, allMags))
 
   union!(delVars, (ls(fgs, r"x\d") |> sortDFG)[upto:end])
@@ -176,7 +176,7 @@ function mmdSolveKey(
 end
 
 # vari = getVariable(fg, :x1)
-# kys = filter(x->!(x in [:graphinit;:default]), listSolveKeys(fg) |> collect |>sortDFG)
+# kys = filter(x->!(x in [:graphinit;:default]), listStates(fg) |> collect |>sortDFG)
 # X1_dist_0 = kys .|> x->mmdSolveKey(vari, :default_0, x)
 
 # kyD = [(kys[i],kys[i+1]) for i in 1:length(kys)-1]

IncrementalInference/src/services/FactorGraph.jl

@@ -228,7 +228,7 @@ function setValKDE!(
   solveKey::Symbol = :default,
 )
   #
-  # @error("TESTING setValKDE! ", solveKey, string(listSolveKeys(v)))
+  # @error("TESTING setValKDE! ", solveKey, string(listStates(v)))
   setValKDE!(getState(v, solveKey), mkd, setinit, Float64.(ipc))
   return nothing
 end

IncrementalInference/src/services/GraphInit.jl

@@ -28,7 +28,7 @@ function makeSolverData!(
   for vl in varList
     v = getVariable(dfg,vl)
     varType = getStateKind(v) |> IIF._variableType
-    vsolveKeys = listSolveKeys(dfg,vl)
+    vsolveKeys = listStates(dfg,vl)
     if solveKey != :parametric && !(solveKey in vsolveKeys)
         IIF.setDefaultNodeData!(v, 0, getSolverParams(dfg).N; initialized=false, varType, solveKey) # dodims
         count += 1
@@ -292,7 +292,7 @@ function initVariable!(
 )
   #
   @debug "initVariable! $(getLabel(variable))"
-  if !(solveKey in listSolveKeys(variable))
+  if !(solveKey in listStates(variable))
     @debug "$(getLabel(variable)) needs new VND solveKey=$(solveKey)"
     varType = getStateKind(variable)
     setDefaultNodeData!(
@@ -512,7 +512,7 @@ function initAll!(
     vari = getVariable(dfg, sym)
     varType = DFG.getStateKind(vari)
     # does SolverData exist for this solveKey?
-    vsolveKeys = listSolveKeys(vari)
+    vsolveKeys = listStates(vari)
     # FIXME, likely some consolidation needed with #1637
     if !_parametricInit && !(solveKey in vsolveKeys)  
       # accept complete defaults for a novel solveKey

IncrementalInference/src/services/TreeBasedInitialization.jl

@@ -110,7 +110,7 @@ function _isInitializedOrInitSolveKey(
   N::Int = 100,
 )
   # TODO, this solveKey existence test should probably be removed?
-  if !(solveKey in listSolveKeys(var))
+  if !(solveKey in listStates(var))
     varType = getStateKind(var)
     setDefaultNodeData!(
       var,

IncrementalInference/test/testCompareVariablesFactors.jl

@@ -80,7 +80,7 @@ field = :varValsAll
 
 @test compareSimilarFactors(fg, fg2, skipsamples=true, skipcompute=true, skip=[:fullvariables; :varValsAll; :particleidx])
 
-@test_broken !compareSimilarFactors(fg, fg2, skipsamples=true, skipcompute=false)
+@test !compareSimilarFactors(fg, fg2, skipsamples=true, skipcompute=false)
 
 
 ##

IncrementalInference/test/testSolveKey.jl

@@ -41,11 +41,11 @@ IIF.setDefaultNodeData!(getVariable(fg, :b), 0, 100; solveKey=:testSolveKey,
 #
 
 
-@test !(:default in listSolveKeys(getVariable(fg, :a)))
-@test !(:default in listSolveKeys(getVariable(fg, :b)))
+@test !(:default in listStates(getVariable(fg, :a)))
+@test !(:default in listStates(getVariable(fg, :b)))
 
-@test (:testSolveKey in listSolveKeys(getVariable(fg, :a)))
-@test (:testSolveKey in listSolveKeys(getVariable(fg, :b)))
+@test (:testSolveKey in listStates(getVariable(fg, :a)))
+@test (:testSolveKey in listStates(getVariable(fg, :b)))
 
 
 ##
@@ -56,11 +56,11 @@ doautoinit!(fg, :b, solveKey=:testSolveKey)
 ##
 
 
-@test !(:default in listSolveKeys(getVariable(fg, :a)))
-@test !(:default in listSolveKeys(getVariable(fg, :b)))
+@test !(:default in listStates(getVariable(fg, :a)))
+@test !(:default in listStates(getVariable(fg, :b)))
 
-@test (:testSolveKey in listSolveKeys(getVariable(fg, :a)))
-@test (:testSolveKey in listSolveKeys(getVariable(fg, :b)))
+@test (:testSolveKey in listStates(getVariable(fg, :a)))
+@test (:testSolveKey in listStates(getVariable(fg, :b)))
 
 end