combine two variants

Author: gatorsmile

R/pkg/R/DataFrame.R

@@ -678,41 +678,28 @@ setMethod("unique",
 #'}
 setMethod("sample",
           signature(x = "DataFrame", withReplacement = "logical",
-                    fraction = "numeric", seed = "missing"),
+                    fraction = "numeric"),
           function(x, withReplacement, fraction, seed) {
             if (fraction < 0.0) stop(cat("Negative fraction value:", fraction))
-            sdf <- callJMethod(x@sdf, "sample", withReplacement, fraction)
-            dataFrame(sdf)
-          })
-
-#' @rdname sample
-#' @name sample
-setMethod("sample",
-          # we can send seed as an argument through callJMethod
-          signature(x = "DataFrame", withReplacement = "logical",
-                    fraction = "numeric", seed = "numeric"),
-          function(x, withReplacement, fraction, seed) {
-            if (fraction < 0.0) stop(cat("Negative fraction value:", fraction))
-            sdf <- callJMethod(x@sdf, "sample", withReplacement, fraction, as.integer(seed))
+            if (!missing(seed)) {
+              sdf <- callJMethod(x@sdf, "sample", withReplacement, fraction, as.integer(seed))
+            } else {
+              sdf <- callJMethod(x@sdf, "sample", withReplacement, fraction)
+            }
             dataFrame(sdf)
           })
 
 #' @rdname sample
 #' @name sample_frac
 setMethod("sample_frac",
           signature(x = "DataFrame", withReplacement = "logical",
-                    fraction = "numeric", seed = "missing"),
-          function(x, withReplacement, fraction, seed) {
-            sample(x, withReplacement, fraction)
-          })
-
-#' @rdname sample
-#' @name sample_frac
-setMethod("sample_frac",
-          signature(x = "DataFrame", withReplacement = "logical",
-                    fraction = "numeric", seed = "numeric"),
+                    fraction = "numeric"),
           function(x, withReplacement, fraction, seed) {
-            sample(x, withReplacement, fraction, as.integer(seed))
+            if (!missing(seed)) {
+              sample(x, withReplacement, fraction, as.integer(seed))
+            } else {
+              sample(x, withReplacement, fraction)
+            }
           })
 
 #' nrow