diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | DESCRIPTION | 2 | ||||
| -rw-r--r-- | log/test.log | 34 |
4 files changed, 19 insertions, 19 deletions
@@ -33,3 +33,4 @@ vignettes/prebuilt/*_cache vignettes/prebuilt/*_files vignettes/prebuilt/*_dlls .Rproj.user +.Rhistory diff --git a/.travis.yml b/.travis.yml index ec904005..f6beb25b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ before_install: install: - ./run.sh install_all - - ./run.sh install_github jranke/saemixextension@installable_dev_version script: - travis_wait 30 ./run.sh run_tests diff --git a/DESCRIPTION b/DESCRIPTION index aaf1a04f..ea5ee18d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: mkin Type: Package Title: Kinetic Evaluation of Chemical Degradation Data Version: 1.2.5 -Date: 2023-08-04 +Date: 2023-08-09 Authors@R: c( person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "johannes.ranke@jrwb.de", diff --git a/log/test.log b/log/test.log index 3bca2e6a..c872cb1d 100644 --- a/log/test.log +++ b/log/test.log @@ -1,42 +1,42 @@ ℹ Testing mkin ✔ | F W S OK | Context ✔ | 5 | AIC calculation -✔ | 5 | Analytical solutions for coupled models [2.9s] +✔ | 5 | Analytical solutions for coupled models [3.1s] ✔ | 5 | Calculation of Akaike weights ✔ | 3 | Export dataset for reading into CAKE -✔ | 6 | Use of precompiled symbols in mkinpredict [6.6s] -✔ | 12 | Confidence intervals and p-values [1.1s] -✔ | 1 12 | Dimethenamid data from 2018 [32.2s] -✔ | 14 | Error model fitting [5.4s] +✔ | 6 | Use of precompiled symbols in mkinpredict [5.3s] +✔ | 12 | Confidence intervals and p-values +✔ | 1 12 | Dimethenamid data from 2018 [31.5s] +✔ | 14 | Error model fitting [5.6s] ✔ | 5 | Time step normalisation ✔ | 4 | Calculation of FOCUS chi2 error levels ✔ | 14 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ✔ | 4 | Test fitting the decline of metabolites from their maximum ✔ | 1 | Fitting the logistic model -✔ | 10 | Batch fitting and diagnosing hierarchical kinetic models [46.9s] -✔ | 2 16 | Nonlinear mixed-effects models [399.6s] +✔ | 10 | Batch fitting and diagnosing hierarchical kinetic models [43.1s] +✔ | 2 16 | Nonlinear mixed-effects models [441.3s] ✔ | 3 | Test dataset classes mkinds and mkindsg ✔ | 10 | Special cases of mkinfit calls ✔ | 3 | mkinfit features ✔ | 8 | mkinmod model generation and printing ✔ | 3 | Model predictions with mkinpredict -✔ | 12 | Multistart method for saem.mmkin models [50.1s] -✔ | 16 | Evaluations according to 2015 NAFTA guidance [2.8s] -✔ | 9 | Nonlinear mixed-effects models with nlme [9.3s] -✔ | 15 | Plotting [10.9s] +✔ | 12 | Multistart method for saem.mmkin models [71.6s] +✔ | 16 | Evaluations according to 2015 NAFTA guidance [2.7s] +✔ | 9 | Nonlinear mixed-effects models with nlme [10.1s] +✔ | 15 | Plotting [12.1s] ✔ | 4 | Residuals extracted from mkinfit models -✔ | 1 36 | saemix parent models [68.4s] -✔ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.2s] +✔ | 1 36 | saemix parent models [81.8s] +✔ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5s] ✔ | 11 | Processing of residue series ✔ | 10 | Fitting the SFORB model [3.8s] ✔ | 1 | Summaries of old mkinfit objects ✔ | 5 | Summary -✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [1.9s] -✔ | 9 | Hypothesis tests [6.4s] -✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [1.4s] +✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.1s] +✔ | 9 | Hypothesis tests [7.3s] +✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [1.5s] ══ Results ═════════════════════════════════════════════════════════════════════ -Duration: 655.6 s +Duration: 731.0 s ── Skipped tests (4) ─────────────────────────────────────────────────────────── • Fitting this ODE model with saemix takes about 15 minutes on my system (1): |