diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-05-15 13:55:19 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-05-15 13:55:19 +0200 |
| commit | 6c65cba39dbca98caf3f8e69552b3454ec1721fc (patch) | |
| tree | 00252649aeccfdd13e723054c22203006cab10c6 /DESCRIPTION | |
| parent | a26b44d15c11ebb41083fc2efab0cc91a027b55b (diff) | |
| parent | 89cd81cf47c9f05831e854d5185b5cc599745db4 (diff) | |
Merge branch 'master' into compile_odes
Conflicts
(resolved manually, deleting code that I had
integrated into the RUnit tests for testing the
compiled version):
.gitignore
DESCRIPTION
inst/unitTests/runit.mkinerrmin.R
inst/unitTests/runit.mkinfit.R
tests/testthat/test_mkinpredict_SFO_SFO.R
vignettes/FOCUS_L.html
Diffstat (limited to 'DESCRIPTION')
| -rw-r--r-- | DESCRIPTION | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index e823ba5f..60ee0b84 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,7 +3,7 @@ Type: Package Title: Routines for Fitting Kinetic Models with One or More State Variables to Chemical Degradation Data Version: 0.9-36 -Date: 2015-04-17 +Date: 2015-05-15 Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), email = "jranke@uni-bremen.de"), person("Katrin", "Lindenberger", role = "ctb"), @@ -12,14 +12,14 @@ Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"), Description: Calculation routines based on the FOCUS Kinetics Report (2006). Includes a function for conveniently defining differential equation models, model solution based on eigenvalues if possible or using numerical solvers - and a choice of the optimisation methods made available by the FME package. + and a choice of the optimisation methods made available by the 'FME' package. If the ccSolve package and a C compiler is available, differential equation models are solved as compiled C functions. Please note that no warranty is implied for correctness of results or fitness for a particular purpose. Depends: minpack.lm, rootSolve Imports: FME, deSolve -Suggests: knitr, RUnit, ccSolve, microbenchmark +Suggests: knitr, testthat, ccSolve, microbenchmark License: GPL LazyLoad: yes LazyData: yes |