diff --git a/NEWS.md b/NEWS.md index 98888b4916aca1bfd308f87f5b32912fd50aa86f..1422585239b1beed70fed21003379295b3ea2324 100644 --- a/NEWS.md +++ b/NEWS.md @@ -12,7 +12,7 @@ * Fixed some errors in the documentation and improved the examples. ## New -* Exporte function `log10_ticks()` for calculating tick mark labels and positions on a base 10 logarithmic axis. +* Export function `log10_ticks()` for calculating tick mark labels and positions on a base 10 logarithmic axis. * Add example data set `multiple_stress` for use with `multi_tox()`. * Various minor changes to prepare for CRAN submission. diff --git a/R/data.R b/R/data.R index bd310d9ccf356c0d5af5818d7499114c4d9fa991..eb8c1d8bd4dd1f2dbc27b45a6fa0bc299362c0f9 100644 --- a/R/data.R +++ b/R/data.R @@ -22,9 +22,10 @@ #' Survival of Daphnia magna exposed to multiple stressors #' -#' Individuals of Daphnia magna were exposed to combinations of food stress and -#' multiple concentrations of the pesticides esfenvalerate and prochloraz. -#' The survival was recorded at 21 days after contamination. +#' A data set of mixture toxicity experiments. Individuals of Daphnia magna were +#' exposed to combinations of food stress and multiple concentrations of the +#' pesticides esfenvalerate and prochloraz. The survival was recorded at 21 days +#' after contamination. #' #' @format A data frame with 58 rows and 4 variables: #' \describe{ diff --git a/R/multi_tox.R b/R/multi_tox.R index 17b80a1bea8ad23ab2eeadac3be4056df6de25bc..97ae971924e26d36c6e8ca07f34c87d46583c292 100644 --- a/R/multi_tox.R +++ b/R/multi_tox.R @@ -25,11 +25,11 @@ #' #' The predictions are symmetric, i.e. it does not matter which of the toxicant #' models is a or b as long as the concentration arguments are supplied in the -#' same order. See the example below. +#' same order. #' -#' This method is only suitable for experiments without environmental stress. -#' Any environmental stress supplied as arguments to \code{\link{ecxsys}} in -#' \code{model_a} or \code{model_b} is ignored. +#' This method is only suitable for experiments without or with low +#' environmental stress. Any environmental stress supplied as arguments to +#' \code{\link{ecxsys}} in \code{model_a} or \code{model_b} is ignored. #' #' @param model_a,model_b The ecxsys models of the toxicants. #' @param concentration_a,concentration_b The concentrations of the toxicants in diff --git a/R/plot_ecxsys.R b/R/plot_ecxsys.R index f0d9c0fe98259724df37fd854e2df0d20bee25de..6d1ec9e34451680935058371829b96bd8f0c268d 100644 --- a/R/plot_ecxsys.R +++ b/R/plot_ecxsys.R @@ -26,7 +26,7 @@ #' #' @name plot_ecxsys #' -#' @param model The list returned from \code{\link{ecxsys}}. +#' @param model The object returned from \code{\link{ecxsys}}. #' @param which A vector of names to plot. Allowed are the column names of the #' \code{model$curves} data frame. There is also #' \code{"survival_tox_observed"} and \code{"survival_tox_env_observed"} for diff --git a/man/multi_tox.Rd b/man/multi_tox.Rd index b9c3db55bf5d3d2f603ec42fa9019ad946f4b91a..7abbb9fd1f38b4ab7559e596f676fd4bc1cae8aa 100644 --- a/man/multi_tox.Rd +++ b/man/multi_tox.Rd @@ -41,11 +41,11 @@ details. \details{ The predictions are symmetric, i.e. it does not matter which of the toxicant models is a or b as long as the concentration arguments are supplied in the -same order. See the example below. +same order. -This method is only suitable for experiments without environmental stress. -Any environmental stress supplied as arguments to \code{\link{ecxsys}} in -\code{model_a} or \code{model_b} is ignored. +This method is only suitable for experiments without or with low +environmental stress. Any environmental stress supplied as arguments to +\code{\link{ecxsys}} in \code{model_a} or \code{model_b} is ignored. } \examples{ # Using a data set which is included in this package. See ?multiple_stress diff --git a/man/multiple_stress.Rd b/man/multiple_stress.Rd index 685d8ae026aef602e97377ef80a399ccbb87942e..8667622d5138803f6d0c1c33163ac7dad14ea3ea 100644 --- a/man/multiple_stress.Rd +++ b/man/multiple_stress.Rd @@ -26,8 +26,9 @@ A data frame with 58 rows and 4 variables: multiple_stress } \description{ -Individuals of Daphnia magna were exposed to combinations of food stress and -multiple concentrations of the pesticides esfenvalerate and prochloraz. -The survival was recorded at 21 days after contamination. +A data set of mixture toxicity experiments. Individuals of Daphnia magna were +exposed to combinations of food stress and multiple concentrations of the +pesticides esfenvalerate and prochloraz. The survival was recorded at 21 days +after contamination. } \keyword{datasets} diff --git a/man/plot_ecxsys.Rd b/man/plot_ecxsys.Rd index 0cb31872ffcfee6f422434dd9080bec103211afd..d5c09b0a90d2d9991fb4f8a37617ad5e04101718 100644 --- a/man/plot_ecxsys.Rd +++ b/man/plot_ecxsys.Rd @@ -26,7 +26,7 @@ plot_survival( ) } \arguments{ -\item{model}{The list returned from \code{\link{ecxsys}}.} +\item{model}{The object returned from \code{\link{ecxsys}}.} \item{which}{A vector of names to plot. Allowed are the column names of the \code{model$curves} data frame. There is also