From 0389d523f049945c85eba42d4a006523595043f0 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 4 Nov 2022 07:48:04 +0100 Subject: Never fail with errors in saem.mmkin I think it is always preferable to be able to investigate the saemix object returned. --- R/saem.R | 6 ------ log/check.log | 10 ++-------- man/saem.Rd | 4 ---- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/R/saem.R b/R/saem.R index 440a187d..1c54ed93 100644 --- a/R/saem.R +++ b/R/saem.R @@ -45,8 +45,6 @@ utils::globalVariables(c("predicted", "std")) #' @param covariate_models A list containing linear model formulas with one explanatory #' variable, i.e. of the type 'parameter ~ covariate'. Covariates must be available #' in the 'covariates' data frame. -#' @param fail_with_errors Should a failure to compute standard errors -#' from the inverse of the Fisher Information Matrix be a failure? #' @param quiet Should we suppress the messages saemix prints at the beginning #' and the end of the optimisation process? #' @param nbiter.saemix Convenience option to increase the number of @@ -145,7 +143,6 @@ saem.mmkin <- function(object, control = list(displayProgress = FALSE, print = FALSE, nbiter.saemix = nbiter.saemix, save = FALSE, save.graphs = FALSE), - fail_with_errors = TRUE, verbose = FALSE, quiet = FALSE, ...) { call <- match.call() @@ -177,9 +174,6 @@ saem.mmkin <- function(object, if (any(is.na(c(f_saemix@results@se.omega, f_saemix@results@se.respar)))) { FIM_failed <- c(FIM_failed, "random effects and error model parameters") } - if (!is.null(FIM_failed) & fail_with_errors) { - stop("Could not invert FIM for ", paste(FIM_failed, collapse = " and ")) - } transparms_optim <- f_saemix@results@fixed.effects names(transparms_optim) <- f_saemix@results@name.fixed diff --git a/log/check.log b/log/check.log index 4092108e..3fea2ec6 100644 --- a/log/check.log +++ b/log/check.log @@ -7,10 +7,8 @@ * checking extension type ... Package * this is package ‘mkin’ version ‘1.2.0’ * package encoding: UTF-8 -* checking CRAN incoming feasibility ... NOTE +* checking CRAN incoming feasibility ... Note_to_CRAN_maintainers Maintainer: ‘Johannes Ranke ’ - -The Date field is over a month old. * checking package namespace information ... OK * checking package dependencies ... OK * checking if this is a source package ... OK @@ -71,9 +69,5 @@ The Date field is over a month old. * checking for detritus in the temp directory ... OK * DONE -Status: 1 NOTE -See - ‘/home/jranke/git/mkin/mkin.Rcheck/00check.log’ -for details. - +Status: OK diff --git a/man/saem.Rd b/man/saem.Rd index 9167b51f..3dc8001a 100644 --- a/man/saem.Rd +++ b/man/saem.Rd @@ -26,7 +26,6 @@ saem(object, ...) nbiter.saemix = c(300, 100), control = list(displayProgress = FALSE, print = FALSE, nbiter.saemix = nbiter.saemix, save = FALSE, save.graphs = FALSE), - fail_with_errors = TRUE, verbose = FALSE, quiet = FALSE, ... @@ -102,9 +101,6 @@ iterations} \item{control}{Passed to \link[saemix:saemix]{saemix::saemix}.} -\item{fail_with_errors}{Should a failure to compute standard errors -from the inverse of the Fisher Information Matrix be a failure?} - \item{verbose}{Should we print information about created objects of type \link[saemix:SaemixModel-class]{saemix::SaemixModel} and \link[saemix:SaemixData-class]{saemix::SaemixData}?} -- cgit v1.2.1