From 901cd8a19e9cf4a17352e40f956ed8d472dd0e54 Mon Sep 17 00:00:00 2001 From: Maximilian Ernst Date: Mon, 7 Aug 2023 13:50:08 +0200 Subject: [PATCH 1/2] close #151 and add test for it --- src/frontend/specification/RAMMatrices.jl | 4 ++-- test/examples/political_democracy/political_democracy.jl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/frontend/specification/RAMMatrices.jl b/src/frontend/specification/RAMMatrices.jl index 2fae887cf..203e389d8 100644 --- a/src/frontend/specification/RAMMatrices.jl +++ b/src/frontend/specification/RAMMatrices.jl @@ -82,7 +82,7 @@ function set_RAMConstant!(A, S, M, rc::RAMConstant) S[rc.index] = rc.value S[rc.index[2], rc.index[1]] = rc.value elseif rc.matrix == :M - M[rd.index] = rc.value + M[rc.index] = rc.value end end @@ -395,4 +395,4 @@ end function get_group(d::Dict, group) return d[group] -end \ No newline at end of file +end diff --git a/test/examples/political_democracy/political_democracy.jl b/test/examples/political_democracy/political_democracy.jl index 45dd6136d..29b29e3d4 100644 --- a/test/examples/political_democracy/political_democracy.jl +++ b/test/examples/political_democracy/political_democracy.jl @@ -185,6 +185,7 @@ graph = @StenoGraph begin y8 ↔ y4 + y6 # means Symbol("1") → _(mean_labels).*_(observed_vars) + Symbol("1") → fixed(0)*ind60 end spec_mean = ParameterTable( @@ -209,4 +210,4 @@ if ENV["JULIA_EXTENDED_TESTS"] == "true" @testset "Graph → ParameterTable | parts | Optim" begin include("by_parts.jl") end semoptimizer = SemOptimizerNLopt @testset "Graph → ParameterTable | parts | NLopt" begin include("by_parts.jl") end -end \ No newline at end of file +end From 4be7cd2a86f71ac3e63c807cbb8e88785593d4b1 Mon Sep 17 00:00:00 2001 From: Maximilian Ernst Date: Mon, 7 Aug 2023 14:34:31 +0200 Subject: [PATCH 2/2] update version and fix fabin 3 starting values --- Project.toml | 2 +- src/additional_functions/start_val/start_fabin3.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index c8176911b..1b94a8e10 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "StructuralEquationModels" uuid = "383ca8c5-e4ff-4104-b0a9-f7b279deed53" authors = ["Maximilian Ernst", "Aaron Peikert"] -version = "0.2.0" +version = "0.2.1" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" diff --git a/src/additional_functions/start_val/start_fabin3.jl b/src/additional_functions/start_val/start_fabin3.jl index a15c3a7fe..25d3e525b 100644 --- a/src/additional_functions/start_val/start_fabin3.jl +++ b/src/additional_functions/start_val/start_fabin3.jl @@ -122,7 +122,7 @@ function start_fabin3(ram_matrices::RAMMatrices, Σ, μ) end for ram_constant in constants - if (ram_constant.matrix == :A) & (ram_constant.index[2] == i) & (ram_constant.index[1] ∈ F_ind) + if (ram_constant.matrix == :A) && (ram_constant.index[2] == i) && (ram_constant.index[1] ∈ F_ind) push!(loadings, Symbol("")) if isone(ram_constant.value) push!(reference, ram_constant.index[1])