allow for both bounds= and rstarts= opion (github issue 411)

Author: yrosseel

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: lavaan
 Title: Latent Variable Analysis
-Version: 0.6-20.2262
+Version: 0.6-20.2263
 Authors@R: c(person(given   = "Yves", family = "Rosseel",
                     role    = c("aut", "cre"),
                     email   = "[email protected]",

R/lav_lavaan_step11_optim.R

@@ -228,15 +228,17 @@ lav_lavaan_step11_estoptim <- function(lavdata = NULL, # nolint
         }
 
         # pick best solution (if any)
-        x.noerror <- x.rstarts[!sapply(
-          x.rstarts,
-          inherits, "try-error"
-        )]
         x.converged <- vector("list", length = 0L)
         fx.rstarts <- numeric(0L)
-        if (length(x.noerror) > 0L) {
-          x.converged <-
-            x.noerror[sapply(x.rstarts, "attr", "converged")]
+        ok.flag <- sapply(x.rstarts, function(x) {
+            if (inherits(x, "try-error")) {
+              return(FALSE)
+            } else {
+              return(attr(x, "converged"))
+            }
+          })
+        if (sum(ok.flag) > 0L) {
+          x.converged <- x.rstarts[ok.flag]
         }
         if (length(x.converged) > 0L) {
           fx.rstarts <- sapply(x.converged, "attr", "fx")

R/lav_options_default.R

@@ -330,7 +330,7 @@ lav_options_default <- function() {
   elm("bounds", "none", chr = c(
     "none", "default", "standard", "user", "wide", "wide.zerovar", "pos.var",
     "pos.ov.var", "pos.lv.var"))      # new in 0.6-6
-  elm("rstarts", 0L, nm = "[0, 1000]", num2int = TRUE) # new in 0.6-18
+  elm("rstarts", 0L, nm = "[0, 10000]", num2int = TRUE) # new in 0.6-18
 
   # inference
   elm("se", "default", chr = c(

R/lav_partable_random.R

@@ -10,33 +10,33 @@ lav_partable_random <- function(lavpartable = NULL,
                                 # needed if we still need to compute bounds:
                                 lavh1 = NULL, lavdata = NULL,
                                 lavsamplestats = NULL, lavoptions = NULL) {
-  # check if we have bounds; if not, add them
+
   lavpta <- lav_partable_attributes(lavpartable)
-  if (is.null(lavpartable$lower) ||
-    is.null(lavpartable$upper)) {
-    lavoptions2 <- lavoptions
-    lavoptions2$bounds <- "standard"
-    lavoptions2$optim.bounds <-
-      list(
-        lower = c(
-          "ov.var", "lv.var", "loadings",
-          "covariances"
-        ),
-        upper = c(
-          "ov.var", "lv.var", "loadings",
-          "covariances"
-        ),
-        lower.factor = c(1.0, 1.0, 1.0, 0.999),
-        upper.factor = c(1.0, 1.0, 1.0, 0.999),
-        min.reliability.marker = 0.1,
-        min.var.lv.endo = 0.005
-      )
-    lavpartable <- lav_partable_add_bounds(
-      partable = lavpartable,
-      lavh1 = lavh1, lavdata = lavdata,
-      lavsamplestats = lavsamplestats, lavoptions = lavoptions2
+
+  # ALWAYS (recompute) bounds, as user may have provide other
+  # bounds (eg "pos.var") (0.6-20)
+  lavoptions2 <- lavoptions
+  lavoptions2$bounds <- "standard"
+  lavoptions2$optim.bounds <-
+    list(
+      lower = c(
+        "ov.var", "lv.var", "loadings",
+        "covariances"
+      ),
+      upper = c(
+        "ov.var", "lv.var", "loadings",
+        "covariances"
+      ),
+      lower.factor = c(1.0, 1.0, 1.0, 0.999),
+      upper.factor = c(1.0, 1.0, 1.0, 0.999),
+      min.reliability.marker = 0.1,
+      min.var.lv.endo = 0.005
     )
-  }
+  lavpartable <- lav_partable_add_bounds(
+    partable = lavpartable,
+    lavh1 = lavh1, lavdata = lavdata,
+    lavsamplestats = lavsamplestats, lavoptions = lavoptions2
+  )
 
   # replace -Inf/Inf by -1/1 * .Machine$double.eps (for runif)
   inf.idx <- which(lavpartable$lower < -1e+16)