Merge pull request #2 from MichaelChirico/by-comma

Provide column names as vector, not CSV

R/model_graphs.R

@@ -31,7 +31,7 @@ calmr_model_graph <- function(
   # aggregate data
   x <- data.table::setDT(x)[trial == t,
     list("value" = mean(value)),
-    by = "s1,s2"
+    by = c("s1","s2")
   ]
   net <- ggnetwork::ggnetwork(network::as.network(x, loops = loops),
     layout = "circle",

R/model_parsers.R

@@ -256,9 +256,9 @@
 # type is the type of data
 .aggregate_results_data_table <- function(dat, model, type) {
   value <- time <- NULL # local binding
-  common_terms <- "group,phase,trial_type,trial,block_size,s1"
+  common_terms <- c("group","phase","trial_type","trial","block_size","s1")
   fmap <- formula_map()
-  form <- paste0(c(common_terms, fmap[[model]][[type]]), collapse = ",")
+  form <- c(common_terms, fmap[[model]][[type]])
   dat <- data.table::data.table(dat)
   if (!("time" %in% names(dat))) {
     data.table::setDT(dat)[, list("value" = mean(value)), by = form]

vignettes/calmr_fits.Rmd

@@ -66,7 +66,7 @@ so we know what to aim for.
 ```{r}
 pati_summ <- setDT(pati)[,
   list("rpert" = mean(rpert)),
-  by = "block,us,response"
+  by = c("block","us","response")
 ]
 # set order (relevant for the future)
 setorder(pati_summ, block, response, us)
@@ -163,7 +163,7 @@ my_model_function <- function(pars, exper, full = FALSE) {
     (response == "np" | (response == "lp" &
       mapply(grepl, s1, trial_type)))]
   # aggregate
-  responses <- responses[, list(value = mean(value)), by = "block,s2,response"]
+  responses <- responses[, list(value = mean(value)), by = c("block","s2","response")]
   if (full) {
     return(responses)
   }