.bw back to matrix

Author: dehann

src/entities/DFGVariable.jl

@@ -18,7 +18,7 @@ $(TYPEDFIELDS)
 """
 mutable struct VariableNodeData{T<:InferenceVariable, P}
     val::Vector{P}
-    bw::Vector{Vector{Float64}}
+    bw::Matrix{Float64}
     BayesNetOutVertIDs::Vector{Symbol}
     dimIDs::Vector{Int} # Likely deprecate
 
@@ -43,7 +43,7 @@ mutable struct VariableNodeData{T<:InferenceVariable, P}
     VariableNodeData{T,P}(w...)  where {T <:InferenceVariable, P} = new{T,P}(w...)
     VariableNodeData{T,P}(;solveKey::Symbol=:default ) where {T <:InferenceVariable, P} = new{T,P}(
             Vector{P}(), 
-            Vector{Vector{Float64}}(), 
+            zeros(0,0), 
             Symbol[], 
             Int[], 
             0, 
@@ -68,7 +68,7 @@ end
 VariableNodeData{T}(;solveKey::Symbol=:default ) where T <: InferenceVariable = VariableNodeData{T, getPointType(T)}(solveKey=solveKey)
 
 VariableNodeData(   val::Vector{P},
-                    bw::Vector{Vector{Float64}},
+                    bw::Matrix{<:Real},
                     BayesNetOutVertIDs::AbstractVector{Symbol},
                     dimIDs::AbstractVector{Int},
                     dims::Int,
@@ -95,7 +95,7 @@ VariableNodeData(   val::Vector{P},
 #
 
 VariableNodeData(val::Vector{P},
-                 bw::Vector{Vector{Float64}},
+                 bw::Matrix{<:Real},
                  BayesNetOutVertIDs::AbstractVector{Symbol},
                  dimIDs::AbstractVector{Int},
                  dims::Int,
@@ -123,7 +123,7 @@ function VariableNodeData(variableType::T; solveKey::Symbol=:default) where T <:
     # p0 = getPointIdentity(T)
     P0 = Vector{getPointType(T)}()
     # P0[1] = p0
-    BW = Vector{Vector{Float64}}()
+    BW = zeros(0,0)
     # BW[1] = zeros(getDimension(T))
     VariableNodeData(   P0, BW, Symbol[], Int[], 
                         0, false, :NOTHING, Symbol[], 

src/services/Serialization.jl

@@ -216,15 +216,15 @@ function packVariableNodeData(::G, d::VariableNodeData{T}) where {G <: AbstractD
     zeros(1,0)
   end
   _val = castval[:]
-  castbw = if 0 < length(d.bw)
-    @cast castbw[i,j] := d.bw[j][i]
-    castbw
-  else
-    zeros(1,0)
-  end
-  _bw = castbw[:]
+#   castbw = if 0 < length(d.bw)
+#     @cast castbw[i,j] := d.bw[j][i]
+#     castbw
+#   else
+#     zeros(1,0)
+#   end
+#   _bw = castbw[:]
   return PackedVariableNodeData(_val, size(castval,1),
-                                _bw, size(castbw,1),
+                                d.bw[:], size(d.bw,1),
                                 d.BayesNetOutVertIDs,
                                 d.dimIDs, d.dims, d.eliminated,
                                 d.BayesNetVertID, d.separator,
@@ -258,14 +258,10 @@ function unpackVariableNodeData(dfg::G, d::PackedVariableNodeData) where G <: Ab
 
     r4 = d.dimbw
     c4 = r4 > 0 ? floor(Int,length(d.vecbw)/r4) : 0
-    M4 = reshape(d.vecbw,r4,c4)
-    bw = Vector{Vector{Float64}}(undef,size(M4,2))
-    for j in 1:size(M4,2)
-      bw[j] = collect(M4[:,j])
-    end
+    BW = reshape(d.vecbw,r4,c4)
 
     # 
-    return VariableNodeData{T, getPointType(T)}(vals, bw, d.BayesNetOutVertIDs,
+    return VariableNodeData{T, getPointType(T)}(vals, BW, d.BayesNetOutVertIDs,
         d.dimIDs, d.dims, d.eliminated, d.BayesNetVertID, d.separator,
         T(), d.initialized, d.inferdim, d.ismargin, d.dontmargin, 
         d.solveInProgress, d.solvedCount, d.solveKey,

test/compareTests.jl

@@ -14,7 +14,6 @@ vnd3 = VariableNodeData(TestVariableType2())
 
 @test vnd1 == vnd2
 push!(vnd1.val, [1.0;])
-# vnd2.val = Vector{Vector{Float64}}(undef,1)
 push!(vnd2.val, [1.0;])
 @test vnd1 == vnd2
 vnd2.val[1] = [0.1;]

test/testBlocks.jl

@@ -741,7 +741,7 @@ function  VSDTestBlock!(fg, v1)
     retVnd = updateVariableSolverData!(fg, :a, altVnd, false, [:inferdim;])
     @test retVnd == altVnd
 
-    push!(altVnd.bw, [-1.0;])
+    altVnd.bw = -ones(1,1)
     retVnd = updateVariableSolverData!(fg, :a, altVnd, false, [:bw;])
     @test retVnd == altVnd