diff options
| author | Johannes Ranke <johannes.ranke@jrwb.de> | 2025-02-13 14:45:54 +0100 |
|---|---|---|
| committer | Johannes Ranke <johannes.ranke@jrwb.de> | 2025-02-13 14:45:54 +0100 |
| commit | 480c5cf42e07a7a62cf1afdb47c44ee2d04f120f (patch) | |
| tree | 85fb5d25b17cc54ab8127f169f906dfc7e93748a /man | |
| parent | 5c54f39802ec2898cd36916ae09e7873a9e95239 (diff) | |
| parent | 051aebaebd40f3958fa22fb712401d0fe8e9a025 (diff) | |
Merge branch 'devel'
Diffstat (limited to 'man')
| -rw-r--r-- | man/mkinpredict.Rd | 4 | ||||
| -rw-r--r-- | man/nlme.Rd | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/man/mkinpredict.Rd b/man/mkinpredict.Rd index 4db4d62f..a4821705 100644 --- a/man/mkinpredict.Rd +++ b/man/mkinpredict.Rd @@ -86,7 +86,11 @@ the observed variables (default) or for all state variables (if set to FALSE). Setting this to FALSE has no effect for analytical solutions, as these always return mapped output.} +<<<<<<< HEAD \item{na_stop}{Should it be an error if \link[deSolve:ode]{deSolve::ode} returns NaN values} +======= +\item{na_stop}{Should it be an error if \code{deSolve::ode()} returns NaN values} +>>>>>>> devel } \value{ A matrix with the numeric solution in wide format diff --git a/man/nlme.Rd b/man/nlme.Rd index e87b7a00..2c92f31b 100644 --- a/man/nlme.Rd +++ b/man/nlme.Rd @@ -15,7 +15,7 @@ nlme_data(object) \value{ A function that can be used with nlme -A \code{\link{groupedData}} object +A \code{nlme::groupedData} object } \description{ These functions facilitate setting up a nonlinear mixed effects model for |