From ce7a20e54d8005264f13d3e9fe0c99f84d20b85e Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 4 Nov 2022 10:54:43 +0100 Subject: Make illparms.mhmkin and anova.saem.mmkin more robust --- R/anova.saem.mmkin.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'R/anova.saem.mmkin.R') diff --git a/R/anova.saem.mmkin.R b/R/anova.saem.mmkin.R index e506fb8b..00ddc0c3 100644 --- a/R/anova.saem.mmkin.R +++ b/R/anova.saem.mmkin.R @@ -30,9 +30,10 @@ anova.saem.mmkin <- function(object, ..., is_model <- sapply(dots, is, "saem.mmkin") if (any(is_model)) { mods <- c(list(object), dots[is_model]) + successful <- sapply(mods, function(x) !inherits(x$so, "try-error")) # Ensure same data, ignoring covariates - same_data <- sapply(dots[is_model], function(x) { + same_data <- sapply(mods[successful], function(x) { identical(object$data[c("ds", "name", "time", "value")], x$data[c("ds", "name", "time", "value")]) }) @@ -56,7 +57,7 @@ anova.saem.mmkin <- function(object, ..., } names(mods) <- model.names - llks <- lapply(model.names, function(x) { + llks <- lapply(model.names[successful], function(x) { llk <- try(logLik(mods[[x]], method = method)) if (inherits(llk, "try-error")) stop("Could not obtain log likelihood with '", method, "' method for ", x) -- cgit v1.2.1