[SPARK-7946] [MLLIB] DecayFactor wrongly set in StreamingKMeans

MechCoder · mengxr · commit aefb113c86cb · 2015-05-29T11:37:09.000-07:00
Author: MechCoder <manojkumarsivaraj334@gmail.com> Closes apache#6497 from MechCoder/spark-7946 and squashes the following commits: 2fdd0a3 [MechCoder] Add non-regression test 8c988c6 [MechCoder] [SPARK-7946] DecayFactor wrongly set in StreamingKMeans (cherry picked from commit 6181937) Signed-off-by: Xiangrui Meng <meng@databricks.com>
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/clustering/StreamingKMeans.scala b/mllib/src/main/scala/org/apache/spark/mllib/clustering/StreamingKMeans.scala
@@ -174,7 +174,7 @@ class StreamingKMeans(
 
   /** Set the decay factor directly (for forgetful algorithms). */
   def setDecayFactor(a: Double): this.type = {
-    this.decayFactor = decayFactor
+    this.decayFactor = a
     this
   }
 
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/clustering/StreamingKMeansSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/clustering/StreamingKMeansSuite.scala
@@ -133,6 +133,13 @@ class StreamingKMeansSuite extends FunSuite with TestSuiteBase {
     assert(math.abs(c1) ~== 0.8 absTol 0.6)
   }
 
+  test("SPARK-7946 setDecayFactor") {
+    val kMeans = new StreamingKMeans()
+    assert(kMeans.decayFactor === 1.0)
+    kMeans.setDecayFactor(2.0)
+    assert(kMeans.decayFactor === 2.0)
+  }
+
   def StreamingKMeansDataGenerator(
       numPoints: Int,
       numBatches: Int,

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ class StreamingKMeans(`
`174`	`174`
`175`	`175`	`/** Set the decay factor directly (for forgetful algorithms). */`
`176`	`176`	`def setDecayFactor(a: Double): this.type = {`
`177`		`- this.decayFactor = decayFactor`
	`177`	`+ this.decayFactor = a`
`178`	`178`	`this`
`179`	`179`	`}`
`180`	`180`