git commit: [FIX][MLLIB] fix seed in BaggedPointSuite

2014-11-03 Thread meng 
Repository: spark
Updated Branches:
  refs/heads/master 4f035dd2c - c5912ecc7


[FIX][MLLIB] fix seed in BaggedPointSuite

Saw Jenkins test failures due to random seeds.

jkbradley manishamde

Author: Xiangrui Meng m...@databricks.com

Closes #3084 from mengxr/fix-baggedpoint-suite and squashes the following 
commits:

f735a43 [Xiangrui Meng] fix seed in BaggedPointSuite


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c5912ecc
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c5912ecc
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c5912ecc

Branch: refs/heads/master
Commit: c5912ecc7b392a13089ae735c07c2d7256de36c6
Parents: 4f035dd
Author: Xiangrui Meng m...@databricks.com
Authored: Mon Nov 3 18:50:37 2014 -0800
Committer: Xiangrui Meng m...@databricks.com
Committed: Mon Nov 3 18:50:37 2014 -0800

--
 .../apache/spark/mllib/tree/impl/BaggedPointSuite.scala   | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/c5912ecc/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala
--
diff --git 
a/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala 
b/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala
index c0a62e0..5cb4332 100644
--- 
a/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala
+++ 
b/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala
@@ -30,7 +30,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
   test(BaggedPoint RDD: without subsampling) {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
-val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, 1, false)
+val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, 1, false, 42)
 baggedRDD.collect().foreach { baggedPoint =
   assert(baggedPoint.subsampleWeights.size == 1  
baggedPoint.subsampleWeights(0) == 1)
 }
@@ -44,7 +44,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
 seeds.foreach { seed =
-  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, numSubsamples, 
true)
+  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, numSubsamples, 
true, seed)
   val subsampleCounts: Array[Array[Double]] = 
baggedRDD.map(_.subsampleWeights).collect()
   EnsembleTestHelper.testRandomArrays(subsampleCounts, numSubsamples, 
expectedMean,
 expectedStddev, epsilon = 0.01)
@@ -60,7 +60,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
 seeds.foreach { seed =
-  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, subsample, 
numSubsamples, true)
+  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, subsample, 
numSubsamples, true, seed)
   val subsampleCounts: Array[Array[Double]] = 
baggedRDD.map(_.subsampleWeights).collect()
   EnsembleTestHelper.testRandomArrays(subsampleCounts, numSubsamples, 
expectedMean,
 expectedStddev, epsilon = 0.01)
@@ -75,7 +75,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
 seeds.foreach { seed =
-  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, numSubsamples, 
false)
+  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, numSubsamples, 
false, seed)
   val subsampleCounts: Array[Array[Double]] = 
baggedRDD.map(_.subsampleWeights).collect()
   EnsembleTestHelper.testRandomArrays(subsampleCounts, numSubsamples, 
expectedMean,
 expectedStddev, epsilon = 0.01)
@@ -91,7 +91,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
 seeds.foreach { seed =
-  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, subsample, 
numSubsamples, false)
+  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, subsample, 
numSubsamples, false, seed)
   val subsampleCounts: Array[Array[Double]] = 
baggedRDD.map(_.subsampleWeights).collect()
   EnsembleTestHelper.testRandomArrays(subsampleCounts, numSubsamples, 
expectedMean,
 expectedStddev, epsilon = 0.01)


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail:

git commit: [FIX][MLLIB] fix seed in BaggedPointSuite

2014-11-03 Thread meng 
Repository: spark
Updated Branches:
  refs/heads/branch-1.2 52db2b942 - 0826eed9c


[FIX][MLLIB] fix seed in BaggedPointSuite

Saw Jenkins test failures due to random seeds.

jkbradley manishamde

Author: Xiangrui Meng m...@databricks.com

Closes #3084 from mengxr/fix-baggedpoint-suite and squashes the following 
commits:

f735a43 [Xiangrui Meng] fix seed in BaggedPointSuite

(cherry picked from commit c5912ecc7b392a13089ae735c07c2d7256de36c6)
Signed-off-by: Xiangrui Meng m...@databricks.com


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0826eed9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0826eed9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0826eed9

Branch: refs/heads/branch-1.2
Commit: 0826eed9c84a73544e3d8289834c8b5ebac47e03
Parents: 52db2b9
Author: Xiangrui Meng m...@databricks.com
Authored: Mon Nov 3 18:50:37 2014 -0800
Committer: Xiangrui Meng m...@databricks.com
Committed: Mon Nov 3 18:50:51 2014 -0800

--
 .../apache/spark/mllib/tree/impl/BaggedPointSuite.scala   | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/0826eed9/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala
--
diff --git 
a/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala 
b/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala
index c0a62e0..5cb4332 100644
--- 
a/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala
+++ 
b/mllib/src/test/scala/org/apache/spark/mllib/tree/impl/BaggedPointSuite.scala
@@ -30,7 +30,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
   test(BaggedPoint RDD: without subsampling) {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
-val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, 1, false)
+val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, 1, false, 42)
 baggedRDD.collect().foreach { baggedPoint =
   assert(baggedPoint.subsampleWeights.size == 1  
baggedPoint.subsampleWeights(0) == 1)
 }
@@ -44,7 +44,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
 seeds.foreach { seed =
-  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, numSubsamples, 
true)
+  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, numSubsamples, 
true, seed)
   val subsampleCounts: Array[Array[Double]] = 
baggedRDD.map(_.subsampleWeights).collect()
   EnsembleTestHelper.testRandomArrays(subsampleCounts, numSubsamples, 
expectedMean,
 expectedStddev, epsilon = 0.01)
@@ -60,7 +60,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
 seeds.foreach { seed =
-  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, subsample, 
numSubsamples, true)
+  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, subsample, 
numSubsamples, true, seed)
   val subsampleCounts: Array[Array[Double]] = 
baggedRDD.map(_.subsampleWeights).collect()
   EnsembleTestHelper.testRandomArrays(subsampleCounts, numSubsamples, 
expectedMean,
 expectedStddev, epsilon = 0.01)
@@ -75,7 +75,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
 seeds.foreach { seed =
-  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, numSubsamples, 
false)
+  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, 1.0, numSubsamples, 
false, seed)
   val subsampleCounts: Array[Array[Double]] = 
baggedRDD.map(_.subsampleWeights).collect()
   EnsembleTestHelper.testRandomArrays(subsampleCounts, numSubsamples, 
expectedMean,
 expectedStddev, epsilon = 0.01)
@@ -91,7 +91,7 @@ class BaggedPointSuite extends FunSuite with 
LocalSparkContext  {
 val arr = EnsembleTestHelper.generateOrderedLabeledPoints(1, 1000)
 val rdd = sc.parallelize(arr)
 seeds.foreach { seed =
-  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, subsample, 
numSubsamples, false)
+  val baggedRDD = BaggedPoint.convertToBaggedRDD(rdd, subsample, 
numSubsamples, false, seed)
   val subsampleCounts: Array[Array[Double]] = 
baggedRDD.map(_.subsampleWeights).collect()
   EnsembleTestHelper.testRandomArrays(subsampleCounts, numSubsamples, 
expectedMean,
 expectedStddev, epsilon = 0.01)