fix robust fit measures (rmsea/cfi/tli) + rotation (lav_object_catml)

yrosseel · Aug 22, 2024 · 6e88668 · 6e88668
1 parent 56b8a11
commit 6e88668
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: lavaan
 Title: Latent Variable Analysis
-Version: 0.6-19.2180
+Version: 0.6-19.2184
 Authors@R: c(person(given   = "Yves", family = "Rosseel",
                     role    = c("aut", "cre"),
                     email   = "[email protected]",

diff --git a/R/lav_data.R b/R/lav_data.R
@@ -47,7 +47,7 @@ lavData <- function(data = NULL, # data.frame
 
   # allow empty categories of ordinal variable
   allow.empty.cell <- lavoptions$allow.empty.cell
-  
+
   # block.labels
   block.label <- character(0L)
   if (length(group.label) > 0L && length(level.label) == 0L) {
@@ -559,7 +559,7 @@ lav_data_full <- function(data = NULL, # data.frame
 
   # ensure allow.empty.cell is logical
   if (is.null(allow.empty.cell)) allow.empty.cell <- FALSE
-  
+
   # sampling weights
   if (!is.null(sampling.weights)) {
     if (is.character(sampling.weights)) {

diff --git a/R/lav_lavaan_step17_lavaan.R b/R/lav_lavaan_step17_lavaan.R
@@ -70,7 +70,9 @@ lav_lavaan_step17_lavaan <- function(lavmc = NULL,
       cat(" done.\n")
     }
     lavaan@ParTable$est.std <- std$est.std
-    lavaan@ParTable$se.std <- std$se
+	if (!is.null(std$se)) {
+      lavaan@ParTable$se.std <- std$se
+    }
   }
 
   # post-fitting check of parameters

diff --git a/R/lav_object_generate.R b/R/lav_object_generate.R
@@ -394,6 +394,11 @@ lav_object_catml <- function(lavobject = NULL) {
     partable.catml <- parTable(lavobject)
     rm.idx <- which(partable.catml$op %in% c("|", "~1"))
     partable.catml <- partable.catml[-rm.idx, ]
+	# never rotate (new in 0.6-19), as we only need fit measures
+	if (!is.null(partable.catml$efa)) {
+	  partable.catml$efa <- NULL
+      partable.catml$free <- partable.catml$free.unrotated
+	}
     partable.catml <- lav_partable_complete(partable.catml)
   } else {
     refit <- TRUE
@@ -402,6 +407,11 @@ lav_object_catml <- function(lavobject = NULL) {
     partable.catml$se <- NULL
     rm.idx <- which(partable.catml$op %in% c("|", "~1"))
     partable.catml <- partable.catml[-rm.idx, ]
+    # never rotate (new in 0.6-19), as we only need fit measures
+    if (!is.null(partable.catml$efa)) {
+      partable.catml$efa <- NULL
+      partable.catml$free <- partable.catml$free.unrotated
+    }
     partable.catml$ustart <- partable.catml$est
     for (b in seq_len(lavpta$nblocks)) {
       ov.names.num <- lavpta$vnames$ov.num[[b]]
@@ -464,7 +474,8 @@ lav_object_catml <- function(lavobject = NULL) {
   lavoptions$h1.information <- c("structured", "structured") # unlike DWLS
   lavoptions$se <- "none"
   lavoptions$test <- "standard" # always for now
-  lavoptions$baseline <- TRUE
+  lavoptions$rotation <- "none" # new in 0.6-19
+  lavoptions$baseline <- TRUE # also for RMSEA?
   if (!refit) {
     lavoptions$optim.method <- "none"
     lavoptions$optim.force.converged <- TRUE