From 6e5630a0df7e857697ff2ce4730a5f7f45b67377 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Sat, 26 Oct 2019 22:52:53 +0200 Subject: Fix checks and tests Static documentation rebuilt by pkgdown --- DESCRIPTION | 3 +- NAMESPACE | 1 + R/confint.mkinfit.R | 4 +- R/parms.mkinfit.R | 1 + _pkgdown.yml | 12 +- docs/news/index.html | 1 + docs/reference/confint.mkinfit.html | 252 +++++++++++++++++++++ docs/reference/index.html | 24 +- docs/reference/parms.html | 200 ++++++++++++++++ docs/sitemap.xml | 6 + man/confint.mkinfit.Rd | 6 +- man/parms.Rd | 4 +- test.log | 18 +- .../plotting/plot-errmod-with-sfo-lin-a-obs.svg | 12 +- tests/testthat/FOCUS_2006_D.csf | 2 +- 15 files changed, 513 insertions(+), 33 deletions(-) create mode 100644 docs/reference/confint.mkinfit.html create mode 100644 docs/reference/parms.html diff --git a/DESCRIPTION b/DESCRIPTION index 9efa2b89..88412fa8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,8 +17,7 @@ Description: Calculation routines based on the FOCUS Kinetics Report (2006, equation models are solved using compiled C functions. Please note that no warranty is implied for correctness of results or fitness for a particular purpose. -Imports: stats, graphics, methods, deSolve, R6, inline, parallel, plyr, - numDeriv +Imports: stats, graphics, methods, deSolve, R6, inline, parallel, numDeriv Suggests: knitr, rbenchmark, tikzDevice, testthat, rmarkdown, covr, vdiffr, benchmarkme, tibble License: GPL diff --git a/NAMESPACE b/NAMESPACE index b4b781ac..3718f45f 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -71,6 +71,7 @@ importFrom(stats,optimize) importFrom(stats,pt) importFrom(stats,qchisq) importFrom(stats,qf) +importFrom(stats,qnorm) importFrom(stats,qt) importFrom(stats,rnorm) importFrom(utils,write.table) diff --git a/R/confint.mkinfit.R b/R/confint.mkinfit.R index 58918321..58a3c8db 100644 --- a/R/confint.mkinfit.R +++ b/R/confint.mkinfit.R @@ -28,7 +28,9 @@ #' @examples #' f <- mkinfit("SFO", FOCUS_2006_C, quiet = TRUE) #' confint(f, method = "quadratic") -#' confint(f, method = "profile") +#' \dontrun{ +#' confint(f, method = "profile") +#' } #' @export confint.mkinfit <- function(object, parm, level = 0.95, alpha = 1 - level, diff --git a/R/parms.mkinfit.R b/R/parms.mkinfit.R index 8f9b4136..0628cb92 100644 --- a/R/parms.mkinfit.R +++ b/R/parms.mkinfit.R @@ -5,6 +5,7 @@ #' considering the error structure that was assumed for the fit. #' #' @param object A fitted model object +#' @param \dots Not used #' @return A numeric vector of fitted model parameters #' @export parms <- function(object, ...) diff --git a/_pkgdown.yml b/_pkgdown.yml index d51a7f27..bbf63301 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -17,13 +17,15 @@ reference: desc: Functions working with mkinfit objects contents: - plot.mkinfit + - parms.mkinfit + - confint.mkinfit - summary.mkinfit - - mkinresplot - - mkinparplot - - mkinerrplot - - endpoints - - mkinerrmin - logLik.mkinfit + - mkinresplot + - mkinparplot + - mkinerrplot + - endpoints + - mkinerrmin - title: Work with mmkin objects desc: Functions working with aggregated results contents: diff --git a/docs/news/index.html b/docs/news/index.html index 67f64150..1322f75d 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -134,6 +134,7 @@ mkin 0.9.49.6 (unreleased) Unreleased