fix plot

DESCRIPTION

@@ -3,7 +3,7 @@ Title: Biomarker Kinetics Modelling
 Version: 0.0.0.9000
 Authors@R: c(person("Timothy", "Russell", email = "[email protected]", role = c("aut")),
     person("Alex", "Hill", email = "[email protected]", role = c("aut", "cre")))
-Description: Fit kinetic curves to biomarker data, using a Bayesian hierarchical model
+Description: Fit kinetic curves to biomarker data, using a Bayesian hierarchical model.
 License: GPL (>= 3)
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)

R/plot.R

@@ -70,10 +70,10 @@ plot_data <- function(data, covariates) {
 #' @param x An object of class "biokinetics_population_trajectories". These are
 #' generated by running biokinetics$simulate_populate_trajectories(). See
 #' \href{../../epikinetics/html/biokinetics.html#method-biokinetics-simulate_population_trajectories}{\code{biokinetics$simulate_population_trajectories()}}
-#' @param \dots Further arguments passed to the method. For now the only extra argument supported is "data", which should be
-#' a data.table containing raw data as provided to the biokinetics model.
+#' @param \dots Further arguments passed to the method.
+#' @param data Optional data.table containing raw data as provided to the biokinetics model.
 #' @export
-plot.biokinetics_population_trajectories <- function(x, ...) {
+plot.biokinetics_population_trajectories <- function(x, ..., data = NULL) {
   covariates <- attr(x, "covariates")
   if (!attr(x, "summarised")) {
     by <- setdiff(colnames(x), c("t0_pop", "tp_pop", "ts_pop",
@@ -84,7 +84,6 @@ plot.biokinetics_population_trajectories <- function(x, ...) {
     x <- summarise_draws(
       x, column_name = "mu", by = by)
   }
-  args <- list(...)
   # Declare variables to suppress notes when compiling package
   # https://github.com/Rdatatable/data.table/issues/850#issuecomment-259466153
   time_since_last_exp <- value <- me <- titre_type <- lo <- hi <- NULL
@@ -97,8 +96,7 @@ plot.biokinetics_population_trajectories <- function(x, ...) {
                     ymax = hi,
                     fill = titre_type), alpha = 0.5)
 
-  if (!is.null(args$data)) {
-    data <- args$data
+  if (!is.null(data)) {
     validate_required_cols(data)
     plot <- plot +
       geom_point(data = data,