From d8f31d1323998f33d07535f55c81be380d93ca45 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 9 Feb 2022 12:19:14 +0100 Subject: Adapt saemix interface to saemix 3.0 on CRAN --- tests/testthat/setup_script.R | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'tests/testthat/setup_script.R') diff --git a/tests/testthat/setup_script.R b/tests/testthat/setup_script.R index cb3713aa..693a2a25 100644 --- a/tests/testthat/setup_script.R +++ b/tests/testthat/setup_script.R @@ -198,18 +198,8 @@ nlme_biphasic <- nlme(mmkin_biphasic) if (saemix_available) { sfo_saem_1 <- saem(mmkin_sfo_1, quiet = TRUE, transformations = "saemix") - # With default control parameters, we do not get good results with mkin - # transformations here - dfop_saemix_1 <- saem(mmkin_dfop_1, quiet = TRUE, transformations = "mkin", - control = list( - displayProgress = FALSE, print = FALSE, save = FALSE, save.graphs = FALSE, - rw.init = 1, nbiter.saemix = c(600, 100)) - ) - dfop_saemix_2 <- saem(mmkin_dfop_1, quiet = TRUE, transformations = "saemix", - control = list( - displayProgress = FALSE, print = FALSE, save = FALSE, save.graphs = FALSE, - rw.init = 0.5, nbiter.saemix = c(600, 100)) - ) + dfop_saemix_1 <- saem(mmkin_dfop_1, quiet = TRUE, transformations = "mkin") + dfop_saemix_2 <- saem(mmkin_dfop_1, quiet = TRUE, transformations = "saemix") saem_biphasic_m <- saem(mmkin_biphasic, transformations = "mkin", quiet = TRUE) saem_biphasic_s <- saem(mmkin_biphasic, transformations = "saemix", quiet = TRUE) -- cgit v1.2.1