improve warnings about non-diagonal/non-block covariance matrices

ecmerkle · Nov 2, 2023 · 2620a67 · 2620a67
1 parent b8ac94f
commit 2620a67
Show file tree

Hide file tree

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

diff --git a/R/blavaan.R b/R/blavaan.R
@@ -1096,11 +1096,12 @@ blavaan <- function(...,  # default lavaan arguments
         lavInspect(blavaan, "post.check")
     }
 
-    if( (target == "stan" && !l2s$blkpsi) ||
-        (target != "stan" && with(covres, !(diagpsi | fullpsi))) ) {
+    if( "psi" %in% lavpartable$mat &&
+        ( (target == "stan" && !l2s$blkpsi) ||
+          (target != "stan" && with(covres, !(diagpsi | fullpsi))) ) ) {
       warning("blavaan WARNING: As specified, the psi covariance matrix is neither diagonal nor unrestricted, so the actual prior might differ from the stated prior. See\n https://arxiv.org/abs/2301.08667", call. = FALSE)
     }
-    if( with(covres, !(diagthet | fullthet)) ) {
+    if( "theta" %in% lavpartable$mat && with(covres, !(diagthet | fullthet)) ) {
       warning("blavaan WARNING: As specified, the theta covariance matrix is neither diagonal nor unrestricted, so the actual prior might differ from the stated prior. See\n https://arxiv.org/abs/2301.08667", call. = FALSE)
     }