Merge pull request #365 from TDJorgensen/master

fix scaled.test= issue reported by Njal
yrosseel · Jun 28, 2024 · 73ecb27 · 73ecb27
2 parents 65d1a5c + fd8d918
commit 73ecb27
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/R/lav_options.R b/R/lav_options.R
@@ -860,9 +860,14 @@ lav_options_set <- function(opt = NULL) {                     # nolint
       opt$test <- unique(c(opt$scaled.test, opt$test))
     }
 
-    # make sure "standard" comes first
+    # where does "standard" appear in the opt$test vector?
     standard.idx <- which(opt$test == "standard")[1]
-    if (length(standard.idx) > 0L && standard.idx != 1L) {
+    if (is.na(standard.idx)) {
+      # "standard" is not in the opt$test vector at all,
+      # so add it
+      opt$test <- c("standard", opt$test)
+    } else if (length(standard.idx) > 0L && standard.idx != 1L) {
+      # make sure "standard" comes first
       opt$test <- c("standard", opt$test[-standard.idx])
     }
   }

diff --git a/R/lav_test_satorra_bentler.R b/R/lav_test_satorra_bentler.R
@@ -351,8 +351,9 @@ lav_test_satorra_bentler <- function(lavobject = NULL,
     # scaling factor
     fg <- unlist(lavsamplestats@nobs) / lavsamplestats@ntotal
     a <- sqrt(df.scaled / trace.UGamma2)
+    if (isTRUE(a < 0) || is.nan(a)) a <- as.numeric(NA)
     scaling.factor <- 1 / a
-    if (scaling.factor < 0) scaling.factor <- as.numeric(NA)
+    if (isTRUE(scaling.factor < 0)) scaling.factor <- as.numeric(NA)
 
     if (ug2.old.approach) {
       # scaling factor