update loo moment-match code

ecmerkle · Aug 28, 2023 · 5c0b6a0 · 5c0b6a0
1 parent ed584c3
commit 5c0b6a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: blavaan
 Title: Bayesian Latent Variable Analysis
-Version: 0.4-9.1159
+Version: 0.4-9.1161
 Authors@R: c(person(given = "Edgar", family = "Merkle",
                     role = c("aut", "cre"),
                     email = "merklee@missouri.edu",

diff --git a/R/blavaan.R b/R/blavaan.R
@@ -616,15 +616,14 @@ blavaan <- function(...,  # default lavaan arguments
                     jagtrans$monitors <- c(jagtrans$monitors, mcmcextra$monitor)
                 }
                 if("data" %in% names(mcmcextra) & "moment_match_k_threshold" %in% names(mcmcextra$data)){
-                    moment_match_monitors <- c(
-                      c("Lambda_y_free", "Gamma_free", "B_free", 
+                    ## FIXME these do not cover level 2 parameters
+                    moment_match_monitors <- c("Lambda_y_free", "B_free", 
                         "Theta_sd_free", "Theta_r_free", "Psi_sd_free", 
                         "Psi_r_mat", "Psi_r_free", "Tau_ufree", 
-                        "z_aug", "ly_sign", "bet_sign", "g_sign",
+                        "z_aug", "ly_sign", "bet_sign",
                         "Theta_cov", "Theta_var", "Psi_cov", "Psi_var", 
                         "Nu_free", "Alpha_free", "Tau_free", "log_lik", 
                         "log_lik_sat", "ppp")
-                    )
                     jagtrans$monitors <- c(jagtrans$monitors, moment_match_monitors[!(moment_match_monitors %in% jagtrans$monitors)])
                 }
                 if("data" %in% names(mcmcextra)){