diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/mkinfit.Rd | 3 | ||||
| -rw-r--r-- | man/mkinpredict.Rd | 6 | ||||
| -rw-r--r-- | man/plot.mixed.mmkin.Rd | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/man/mkinfit.Rd b/man/mkinfit.Rd index f96b4d22..edec9546 100644 --- a/man/mkinfit.Rd +++ b/man/mkinfit.Rd @@ -39,7 +39,8 @@ model to be fitted to the data, or one of the shorthand names ("SFO", parent only degradation model is generated for the variable with the highest value in \code{observed}.} -\item{observed}{A dataframe with the observed data. The first column called +\item{observed}{A dataframe or an object coercible to a dataframe +(e.g. a \code{tibble}) with the observed data. The first column called "name" must contain the name of the observed variable for each data point. The second column must contain the times of observation, named "time". The third column must be named "value" and contain the observed values. diff --git a/man/mkinpredict.Rd b/man/mkinpredict.Rd index f68f6c7a..a4821705 100644 --- a/man/mkinpredict.Rd +++ b/man/mkinpredict.Rd @@ -71,7 +71,7 @@ parent compound.} \item{use_symbols}{If set to \code{TRUE} (default), symbol info present in the \link{mkinmod} object is used if available for accessing compiled code} -\item{method.ode}{The solution method passed via \link{mkinpredict} to \code{deSolve::ode()} in +\item{method.ode}{The solution method passed via \link{mkinpredict} to \link[deSolve:ode]{deSolve::ode}] in case the solution type is "deSolve" and we are not using compiled code. When using compiled code, only lsoda is supported.} @@ -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/plot.mixed.mmkin.Rd b/man/plot.mixed.mmkin.Rd index 1e264db3..3c44510d 100644 --- a/man/plot.mixed.mmkin.Rd +++ b/man/plot.mixed.mmkin.Rd @@ -25,7 +25,7 @@ nrow.legend = ceiling((length(i) + 1)/ncol.legend), rel.height.legend = 0.02 + 0.07 * nrow.legend, rel.height.bottom = 1.1, - pch_ds = 1:length(i), + pch_ds = c(1:25, 33, 35:38, 40:41, 47:57, 60:90)[1:length(i)], col_ds = pch_ds + 1, lty_ds = col_ds, frame = TRUE, |