diff options
| -rw-r--r-- | DESCRIPTION | 6 | ||||
| -rw-r--r-- | build.log | 2 | ||||
| -rw-r--r-- | check.log | 19 | ||||
| -rw-r--r-- | man/dimethenamid_2018.Rd | 4 | ||||
| -rw-r--r-- | test.log | 16 | ||||
| -rw-r--r-- | tests/testthat/test_f_time_norm.R | 2 | 
6 files changed, 21 insertions, 28 deletions
| diff --git a/DESCRIPTION b/DESCRIPTION index f5b7f070..8450ead0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@  Package: mkin  Type: Package  Title: Kinetic Evaluation of Chemical Degradation Data -Version: 1.0.4 -Date: 2021-04-20 +Version: 1.0.5 +Date: 2021-09-15  Authors@R: c(    person("Johannes", "Ranke", role = c("aut", "cre", "cph"),      email = "jranke@uni-bremen.de", @@ -31,4 +31,4 @@ VignetteBuilder: knitr  BugReports: https://github.com/jranke/mkin/issues/  URL: https://pkgdown.jrwb.de/mkin/  Roxygen: list(markdown = TRUE) -RoxygenNote: 7.1.1 +RoxygenNote: 7.1.2 @@ -6,5 +6,5 @@  * creating vignettes ... OK  * checking for LF line-endings in source and make files and shell scripts  * checking for empty or unneeded directories -* building ‘mkin_1.0.4.tar.gz’ +* building ‘mkin_1.0.5.tar.gz’ @@ -1,16 +1,14 @@  * using log directory ‘/home/jranke/git/mkin/mkin.Rcheck’ -* using R version 4.0.5 (2021-03-31) +* using R version 4.1.1 (2021-08-10)  * using platform: x86_64-pc-linux-gnu (64-bit)  * using session charset: UTF-8  * using options ‘--no-tests --as-cran’  * checking for file ‘mkin/DESCRIPTION’ ... OK  * checking extension type ... Package -* this is package ‘mkin’ version ‘1.0.4’ +* this is package ‘mkin’ version ‘1.0.5’  * package encoding: UTF-8 -* checking CRAN incoming feasibility ... NOTE +* checking CRAN incoming feasibility ... Note_to_CRAN_maintainers  Maintainer: ‘Johannes Ranke <jranke@uni-bremen.de>’ - -The Date field is over a month old.  * checking package namespace information ... OK  * checking package dependencies ... OK  * checking if this is a source package ... OK @@ -43,9 +41,7 @@ The Date field is over a month old.  * checking S3 generic/method consistency ... OK  * checking replacement functions ... OK  * checking foreign function calls ... OK -* checking R code for possible problems ... NOTE -mmkin: possible error in Sys.info("sysname"): unused argument -  ("sysname") +* checking R code for possible problems ... OK  * checking Rd files ... OK  * checking Rd metadata ... OK  * checking Rd line widths ... OK @@ -57,6 +53,7 @@ mmkin: possible error in Sys.info("sysname"): unused argument  * checking for unstated dependencies in examples ... OK  * checking contents of ‘data’ directory ... OK  * checking data for non-ASCII characters ... OK +* checking LazyData ... OK  * checking data for ASCII and uncompressed saves ... OK  * checking installed files from ‘inst/doc’ ... OK  * checking files in ‘vignettes’ ... OK @@ -71,9 +68,5 @@ mmkin: possible error in Sys.info("sysname"): unused argument  * checking for detritus in the temp directory ... OK  * DONE -Status: 2 NOTEs -See -  ‘/home/jranke/git/mkin/mkin.Rcheck/00check.log’ -for details. - +Status: OK diff --git a/man/dimethenamid_2018.Rd b/man/dimethenamid_2018.Rd index b6f761e8..6c251363 100644 --- a/man/dimethenamid_2018.Rd +++ b/man/dimethenamid_2018.Rd @@ -5,13 +5,13 @@  \alias{dimethenamid_2018}  \title{Aerobic soil degradation data on dimethenamid and dimethenamid-P from the EU assessment in 2018}  \format{ -An \link{mkindsg} object grouping eight datasets with some meta information +An \link{mkindsg} object grouping seven datasets with some meta information  }  \source{  Rapporteur Member State Germany, Co-Rapporteur Member State Bulgaria (2018)  Renewal Assessment Report Dimethenamid-P Volume 3 - B.8 Environmental fate and behaviour  Rev. 2 - November 2017 -\url{http://registerofquestions.efsa.europa.eu/roqFrontend/outputLoader?output=ON-5211} +\url{https://open.efsa.europa.eu/study-inventory/EFSA-Q-2014-00716}  }  \usage{  dimethenamid_2018 @@ -7,7 +7,7 @@ Loading required package: parallel  ✔ |   5       | Calculation of Akaike weights  ✔ |   2       | Export dataset for reading into CAKE  ✔ |  12       | Confidence intervals and p-values [1.3 s] -✔ |  14       | Error model fitting [4.2 s] +✔ |  14       | Error model fitting [4.0 s]  ✔ |   5       | Time step normalisation  ✔ |   4       | Calculation of FOCUS chi2 error levels [0.5 s]  ✔ |  14       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [0.7 s] @@ -19,19 +19,19 @@ Loading required package: parallel  ✔ |   1       | mkinfit features [0.3 s]  ✔ |   8       | mkinmod model generation and printing [0.2 s]  ✔ |   3       | Model predictions with mkinpredict [0.3 s] -✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.4 s] -✔ |   9       | Nonlinear mixed-effects models [7.9 s] +✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.3 s] +✔ |   9       | Nonlinear mixed-effects models [7.7 s]  ✔ |  14       | Plotting [1.1 s]  ✔ |   4       | Residuals extracted from mkinfit models -✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5 s] -✔ |   7       | Fitting the SFORB model [3.7 s] +✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.4 s] +✔ |   7       | Fitting the SFORB model [3.4 s]  ✔ |   1       | Summaries of old mkinfit objects  ✔ |   4       | Summary [0.1 s] -✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.2 s] +✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.1 s]  ✔ |   9       | Hypothesis tests [8.0 s] -✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s] +✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.2 s]  ══ Results ═════════════════════════════════════════════════════════════════════ -Duration: 40.3 s +Duration: 39.0 s  [ FAIL 0 | WARN 0 | SKIP 0 | PASS 174 ] diff --git a/tests/testthat/test_f_time_norm.R b/tests/testthat/test_f_time_norm.R index ca2ebd99..c5e0607c 100644 --- a/tests/testthat/test_f_time_norm.R +++ b/tests/testthat/test_f_time_norm.R @@ -13,7 +13,7 @@ test_that("Time step normalisation for a dataset works", {    # Reference values from Dimethenamid RAR 2018 Vol3 B.8    expect_equal(round(dimethenamid_2018$f_time_norm, 3),       c(1, -      rep(0.971, 2),                   # p. 56 +      0.971,                           # p. 56        rep(round(1.329 * 0.924, 3), 2), # p. 51        0.623, 0.768, 0.673)             # p. 45    ) | 
