diff --git a/R/mvgam_setup.R b/R/mvgam_setup.R index 0f50c584..ae390e72 100644 --- a/R/mvgam_setup.R +++ b/R/mvgam_setup.R @@ -15,9 +15,13 @@ mvgam_setup <- function(formula, suppressWarnings(mgcv::gam(formula(formula), data = dat, family = family, - control = list(maxit = maxit, - epsilon = 5, - newton = list(conv.tol = 5)), + optimizer = c('outer', 'nlm'), + control = list(maxit = 1, + epsilon = 1e20, + rank.tol = 1, + mgcv.tol = 1e20, + mgcv.half = 1, + nlm = list(iterlim = 1)), drop.unused.levels = FALSE, na.action = na.fail, select = TRUE)) @@ -26,9 +30,13 @@ mvgam_setup <- function(formula, data = dat, family = family, knots = knots, - control = list(maxit = maxit, - epsilon = 5, - newton = list(conv.tol = 5)), + optimizer = c('outer', 'nlm'), + control = list(maxit = 1, + epsilon = 1e20, + rank.tol = 1, + mgcv.tol = 1e20, + mgcv.half = 1, + nlm = list(iterlim = 1)), drop.unused.levels = FALSE, na.action = na.fail, select = TRUE)) diff --git a/src/mvgam.dll b/src/mvgam.dll index db897962..72691a66 100644 Binary files a/src/mvgam.dll and b/src/mvgam.dll differ diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf index 1621b976..d26ba468 100644 Binary files a/tests/testthat/Rplots.pdf and b/tests/testthat/Rplots.pdf differ