From cf54ccca37d27480dbf8d59eb027300518f7ad75 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Fri, 19 May 2023 17:08:43 +0200 Subject: Prepare release of v1.2.4 - Update DESCRIPTION - Update Makefile to document how to use R-patched - Remove markup from two URLs to avoid CRAN NOTE - Switch two vignettes from html_document to html_vignette to save space in the docs directory, also avoiding a CRAN NOTE - Complete rebuild of pkgdown docs for release --- vignettes/FOCUS_D.html | 16 +- vignettes/FOCUS_L.html | 1964 ++++++-------------------------- vignettes/FOCUS_L.rmd | 7 +- vignettes/mkin.html | 1952 ++++++------------------------- vignettes/mkin.rmd | 10 +- vignettes/web_only/mkin_benchmarks.rda | Bin 1864 -> 1922 bytes vignettes/web_only/saem_benchmarks.rda | Bin 772 -> 855 bytes 7 files changed, 721 insertions(+), 3228 deletions(-) (limited to 'vignettes') diff --git a/vignettes/FOCUS_D.html b/vignettes/FOCUS_D.html index 43c4f1fa..d27b4767 100644 --- a/vignettes/FOCUS_D.html +++ b/vignettes/FOCUS_D.html @@ -358,7 +358,7 @@ pre code {

Example evaluation of FOCUS Example Dataset D

Johannes Ranke

-

Last change 31 January 2019 (rebuilt 2023-02-17)

+

Last change 31 January 2019 (rebuilt 2023-05-18)

@@ -434,8 +434,8 @@ be compiled from auto-generated C code.

We do the fitting without progress report (quiet = TRUE).

fit <- mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE)
-
## Warning in mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE): Observations with value
-## of zero were removed from the data
+
## Warning in mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE): Observations with
+## value of zero were removed from the data

A plot of the fit including a residual plot for both observed variables is obtained using the plot_sep method for mkinfit objects, which shows separate graphs for all @@ -449,10 +449,10 @@ the mkinparplot function.

A comprehensive report of the results is obtained using the summary method for mkinfit objects.

summary(fit)
-
## mkin version used for fitting:    1.2.2 
-## R version used for fitting:       4.2.2 
-## Date of fit:     Fri Feb 17 20:04:31 2023 
-## Date of summary: Fri Feb 17 20:04:31 2023 
+
## mkin version used for fitting:    1.2.4 
+## R version used for fitting:       4.3.0 
+## Date of fit:     Thu May 18 11:39:03 2023 
+## Date of summary: Thu May 18 11:39:03 2023 
 ## 
 ## Equations:
 ## d_parent/dt = - k_parent * parent
@@ -460,7 +460,7 @@ the mkinparplot function.

## ## Model predictions using solution type analytical ## -## Fitted using 401 model solutions performed in 0.048 s +## Fitted using 401 model solutions performed in 0.053 s ## ## Error model: Constant variance ## diff --git a/vignettes/FOCUS_L.html b/vignettes/FOCUS_L.html index ed150c0a..bd1fa16e 100644 --- a/vignettes/FOCUS_L.html +++ b/vignettes/FOCUS_L.html @@ -8,1299 +8,26 @@ + - - - -Example evaluation of FOCUS Laboratory Data L1 to L3 - - - - - - - - - - - - - - - - - - +@media print { +pre > code.sourceCode { white-space: pre-wrap; } +pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; } +} +pre.numberSource code + { counter-reset: source-line 0; } +pre.numberSource code > span + { position: relative; left: -4em; counter-increment: source-line; } +pre.numberSource code > span > a:first-child::before + { content: counter(source-line); + position: relative; left: -1em; text-align: right; vertical-align: baseline; + border: none; display: inline-block; + -webkit-touch-callout: none; -webkit-user-select: none; + -khtml-user-select: none; -moz-user-select: none; + -ms-user-select: none; user-select: none; + padding: 0 4px; width: 4em; + color: #aaaaaa; + } +pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa; padding-left: 4px; } +div.sourceCode + { } +@media screen { +pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; } +} +code span.al { color: #ff0000; font-weight: bold; } /* Alert */ +code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */ +code span.at { color: #7d9029; } /* Attribute */ +code span.bn { color: #40a070; } /* BaseN */ +code span.bu { color: #008000; } /* BuiltIn */ +code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */ +code span.ch { color: #4070a0; } /* Char */ +code span.cn { color: #880000; } /* Constant */ +code span.co { color: #60a0b0; font-style: italic; } /* Comment */ +code span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */ +code span.do { color: #ba2121; font-style: italic; } /* Documentation */ +code span.dt { color: #902000; } /* DataType */ +code span.dv { color: #40a070; } /* DecVal */ +code span.er { color: #ff0000; font-weight: bold; } /* Error */ +code span.ex { } /* Extension */ +code span.fl { color: #40a070; } /* Float */ +code span.fu { color: #06287e; } /* Function */ +code span.im { color: #008000; font-weight: bold; } /* Import */ +code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */ +code span.kw { color: #007020; font-weight: bold; } /* Keyword */ +code span.op { color: #666666; } /* Operator */ +code span.ot { color: #007020; } /* Other */ +code span.pp { color: #bc7a00; } /* Preprocessor */ +code span.sc { color: #4070a0; } /* SpecialChar */ +code span.ss { color: #bb6688; } /* SpecialString */ +code span.st { color: #4070a0; } /* String */ +code span.va { color: #19177c; } /* Variable */ +code span.vs { color: #4070a0; } /* VerbatimString */ +code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */ + + @@ -1350,206 +169,234 @@ div.csl-indent { } - - - - - - - - - - - - - - - - + -
- - - -
-
-
-
-
- -
- - - - -