Update subtract to work with generics.R

apache · Apr 14, 2015 · ed66c81 · ed66c81
1 parent f3ba785
commit ed66c81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/R/pkg/NAMESPACE b/R/pkg/NAMESPACE
@@ -122,7 +122,6 @@ exportMethods("columns",
               "show",
               "showDF",
               "sortDF",
-              "subtract",
               "toJSON",
               "toRDD",
               "unionAll",

diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
@@ -1159,10 +1159,13 @@ setMethod("intersect",
 #' df2 <- jsonFile(sqlCtx, path2)
 #' subtractDF <- subtract(df, df2)
 #' }
+
+#' @rdname subtract
+#' @export
 setMethod("subtract",
-          signature(x = "DataFrame", y = "DataFrame"),
-          function(x, y) {
-            subtracted <- callJMethod(x@sdf, "except", y@sdf)
+          signature(x = "DataFrame", other = "DataFrame"),
+          function(x, other) {
+            subtracted <- callJMethod(x@sdf, "except", other@sdf)
             dataFrame(subtracted)
           })