diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2022-10-25 10:35:39 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2022-10-25 10:35:39 +0200 |
| commit | e514f8235ee5398da5c5c83d472ca99dd5324066 (patch) | |
| tree | e096590d36e900d8b087ba5282624474b770d05a /R | |
| parent | 5ac21a5495d984eb6a281973211b2b79a78cda82 (diff) | |
Complete documentation and fix a bug
The bug was introduced by the changes in summary.saem.mmkin.R and
surfaced in the tests when using saemix transformations.
Diffstat (limited to 'R')
| -rw-r--r-- | R/anova.saem.mmkin.R | 4 | ||||
| -rw-r--r-- | R/saem.R | 1 | ||||
| -rw-r--r-- | R/summary.saem.mmkin.R | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/R/anova.saem.mmkin.R b/R/anova.saem.mmkin.R index e88561b9..9937a919 100644 --- a/R/anova.saem.mmkin.R +++ b/R/anova.saem.mmkin.R @@ -13,7 +13,9 @@ #' the alternative models are tested against the first model. Should #' only be done for nested models. #' @param model.names Optional character vector of model names -#' @importFrom stats anova logLik update +#' @importFrom stats anova logLik update pchisq terms +#' @importFrom methods is +#' @importFrom utils capture.output #' @export #' @return an "anova" data frame; the traditional (S3) result of anova() anova.saem.mmkin <- function(object, ..., @@ -723,6 +723,7 @@ saemix_data <- function(object, covariates = NULL, verbose = FALSE, ...) { #' logLik method for saem.mmkin objects #' #' @param object The fitted [saem.mmkin] object +#' @param \dots Passed to [saemix::logLik.SaemixObject] #' @param method Passed to [saemix::logLik.SaemixObject] #' @export logLik.saem.mmkin <- function(object, ..., method = c("lin", "is", "gq")) { diff --git a/R/summary.saem.mmkin.R b/R/summary.saem.mmkin.R index c66294ab..651cc29e 100644 --- a/R/summary.saem.mmkin.R +++ b/R/summary.saem.mmkin.R @@ -132,7 +132,7 @@ summary.saem.mmkin <- function(object, data = FALSE, verbose = FALSE, distimes = } } } else { - confint_back <- confint_trans + confint_back <- confint_trans[names_fixed_effects, ] } # Correlation of fixed effects (inspired by summary.nlme) @@ -210,6 +210,7 @@ print.summary.saem.mmkin <- function(x, digits = max(3, getOption("digits") - 3) cat("Using", paste(x$so@options$nbiter.saemix, collapse = ", "), "iterations and", x$so@options$nb.chains, "chains\n") + cat("\nVariance model: ") cat(switch(x$err_mod, const = "Constant variance", obs = "Variance unique to each observed variable", |