diff options
| -rw-r--r-- | .Rbuildignore | 1 | ||||
| -rw-r--r-- | DESCRIPTION | 8 | ||||
| -rw-r--r-- | man/mkinfit.Rd | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/.Rbuildignore b/.Rbuildignore index 37d3db26..24632401 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,5 +1,6 @@ ^_pkgdown\.yml$ ^\.travis\.yml$ +^codemeta\.json$ ^docs$ ^log$ ^mkin.Rcheck$ diff --git a/DESCRIPTION b/DESCRIPTION index a28654cc..6bf960f2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -22,9 +22,9 @@ Description: Calculation routines based on the FOCUS Kinetics Report (2006, Ranke et al. (2021) <doi:10.3390/environments8080071>. Please note that no warranty is implied for correctness of results or fitness for a particular purpose. -Depends: R (>= 2.15.1), parallel -Imports: stats, graphics, methods, deSolve, R6, inline (>= 0.3.19), numDeriv, - lmtest, pkgbuild, nlme (>= 3.1-151), purrr, saemix (>= 3.0) +Depends: R (>= 2.15.1), +Imports: stats, graphics, methods, parallel, deSolve, R6, inline (>= 0.3.19), + numDeriv, lmtest, pkgbuild, nlme (>= 3.1-151), purrr, saemix (>= 3.0) Suggests: knitr, rbenchmark, tikzDevice, testthat, rmarkdown, covr, vdiffr, benchmarkme, tibble, stats4 License: GPL @@ -36,4 +36,4 @@ VignetteBuilder: knitr BugReports: https://github.com/jranke/mkin/issues/ URL: https://pkgdown.jrwb.de/mkin/ Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.0 +RoxygenNote: 7.2.1 diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd index b5b24449..f96b4d22 100644 --- a/man/mkinfit.Rd +++ b/man/mkinfit.Rd @@ -23,8 +23,8 @@ mkinfit( atol = 1e-08, rtol = 1e-10, error_model = c("const", "obs", "tc"), - error_model_algorithm = c("auto", "d_3", "direct", "twostep", "threestep", - "fourstep", "IRLS", "OLS"), + error_model_algorithm = c("auto", "d_3", "direct", "twostep", "threestep", "fourstep", + "IRLS", "OLS"), reweight.tol = 1e-08, reweight.max.iter = 10, trace_parms = FALSE, |