ParTable ctor: allow providing columns data

Author: alyst

src/frontend/specification/ParameterTable.jl

@@ -13,23 +13,25 @@ end
 ### Constructors
 ############################################################################################
 
-# constuct an empty table
-function ParameterTable(;
+# construct a dictionary with the default partable columns
+# optionally pre-allocate data for nrows
+empty_partable_columns(nrows::Integer = 0) = Dict{Symbol, Vector}(
+    :from => fill(Symbol(), nrows),
+    :parameter_type => fill(Symbol(), nrows),
+    :to => fill(Symbol(), nrows),
+    :free => fill(true, nrows),
+    :value_fixed => fill(NaN, nrows),
+    :start => fill(NaN, nrows),
+    :estimate => fill(NaN, nrows),
+    :param => fill(Symbol(), nrows),
+)
+
+# construct using the provided columns data or create and empty table
+function ParameterTable(
+    columns::Dict{Symbol, Vector} = empty_partable_columns();
     observed_vars::Union{AbstractVector{Symbol}, Nothing} = nothing,
     latent_vars::Union{AbstractVector{Symbol}, Nothing} = nothing,
 )
-    columns = Dict{Symbol, Any}(
-        :from => Vector{Symbol}(),
-        :parameter_type => Vector{Symbol}(),
-        :to => Vector{Symbol}(),
-        :free => Vector{Bool}(),
-        :value_fixed => Vector{Float64}(),
-        :start => Vector{Float64}(),
-        :estimate => Vector{Float64}(),
-        :param => Vector{Symbol}(),
-        :start => Vector{Float64}(),
-    )
-
     return ParameterTable(columns,
         !isnothing(observed_vars) ? copy(observed_vars) : Vector{Symbol}(),
         !isnothing(latent_vars) ? copy(latent_vars) : Vector{Symbol}(),

src/frontend/specification/StenoGraphs.jl

@@ -40,14 +40,14 @@ function ParameterTable(
     graph = unique(graph)
     n = length(graph)
 
-    partable = ParameterTable(latent_vars = latent_vars, observed_vars = observed_vars)
-    from = resize!(partable.columns[:from], n)
-    parameter_type = resize!(partable.columns[:parameter_type], n)
-    to = resize!(partable.columns[:to], n)
-    free = fill!(resize!(partable.columns[:free], n), true)
-    value_fixed = fill!(resize!(partable.columns[:value_fixed], n), NaN)
-    start = fill!(resize!(partable.columns[:start], n), NaN)
-    params = fill!(resize!(partable.columns[:param], n), Symbol(""))
+    columns = empty_partable_columns(n)
+    from = columns[:from]
+    parameter_type = columns[:parameter_type]
+    to = columns[:to]
+    free = columns[:free]
+    value_fixed = columns[:value_fixed]
+    start = columns[:start]
+    params = columns[:param]
     # group = Vector{Symbol}(undef, n)
 
     for (i, element) in enumerate(graph)
@@ -103,7 +103,7 @@ function ParameterTable(
         end
     end
 
-    return partable
+    return ParameterTable(columns; latent_vars, observed_vars)
 end
 
 ############################################################################################