From a7b8ec200358b6a331e76b3517c7ad21cc30346e Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 12 May 2020 11:06:48 +0200 Subject: Rerun tests and checks, CRAN comments --- check.log | 2 +- cran-comments.md | 5 +++++ docs/pkgdown.yml | 2 +- dumpdata.R | 7 ------- test.log | 10 +++++----- tests/testthat/FOCUS_2006_D.csf | 2 +- 6 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 cran-comments.md delete mode 100644 dumpdata.R diff --git a/check.log b/check.log index 99cb6f86..17413d04 100644 --- a/check.log +++ b/check.log @@ -5,7 +5,7 @@ * using options ‘--no-tests --as-cran’ * checking for file ‘mkin/DESCRIPTION’ ... OK * checking extension type ... Package -* this is package ‘mkin’ version ‘0.9.50.1’ +* this is package ‘mkin’ version ‘0.9.50.2’ * package encoding: UTF-8 * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers Maintainer: ‘Johannes Ranke ’ diff --git a/cran-comments.md b/cran-comments.md new file mode 100644 index 00000000..e630e0a8 --- /dev/null +++ b/cran-comments.md @@ -0,0 +1,5 @@ +Update of yesterdays release, addressing a platform specific test outcome on Solaris that +was revealed by the CRAN checks. + +This update also fixes a number of spelling errors that were found with the help of +devtools::spell_check(). diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 0dfcf9e1..15b8ca37 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -10,7 +10,7 @@ articles: NAFTA_examples: web_only/NAFTA_examples.html benchmarks: web_only/benchmarks.html compiled_models: web_only/compiled_models.html -last_built: 2020-05-12T08:55Z +last_built: 2020-05-12T09:06Z urls: reference: https://pkgdown.jrwb.de/mkin/reference article: https://pkgdown.jrwb.de/mkin/articles diff --git a/dumpdata.R b/dumpdata.R deleted file mode 100644 index 881df526..00000000 --- a/dumpdata.R +++ /dev/null @@ -1,7 +0,0 @@ -mkinpredict <- -function (x, odeparms, odeini, outtimes = seq(0, 120, by = 0.10000000000000001), - solution_type = "deSolve", use_compiled = "auto", method.ode = "lsoda", - atol = 1e-08, rtol = 1e-10, map_output = TRUE, ...) -{ - UseMethod("mkinpredict", x) -} diff --git a/test.log b/test.log index 94603b7f..ffd374e4 100644 --- a/test.log +++ b/test.log @@ -8,14 +8,14 @@ Testing mkin ✔ | 5 | Analytical solutions for coupled models [3.0 s] ✔ | 5 | Calculation of Akaike weights ✔ | 10 | Confidence intervals and p-values [1.0 s] -✔ | 14 | Error model fitting [3.9 s] +✔ | 14 | Error model fitting [3.7 s] ✔ | 4 | Test fitting the decline of metabolites from their maximum [0.2 s] ✔ | 1 | Fitting the logistic model [0.2 s] ✔ | 1 | Test dataset class mkinds used in gmkin ✔ | 12 | Special cases of mkinfit calls [0.6 s] ✔ | 8 | mkinmod model generation and printing [0.2 s] -✔ | 3 | Model predictions with mkinpredict [0.4 s] -✔ | 16 | Evaluations according to 2015 NAFTA guidance [1.4 s] +✔ | 3 | Model predictions with mkinpredict [0.3 s] +✔ | 16 | Evaluations according to 2015 NAFTA guidance [1.3 s] ✔ | 9 | Nonlinear mixed-effects models [7.5 s] ✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s] ✔ | 3 | Summary @@ -25,10 +25,10 @@ Testing mkin ✔ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.4 s] ✔ | 1 | Summaries of old mkinfit objects ✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.3 s] -✔ | 9 | Hypothesis tests [6.5 s] +✔ | 9 | Hypothesis tests [6.6 s] ══ Results ═════════════════════════════════════════════════════════════════════ -Duration: 37.3 s +Duration: 37.2 s OK: 159 Failed: 0 diff --git a/tests/testthat/FOCUS_2006_D.csf b/tests/testthat/FOCUS_2006_D.csf index c0c5c10c..6b23d445 100644 --- a/tests/testthat/FOCUS_2006_D.csf +++ b/tests/testthat/FOCUS_2006_D.csf @@ -5,7 +5,7 @@ Description: MeasurementUnits: % AR TimeUnits: days Comments: Created using mkin::CAKE_export -Date: 2020-05-11 +Date: 2020-05-12 Optimiser: IRLS [Data] -- cgit v1.2.1