Unused State eliminated, BayesNetOutVertIDs,BayesNetVertID

Author: Affie

src/entities/DFGVariable.jl

@@ -33,14 +33,14 @@ Base.@kwdef mutable struct State{T <: StateType, P, N}
     "Parametric (Gaussian) covariance."
     covar::Vector{SMatrix{N, N, Float64}} =
         SMatrix{getDimension(T), getDimension(T), Float64}[]
-    BayesNetOutVertIDs::Vector{Symbol} = Symbol[] #TODO looks unused?
+    # BayesNetOutVertIDs::Vector{Symbol} = Symbol[] #TODO looks unused?
 
     dims::Int = getDimension(T) #TODO should we deprecate in favor of N
-    """
-    Flag used by junction (Bayes) tree construction algorithm to know whether this variable has yet been included in the tree construction.
-    """
-    eliminated::Bool = false
-    BayesNetVertID::Symbol = :NOTHING #  Union{Nothing, } #TODO deprecate
+    # """
+    # Flag used by junction (Bayes) tree construction algorithm to know whether this variable has yet been included in the tree construction.
+    # """
+    # eliminated::Bool = false
+    # BayesNetVertID::Symbol = :NOTHING #  Union{Nothing, } #TODO deprecate
     separator::Vector{Symbol} = Symbol[]
     """
     False if initial numerical values are not yet available or stored values are not ready for further processing yet.
@@ -106,10 +106,10 @@ Base.@kwdef mutable struct PackedState
     dimval::Int
     vecbw::Vector{Float64}
     dimbw::Int
-    BayesNetOutVertIDs::Vector{Symbol} # Int
+    # BayesNetOutVertIDs::Vector{Symbol} # Int
     dims::Int
-    eliminated::Bool # TODO Questionable usage, set but never read?
-    BayesNetVertID::Symbol # Int #TODO deprecate
+    # eliminated::Bool # TODO Questionable usage, set but never read?
+    # BayesNetVertID::Symbol # Int #TODO deprecate
     separator::Vector{Symbol} # Int #TODO maybe remove from State and have in variable only.
     variableType::String
     initialized::Bool
@@ -187,7 +187,7 @@ StructUtils.@kwarg struct VariableDFG{T <: StateType, P, N} <: AbstractGraphVari
     _autotype::Nothing = nothing & (name = :type, lower = _ -> TypeMetadata(VariableDFG))
 end
 
-refStates(v::VariableCompute) = v.states
+refStates(v::VariableDFG) = v.states
 
 const VariableCompute = VariableDFG
 ##------------------------------------------------------------------------------
@@ -215,10 +215,6 @@ function VariableCompute(
     return VariableCompute{T, P, N}(; label, timestamp, solvable, kwargs...)
 end
 
-function VariableCompute(label::Symbol, variableType::StateType; kwargs...)
-    return VariableCompute(label, typeof(variableType); kwargs...)
-end
-
 function VariableCompute(label::Symbol, state::State; kwargs...)
     return VariableCompute(;
         label,

src/services/CompareUtils.jl

@@ -196,15 +196,15 @@ end
 function compare(a::State, b::State)
     a.val != b.val && @debug("val is not equal") === nothing && return false
     a.bw != b.bw && @debug("bw is not equal") === nothing && return false
-    a.BayesNetOutVertIDs != b.BayesNetOutVertIDs &&
-        @debug("BayesNetOutVertIDs is not equal") === nothing &&
-        return false
-    a.eliminated != b.eliminated &&
-        @debug("eliminated is not equal") === nothing &&
-        return false
-    a.BayesNetVertID != b.BayesNetVertID &&
-        @debug("BayesNetVertID is not equal") === nothing &&
-        return false
+    # a.BayesNetOutVertIDs != b.BayesNetOutVertIDs &&
+    #     @debug("BayesNetOutVertIDs is not equal") === nothing &&
+    #     return false
+    # a.eliminated != b.eliminated &&
+    #     @debug("eliminated is not equal") === nothing &&
+    #     return false
+    # a.BayesNetVertID != b.BayesNetVertID &&
+    #     @debug("BayesNetVertID is not equal") === nothing &&
+    #     return false
     a.separator != b.separator &&
         @debug("separator is not equal") === nothing &&
         return false

src/services/Serialization.jl

@@ -80,9 +80,9 @@ function packState(d::State{T}) where {T <: StateType}
         size(castval, 1),
         d.bw[:],
         size(d.bw, 1),
-        d.BayesNetOutVertIDs,
-        d.eliminated,
-        d.BayesNetVertID,
+        # d.BayesNetOutVertIDs,
+        # d.eliminated,
+        # d.BayesNetVertID,
         d.separator,
         stringVariableType(getVariableType(d)),
         d.initialized,
@@ -129,9 +129,9 @@ function unpackState(d::PackedState)
         bw = BW,
         #TODO only one covar is currently supported in packed VND
         covar = isempty(d.covar) ? SMatrix{N, N, Float64}[] : [d.covar],
-        BayesNetOutVertIDs = Symbol.(d.BayesNetOutVertIDs),
-        eliminated = d.eliminated,
-        BayesNetVertID = Symbol(d.BayesNetVertID),
+        # BayesNetOutVertIDs = Symbol.(d.BayesNetOutVertIDs),
+        # eliminated = d.eliminated,
+        # BayesNetVertID = Symbol(d.BayesNetVertID),
         separator = Symbol.(d.separator),
         initialized = d.initialized,
         infoPerCoord = d.infoPerCoord,

test/testBlocks.jl

@@ -1547,11 +1547,11 @@ function FileDFGTestBlock(testDFGAPI; kwargs...)
         v4 = getVariable(dfg, :x4)
         vnd = getState(v4, :default)
         # set everything
-        vnd.BayesNetVertID = :outid
-        push!(vnd.BayesNetOutVertIDs, :id)
+        # vnd.BayesNetVertID = :outid
+        # push!(vnd.BayesNetOutVertIDs, :id)
         # vnd.bw[1] = [1.0;]
         vnd.dontmargin = true
-        vnd.eliminated = true
+        # vnd.eliminated = true
         vnd.infoPerCoord .= Float64[1.5;]
         vnd.initialized = true
         vnd.ismargin = true