allow for all-zero Sigma if multilevel, and level > 1

Author: yrosseel

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: lavaan
 Title: Latent Variable Analysis
-Version: 0.6-22.2517
+Version: 0.6-22.2520
 Authors@R: c(person(given   = "Yves", family = "Rosseel",
                     role    = c("aut", "cre"),
                     email   = "Yves.Rosseel@UGent.be",

R/lav_graph.R

@@ -325,7 +325,7 @@ lav_graph_topological_matrix <- function(
   if (topborderfixed) addrows <- 1L
   if (bottomborderfixed) addrows <- 2L
   rowmax <- max(colmax, colmax[1L] + addrows, colmax[length(colmax)] + addrows)
-  if (addrows > 0L) { # adapt rows for nodes in maxrow and inner columns   
+  if (addrows > 0L) { # adapt rows for nodes in maxrow and inner columns
     welke <- which(rvcol > 1L & rvcol < length(colmax) & rvrow == max(colmax))
     rvrow[welke] <- rowmax
   }

R/lav_model_loglik.R

@@ -41,6 +41,10 @@ lav_model_loglik <- function(lavdata = NULL,
   # catch all-zero Sigma (new in 0.6-20)
   nblocks <- lavmodel@nblocks
   for (b in seq_len(nblocks)) {
+    # except for level-2, where Sigma could be all zero (0.6-22)
+    if (lavdata@nlevels > 1L && ((b %% lavdata@nlevels) != 1)) {
+      next
+    }
     if (lavmodel@conditional.x) {
       if (all(lavimplied$res.cov[[b]] == 0)) {
         logl.ok <- FALSE