Fixed a bug in prepare.data which prevented the plotting function to

fail in some situations.
tmalsburg · Aug 25, 2015 · ab4147b · ab4147b
1 parent da96f20
commit ab4147b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/scanpath/R/scanpath.R b/scanpath/R/scanpath.R
@@ -262,9 +262,12 @@ avg.group.dist <- function(d, groups) {
 prepare.data <- function(data, formula)
 {
   terms <- strsplit(deparse(formula), " [~+|] ")[[1]]
-  stopifnot(length(terms)==4)
+  stopifnot(length(terms) %in% 3:4)
   df <- data[terms]
-  colnames(df) <- c("d", "x", "y", "trial")
+  if (length(terms)==3) 
+    colnames(df) <- c("d", "x", "trial")
+  else
+    colnames(df) <- c("d", "x", "y", "trial")
   df
 }