fix #34

ddf-project · Nov 21, 2014 · b2ca8dc · b2ca8dc
1 parent 3b8a494
commit b2ca8dc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/R/package/R/ddf.R b/R/package/R/ddf.R
@@ -177,12 +177,11 @@ setMethod("as.data.frame",
 #' @param x a DistributedDataFrame
 #' @param size number of samples
 #' @param replace sampling with or without replacement
-#' @param seed a random seed
 #' @export
 setMethod("sample",
           signature("DDF"),
-          function(x, size, replace=FALSE, seed=123L) {
-            res <- x@jddf$VIEWS$getRandomSample(as.integer(size), replace, seed)
+          function(x, size, replace=FALSE) {
+            res <- x@jddf$VIEWS$getRandomSample(as.integer(size), replace, sample.int(.Machine$integer.max, 1))
             ncols <- ncol(x)
             parsed.res <- t(sapply(res,
                           function(x) {sapply(1:ncols, function(y){.jarray(x)[[y]]$toString()})}))
@@ -195,7 +194,6 @@ setMethod("sample",
 #' @param x a DistributedDataFrame
 #' @param percent a double value specify the fraction
 #' @param replace sampling with or without replacement
-#' @param seed a random seed
 #' @return a DistributedDataFrame
 #' @export
 setGeneric("sample2ddf",
@@ -206,8 +204,8 @@ setGeneric("sample2ddf",
 
 setMethod("sample2ddf",
           signature("DDF"),
-          function(x, percent, replace=FALSE, seed=123L) {
-            new ("DDF",x@jddf$VIEWS$getRandomSample(percent, replace, seed))
+          function(x, percent, replace=FALSE) {
+            new ("DDF",x@jddf$VIEWS$getRandomSample(percent, replace, sample.int(.Machine$integer.max, 1)))
           }
 )
 

diff --git a/R/package/man/sample-DDF-method.Rd b/R/package/man/sample-DDF-method.Rd
@@ -4,16 +4,14 @@
 \alias{sample,DDF-method}
 \title{Return a sample of specific size from a DistributedDataFrame}
 \usage{
-\S4method{sample}{DDF}(x, size, replace = FALSE, seed = 123L)
+\S4method{sample}{DDF}(x, size, replace = FALSE)
 }
 \arguments{
 \item{x}{a DistributedDataFrame}
 
 \item{size}{number of samples}
 
 \item{replace}{sampling with or without replacement}
-
-\item{seed}{a random seed}
 }
 \description{
 Return a sample of specific size from a DistributedDataFrame

diff --git a/R/package/man/sample2ddf.Rd b/R/package/man/sample2ddf.Rd
@@ -11,8 +11,6 @@ sample2ddf(x, ...)
 \item{percent}{a double value specify the fraction}
 
 \item{replace}{sampling with or without replacement}
-
-\item{seed}{a random seed}
 }
 \value{
 a DistributedDataFrame