Be a bit more careful of ipred/pred solve

nlmixr2 · Jun 3, 2024 · 2fcdc43 · 2fcdc43
1 parent e32fb6e
commit 2fcdc43
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/R/validate.R b/R/validate.R
@@ -112,6 +112,8 @@
   } else {
     .ssRtol <- .rx$ssRtol
   }
+  .ipredSolve <- NULL
+  .predSolve <- NULL
   if (!is.null(.rx$nonmemData) && validate) {
     .nonmemData <- .rx$nonmemData
     .model <- .rx$simulationModelIwres
@@ -180,6 +182,7 @@
                                    addDosing = FALSE))
         .minfo("done")
       }
+      if (.doIpred && is.null(.ipredSolve)) .doIpred <- FALSE
       if (.doIpred && !inherits(.ipredSolve, "try-error")) {
         if (is.null(.rx$predDf)) {
           .w <- which(tolower(names(.ipredSolve)) == "y")
@@ -276,7 +279,7 @@
                                 ssAtol=.ssAtol, ssRtol=.ssRtol,
                                 addDosing = FALSE))
       .minfo("done")
-      if (!inherits(.predSolve, "try-error")) {
+      if (!is.null(.predSolve) && !inherits(.predSolve, "try-error")) {
         if (is.null(.rx$predDf)) {
           .w <- which(tolower(names(.predSolve)) == "y")
           .y <- names(.predSolve)[.w]