update ifelse

narenreddy · May 3, 2015 · a34a783 · a34a783
1 parent b90ee8c
commit a34a783
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/h2o-package/R/Classes.R b/R/h2o-package/R/Classes.R
@@ -1815,11 +1815,11 @@ function(test, yes, no, type) {
  }
 }
 
-setMethod("ifelse", signature(test="H2OParsedData", yes="ANY", no="ANY"), function (test, yes, no) {
+setMethod("ifelse", signature(test="H2OParsedData", yes="ANY", no="ANY"), function(test, yes, no) {
   .h2o.ifelse(test,yes,no)
-}
+})
 
-setMethod("ifelse", signature(test="ANY",yes="H2OFrame", no="H2OFrame"), function(test,yes,no)
+setMethod("ifelse", signature(test="ANY",yes="H2OParsedData", no="H2OParsedData"), function(test,yes,no) {
   .h2o.ifelse(test,yes,no)
 })
 

diff --git a/R/tests/testdir_munging/exec/runit_NOPASS_pub-770.R b/R/tests/testdir_munging/exec/runit_NOPASS_pub-770.R
@@ -21,7 +21,7 @@ test.cbind <- function(conn) {
     colnames(index) <- c("index")
 
     df.hex = as.h2o(conn, df, key="df")
-    index.h2o = as.h2o(conn, index, key="index.h2o")
+    index.h2o = as.h2o(conn, index, key="index")
 
     df.hex = cbind(df.hex,index.h2o)
     summary(df.hex[,"index"])