rename VariableState -> State

Author: Affie

IncrementalInference/ext/IncrInfrDiffEqFactorExt.jl

@@ -67,7 +67,7 @@ _maketuplebeyond2args = (w1 = nothing, w2 = nothing, w3_...) -> (w3_...,)
 
 function DERelative(
   Xi::AbstractVector{<:VariableCompute},
-  domain::Type{<:VariableStateType},
+  domain::Type{<:StateType},
   f::Function,
   data = () -> ();
   dt::Real = 1,
@@ -94,7 +94,7 @@ end
 function DERelative(
   dfg::AbstractDFG,
   labels::AbstractVector{Symbol},
-  domain::Type{<:VariableStateType},
+  domain::Type{<:StateType},
   f::Function,
   data = () -> ();
   Xi::AbstractArray{<:VariableCompute} = getVariable.(dfg, labels),

IncrementalInference/ext/IncrInfrInteractiveUtilsExt.jl

@@ -4,7 +4,7 @@ module IncrInfrInteractiveUtilsExt
 
 using InteractiveUtils
 using DocStringExtensions
-using IncrementalInference: VariableStateType, AbstractPrior, RelativeObservation
+using IncrementalInference: StateType, AbstractPrior, RelativeObservation
 # using IncrementalInference: getCurrentWorkspaceFactors, getCurrentWorkspaceVariables, listTypeTree
 import IncrementalInference: getCurrentWorkspaceFactors, getCurrentWorkspaceVariables, listTypeTree
 
@@ -29,7 +29,7 @@ end
 Return all variables currently registered in the workspace.
 """
 function getCurrentWorkspaceVariables()
-  return InteractiveUtils.subtypes(VariableStateType)
+  return InteractiveUtils.subtypes(StateType)
 end
 
 function _listTypeTree(mytype, printlevel::Int)

IncrementalInference/src/CliqueStateMachine/services/CliqueStateMachine.jl

@@ -362,7 +362,7 @@ function initUp_StateMachine(csmc::CliqStateMachineContainer)
   if init_for_differential
     frontal_vars = getVariable.(csmc.cliqSubFg, getCliqFrontalVarIds(csmc.cliq))
     filter!(!isInitialized, frontal_vars)
-    foreach(fvar -> getVariableState(fvar, csmc.solveKey).initialized = true, frontal_vars)
+    foreach(fvar -> getState(fvar, csmc.solveKey).initialized = true, frontal_vars)
     logCSM(
       csmc,
       "CSM-2b init_for_differential: ";
@@ -404,7 +404,7 @@ function initUp_StateMachine(csmc::CliqStateMachineContainer)
   ## FIXME init to whatever is in frontals
   # set frontals init back to false
   if init_for_differential #experimental_sommer_init_to_whatever_is_in_frontals
-    foreach(fvar -> getVariableState(fvar, csmc.solveKey).initialized = false, frontal_vars)
+    foreach(fvar -> getState(fvar, csmc.solveKey).initialized = false, frontal_vars)
     if someInit
       solveStatus = UPSOLVED
     end

IncrementalInference/src/Deprecated.jl

@@ -120,7 +120,7 @@ function solveGraphParametric2(
   flatvar = FlatVariables(fg, varIds)
 
   for vId in varIds
-    p = getVariableState(fg, vId, solvekey).val[1]
+    p = getState(fg, vId, solvekey).val[1]
     flatvar[vId] = getCoordinates(getVariableType(fg, vId), p)
   end
 

IncrementalInference/src/ExportAPI.jl

@@ -71,7 +71,7 @@ export CSMHistory,
 
   # general types for softtyping of variable nodes
   BeliefArray,
-  VariableStateType,
+  StateType,
   ContinuousScalar,
   SamplableBelief,
   PackedBelief,

IncrementalInference/src/Factors/GenericFunctions.jl

@@ -239,7 +239,7 @@ function convert(
 )
   #
 
-  # piggy back on serialization of VariableStateType rather than try serialize anything Manifolds.jl
+  # piggy back on serialization of StateType rather than try serialize anything Manifolds.jl
   M = DFG.getTypeFromSerializationModule(obj.varType) |> getManifold
 
   # TODO this is too excessive

IncrementalInference/src/Factors/PartialPrior.jl

@@ -9,7 +9,7 @@ Notes
   - Future TBD, consider using `AMP.getManifoldPartial` for more general abstraction.
 """
 struct PartialPrior{T <: SamplableBelief, P <: Tuple} <: AbstractPrior
-  varType::Type{<:VariableStateType}
+  varType::Type{<:StateType}
   Z::T
   partial::P
 end

IncrementalInference/src/NeedsResolution.jl

@@ -1,6 +1,6 @@
 
 # FIXME move to DFG
-getPointDefault(V::VariableStateType) = getPointIdentity(V)
+getPointDefault(V::StateType) = getPointIdentity(V)
 
 function compare(c1::Channel, c2::Channel; skip::Vector{Symbol} = [])
   #

IncrementalInference/src/Serialization/services/DispatchPackedConversions.jl

@@ -5,7 +5,7 @@
 function convert(
   ::Type{PackedFunctionNodeData{P}},
   d::FunctionNodeData{T},
-) where {P <: AbstractPackedFactor, T <: FactorSolverCache}
+) where {P <: AbstractPackedFactor, T <: FactorCache}
   error("TODO remove. PackedFunctionNodeData is obsolete")
   return PackedFunctionNodeData(
     d.eliminated,
@@ -143,7 +143,7 @@ function DFG.rebuildFactorCache!(
 
   #   factor__
   # else
-  #   mergeVariableState!(factor, new_solverData)
+  #   mergeState!(factor, new_solverData)
   #   DFG.setCache!(factor, solvercache)
   #   # We're not updating here because we don't want
   #   # to solve cloud in loop, we want to make sure this flow works:

IncrementalInference/src/Serialization/services/SerializationMKD.jl

@@ -49,7 +49,7 @@ function DFG.packDistribution(mkd::ManifoldKernelDensity)
 
   return PackedManifoldKernelDensity(
     "IncrementalInference.PackedManifoldKernelDensity",
-    # piggy back on VariableStateType serialization rather than try serialize anything Manifolds.jl
+    # piggy back on StateType serialization rather than try serialize anything Manifolds.jl
     DFG.typeModuleName(getVariableType(mkd.manifold)),
     [AMP.makeCoordsFromPoint(mkd.manifold, pt) for pt in pts],
     getBW(mkd.belief)[:, 1],
@@ -59,7 +59,7 @@ function DFG.packDistribution(mkd::ManifoldKernelDensity)
 end
 
 function DFG.unpackDistribution(dtr::PackedManifoldKernelDensity)
-  # find VariableStateType type from string (anything Manifolds.jl?)
+  # find StateType type from string (anything Manifolds.jl?)
   M = DFG.getTypeFromSerializationModule(dtr.varType) |> getManifold
   vecP = [AMP.makePointFromCoords(M, pt) for pt in dtr.pts]
   bw = length(dtr.bw) === 0 ? nothing : dtr.bw