diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2020-05-07 09:10:33 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-05-07 09:13:20 +0200 |
| commit | 67c8163487e776e9a378c9dfcd39c74f6e6bc507 (patch) | |
| tree | c833071ada54cc11798f7cf7b4907e1c1526e545 /R | |
| parent | 8bdb4cd437a9d4663e542f95869e8692aa38dadb (diff) | |
Merge parent solutions to one file
- Combine R/*.solution.R into R/parent_solutions.R
- Create a roxygen family of related functions
- Reduce redundancy by using the inherit tag
- Change the parent.0 argument to parent_0 to match
the corresponding parameter name used in mkinfit
Diffstat (limited to 'R')
| -rw-r--r-- | R/mkinmod.R | 2 | ||||
| -rw-r--r-- | R/parent_solutions.R | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/R/mkinmod.R b/R/mkinmod.R index 099e1155..f52baa4f 100644 --- a/R/mkinmod.R +++ b/R/mkinmod.R @@ -452,7 +452,7 @@ mkinmod <- function(..., use_of_ff = "min", speclist = NULL, quiet = FALSE, verb values <- do.call(parent_func, args = c( - list(t = outtimes, parent.0 = odeini[1]), + list(t = outtimes, parent_0 = odeini[1]), odeparm_list)) out <- data.frame(outtimes, values) names(out) <- c("time", parent_name) diff --git a/R/parent_solutions.R b/R/parent_solutions.R index f3d3e963..c33d6d13 100644 --- a/R/parent_solutions.R +++ b/R/parent_solutions.R @@ -45,12 +45,19 @@ SFO.solution <- function(t, parent_0, k) #' @note The solution of the FOMC kinetic model reduces to the #' \code{\link{SFO.solution}} for large values of \code{alpha} and #' \code{beta} with \eqn{k = \frac{\beta}{\alpha}}{k = beta/alpha}. -#' @references FOCUS (2006) \dQuote{Guidance Document on Estimating Persistence +#' @references +#' FOCUS (2006) \dQuote{Guidance Document on Estimating Persistence #' and Degradation Kinetics from Environmental Fate Studies on Pesticides in #' EU Registration} Report of the FOCUS Work Group on Degradation Kinetics, #' EC Document Reference Sanco/10058/2005 version 2.0, 434 pp, #' \url{http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics} #' +#' FOCUS (2014) \dQuote{Generic guidance for Estimating Persistence +#' and Degradation Kinetics from Environmental Fate Studies on Pesticides in +#' EU Registration} Report of the FOCUS Work Group on Degradation Kinetics, +#' Version 1.1, 18 December 2014 +#' \url{http://esdac.jrc.ec.europa.eu/projects/degradation-kinetics} +#' #' Gustafson DI and Holden LR (1990) Nonlinear pesticide dissipation in soil: #' A new model based on spatial variability. \emph{Environmental Science and #' Technology} \bold{24}, 1032-1038 |