You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/01/05 01:29:42 UTC
[4/9] git commit: Reformatted some lines commented by Matei
Reformatted some lines commented by Matei
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/654f4217
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/654f4217
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/654f4217
Branch: refs/heads/master
Commit: 654f42174aa912fec7355d779e4e02731c535c94
Parents: c0337c5
Author: Lian, Cheng <rh...@gmail.com>
Authored: Fri Dec 27 04:45:04 2013 +0800
Committer: Lian, Cheng <rh...@gmail.com>
Committed: Fri Dec 27 04:45:04 2013 +0800
----------------------------------------------------------------------
.../org/apache/spark/mllib/classification/NaiveBayes.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/654f4217/mllib/src/main/scala/org/apache/spark/mllib/classification/NaiveBayes.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/classification/NaiveBayes.scala b/mllib/src/main/scala/org/apache/spark/mllib/classification/NaiveBayes.scala
index 4c96b24..2bc4c5a 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/classification/NaiveBayes.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/classification/NaiveBayes.scala
@@ -49,8 +49,9 @@ class NaiveBayesModel(val weightPerLabel: Array[Double],
class NaiveBayes private (val lambda: Double = 1.0) // smoothing parameter
extends Serializable with Logging {
- private[this] def vectorAdd(v1: Array[Double], v2: Array[Double]) =
+ private def vectorAdd(v1: Array[Double], v2: Array[Double]) = {
v1.zip(v2).map(pair => pair._1 + pair._2)
+ }
/**
* Run the algorithm with the configured parameters on an input
@@ -62,7 +63,7 @@ class NaiveBayes private (val lambda: Double = 1.0) // smoothing parameter
*/
def run(C: Int, D: Int, data: RDD[LabeledPoint]) = {
val countsAndSummedFeatures = data.map { case LabeledPoint(label, features) =>
- label.toInt ->(1, features)
+ label.toInt -> (1, features)
}.reduceByKey { (lhs, rhs) =>
(lhs._1 + rhs._1, vectorAdd(lhs._2, rhs._2))
}