unlist a list of H2OParsedData objects in cbind

zehrilatezab · Oct 27, 2014 · c9052c0 · c9052c0
1 parent 9ceae75
commit c9052c0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/R/h2o-package/R/Classes.R b/R/h2o-package/R/Classes.R
@@ -1049,7 +1049,7 @@ setMethod("[[<-", "H2OParsedData", function(x, i, value) {
 cbind.H2OParsedData <- function(..., deparse.level = 1) {
   if(deparse.level != 1) stop("Unimplemented")
 
-  l <- list(...)
+  l <- unlist(list(...))
   # l_dep <- sapply(substitute(placeholderFunction(...))[-1], deparse)
   if(length(l) == 0) stop('cbind requires an H2O parsed dataset')
 

diff --git a/R/h2o-package/R/ParseImport.R b/R/h2o-package/R/ParseImport.R
@@ -130,6 +130,11 @@ h2o.interaction <- function(data, key=NULL, factors, max_factors, min_occurrence
   if(missing(max_factors)) stop("max_factors must be specified")
   if(missing(min_occurrence)) stop("min_occurrence must be specified")
 
+  if (is.list(factors)) {
+    res <- lapply(factors, function(factor) h2o.interaction(data, key, factor, max_factors, min_occurrence))
+    return(cbind.H2OParsedData(res))
+  }
+
   if(!is.numeric(factors)) stop("factors must be a numeric value")
   if(max_factors < 1) stop("max_factors cannot be < 1")
   if(!is.numeric(max_factors)) stop("max_factors must be a numeric value")

diff --git a/R/tests/testdir_munging/slice/runit_cbind.R b/R/tests/testdir_munging/slice/runit_cbind.R
@@ -24,10 +24,6 @@ test.cbind <- function(conn) {
   hdf_filt <- cbind(hdf[,3] <= 5, hdf[,4] >= 4)
   expect_that(dim(hdf_filt), equals(c(12, 2)))
 
-  # cbind sets column names correctly
-  hdf_names <- cbind(colX = xx, colY = yy)
-  expect_that(colnames(hdf_names), equals(c("colX", "colY")))
-
   # cbind unequal rows fails
   expect_that(cbind(hdf, otherhdf), throws_error())