updates

drizopoulos · May 26, 2024 · 6e8ccbd · 6e8ccbd
1 parent 1597542
commit 6e8ccbd
Show file tree

Hide file tree

Showing 14 changed files with 120 additions and 117 deletions.
diff --git a/R/basic_methods.R b/R/basic_methods.R
@@ -695,7 +695,7 @@ predict.jm <- function (object, newdata = NULL, newdata2 = NULL, times = NULL,
     if (is.null(con$cores)) {
         n <- if (!is.data.frame(newdata)) length(unique(newdata$newdataL[[id_var]]))
         else length(unique(newdata[[id_var]]))
-        cores <- if (n > 20) 4L else 1L
+        con$cores <- if (n > 20) 4L else 1L
     }
     components_newdata <-
         get_components_newdata(object, newdata, con$n_samples,
@@ -1221,7 +1221,7 @@ predict.jmList <- function (object, weights, newdata = NULL, newdata2 = NULL,
         if (is.data.frame(x)) attr(x, "mcmc") else x[["mcmc"]]
     }
     MCMC <- lapply(preds, extract_mcmc)
-    alp <- 1 - level
+    alp <- 1 - con$level
     if (is.list(MCMC[[1L]])) {
         n_outcomes <- length(MCMC[[1L]])
         pred_ <- qs <- vector("list", n_outcomes)

diff --git a/R/predict_funs.R b/R/predict_funs.R
@@ -907,8 +907,8 @@ predict_Event <- function (object, components_newdata, newdata, newdata2,
                  "maximum time to predict; redefine 'times' accordingly.")
         }
         if (times_per_id) {
-            g <- function (lt, tt, tm) c(lt, min(tt, tm))
-            times <- mapply2(g, lt = last_times, tt = times,
+            gg <- function (lt, tt, tm) c(lt, min(tt, tm))
+            times <- mapply2(gg, lt = last_times, tt = times,
                              MoreArgs = list(tm = t_max))
 
         } else {

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -12,7 +12,7 @@ articles:
   Super_Learning: Super_Learning.html
   Time_Varying_Effects: Time_Varying_Effects.html
   Transformation_Functions: Transformation_Functions.html
-last_built: 2024-05-25T18:21Z
+last_built: 2024-05-26T06:56Z
 urls:
   reference: https://drizopoulos.github.io/JMbayes2/reference
   article: https://drizopoulos.github.io/JMbayes2/articles

diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png
diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png
diff --git a/docs/reference/Rplot003.png b/docs/reference/Rplot003.png
diff --git a/docs/reference/Rplot004.png b/docs/reference/Rplot004.png
diff --git a/docs/reference/Rplot005.png b/docs/reference/Rplot005.png
diff --git a/docs/reference/Rplot006.png b/docs/reference/Rplot006.png
diff --git a/docs/reference/Rplot007.png b/docs/reference/Rplot007.png
diff --git a/docs/reference/Rplot008.png b/docs/reference/Rplot008.png
diff --git a/docs/reference/accuracy.html b/docs/reference/accuracy.html
diff --git a/docs/reference/jm.html b/docs/reference/jm.html
diff --git a/docs/reference/predict.html b/docs/reference/predict.html