You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2016/09/03 08:52:57 UTC
spark git commit: [SPARK-17363][ML][MLLIB] fix
MultivariantOnlineSummerizer.numNonZeros
Repository: spark
Updated Branches:
refs/heads/master d2fde6b72 -> 7a8a81d79
[SPARK-17363][ML][MLLIB] fix MultivariantOnlineSummerizer.numNonZeros
## What changes were proposed in this pull request?
fix `MultivariantOnlineSummerizer.numNonZeros` method,
return `nnz` array, instead of `weightSum` array
## How was this patch tested?
Existing test.
Author: WeichenXu <We...@outlook.com>
Closes #14923 from WeichenXu123/fix_MultivariantOnlineSummerizer_numNonZeros.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7a8a81d7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7a8a81d7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7a8a81d7
Branch: refs/heads/master
Commit: 7a8a81d79f4bee3395fb399ccc4d47744f8a0951
Parents: d2fde6b
Author: WeichenXu <We...@outlook.com>
Authored: Sat Sep 3 09:52:53 2016 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Sat Sep 3 09:52:53 2016 +0100
----------------------------------------------------------------------
.../apache/spark/mllib/stat/MultivariateOnlineSummarizer.scala | 4 ++--
.../spark/mllib/stat/MultivariateOnlineSummarizerSuite.scala | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7a8a81d7/mllib/src/main/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizer.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizer.scala b/mllib/src/main/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizer.scala
index 964f419..7a2a7a3 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizer.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizer.scala
@@ -231,9 +231,9 @@ class MultivariateOnlineSummarizer extends MultivariateStatisticalSummary with S
*/
@Since("1.1.0")
override def numNonzeros: Vector = {
- require(totalWeightSum > 0, s"Nothing has been added to this summarizer.")
+ require(totalCnt > 0, s"Nothing has been added to this summarizer.")
- Vectors.dense(weightSum)
+ Vectors.dense(nnz.map(_.toDouble))
}
/**
http://git-wip-us.apache.org/repos/asf/spark/blob/7a8a81d7/mllib/src/test/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizerSuite.scala
----------------------------------------------------------------------
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizerSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizerSuite.scala
index 165a3f3..797e84f 100644
--- a/mllib/src/test/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizerSuite.scala
+++ b/mllib/src/test/scala/org/apache/spark/mllib/stat/MultivariateOnlineSummarizerSuite.scala
@@ -237,7 +237,7 @@ class MultivariateOnlineSummarizerSuite extends SparkFunSuite {
absTol 1E-10, "mean mismatch")
assert(summarizer.variance ~== Vectors.dense(Array(0.17657142857, 1.645115714, 2.42057142857))
absTol 1E-8, "variance mismatch")
- assert(summarizer.numNonzeros ~== Vectors.dense(Array(0.3, 0.5, 0.4))
+ assert(summarizer.numNonzeros ~== Vectors.dense(Array(3.0, 4.0, 3.0))
absTol 1E-10, "numNonzeros mismatch")
assert(summarizer.max ~== Vectors.dense(Array(0.0, 1.7, 1.3)) absTol 1E-10, "max mismatch")
assert(summarizer.min ~== Vectors.dense(Array(-0.8, -1.2, -1.7)) absTol 1E-10, "min mismatch")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org