From 82c8b014c537c0634615c3c007aa4a3fa672307f Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 9 Nov 2020 09:24:34 +0100 Subject: Doc improvements --- R/summary.saem.mmkin.R | 1 + docs/dev/pkgdown.yml | 2 +- docs/dev/reference/summary.saem.mmkin.html | 11 ++++++----- man/summary.saem.mmkin.Rd | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/R/summary.saem.mmkin.R b/R/summary.saem.mmkin.R index a8917144..75fdb045 100644 --- a/R/summary.saem.mmkin.R +++ b/R/summary.saem.mmkin.R @@ -25,6 +25,7 @@ #' \item{data}{The data} #' \item{confint_trans}{Transformed parameters as used in the optimisation, with confidence intervals} #' \item{confint_back}{Backtransformed parameters, with confidence intervals if available} +#' \item{confint_errmod}{Error model parameters with confidence intervals} #' \item{ff}{The estimated formation fractions derived from the fitted #' model.} #' \item{distimes}{The DT50 and DT90 values for each observed variable.} diff --git a/docs/dev/pkgdown.yml b/docs/dev/pkgdown.yml index 0b40dd02..a8bb6144 100644 --- a/docs/dev/pkgdown.yml +++ b/docs/dev/pkgdown.yml @@ -10,7 +10,7 @@ articles: web_only/NAFTA_examples: NAFTA_examples.html web_only/benchmarks: benchmarks.html web_only/compiled_models: compiled_models.html -last_built: 2020-11-09T08:10Z +last_built: 2020-11-09T08:23Z urls: reference: https://pkgdown.jrwb.de/mkin/reference article: https://pkgdown.jrwb.de/mkin/articles diff --git a/docs/dev/reference/summary.saem.mmkin.html b/docs/dev/reference/summary.saem.mmkin.html index 75ede09f..e718806e 100644 --- a/docs/dev/reference/summary.saem.mmkin.html +++ b/docs/dev/reference/summary.saem.mmkin.html @@ -208,6 +208,7 @@ produced

data

The data

confint_trans

Transformed parameters as used in the optimisation, with confidence intervals

confint_back

Backtransformed parameters, with confidence intervals if available

+
confint_errmod

Error model parameters with confidence intervals

ff

The estimated formation fractions derived from the fitted model.

distimes

The DT50 and DT90 values for each observed variable.

@@ -258,15 +259,15 @@ saemix authors for the parts inherited from saemix.

f_mmkin_dfop_sfo <- mmkin(list(dfop_sfo), ds_syn_dfop_sfo, quiet = TRUE, error_model = "tc", cores = 5) f_saem_dfop_sfo <- saem(f_mmkin_dfop_sfo)
#> Running main SAEM algorithm -#> [1] "Mon Nov 9 09:11:04 2020" +#> [1] "Mon Nov 9 09:24:08 2020" #> .... #> Minimisation finished -#> [1] "Mon Nov 9 09:11:16 2020"
summary(f_saem_dfop_sfo, data = TRUE) +#> [1] "Mon Nov 9 09:24:21 2020"
summary(f_saem_dfop_sfo, data = TRUE)
#> saemix version used for fitting: 3.1.9000 #> mkin version used for pre-fitting: 0.9.50.4 #> R version used for fitting: 4.0.3 -#> Date of fit: Mon Nov 9 09:11:17 2020 -#> Date of summary: Mon Nov 9 09:11:17 2020 +#> Date of fit: Mon Nov 9 09:24:22 2020 +#> Date of summary: Mon Nov 9 09:24:22 2020 #> #> Equations: #> d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * exp(-k2 * @@ -281,7 +282,7 @@ saemix authors for the parts inherited from saemix.

#> #> Model predictions using solution type analytical #> -#> Fitted in 13.497 s using 300, 100 iterations +#> Fitted in 13.457 s using 300, 100 iterations #> #> Variance model: Two-component variance function #> diff --git a/man/summary.saem.mmkin.Rd b/man/summary.saem.mmkin.Rd index 828691e6..f3e3fde3 100644 --- a/man/summary.saem.mmkin.Rd +++ b/man/summary.saem.mmkin.Rd @@ -37,6 +37,7 @@ produced} \item{data}{The data} \item{confint_trans}{Transformed parameters as used in the optimisation, with confidence intervals} \item{confint_back}{Backtransformed parameters, with confidence intervals if available} +\item{confint_errmod}{Error model parameters with confidence intervals} \item{ff}{The estimated formation fractions derived from the fitted model.} \item{distimes}{The DT50 and DT90 values for each observed variable.} -- cgit v1.2.3