aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLian, Cheng <rhythm.mail@gmail.com>2013-12-27 04:45:04 +0800
committerLian, Cheng <rhythm.mail@gmail.com>2013-12-27 04:45:04 +0800
commit654f42174aa912fec7355d779e4e02731c535c94 (patch)
tree07660a9d4a74c9f0f1fd04faeea37761cca7ff65
parentc0337c5bbfd5126c64964a9fdefd2bef11727d87 (diff)
downloadspark-654f42174aa912fec7355d779e4e02731c535c94.tar.gz
spark-654f42174aa912fec7355d779e4e02731c535c94.tar.bz2
spark-654f42174aa912fec7355d779e4e02731c535c94.zip
Reformatted some lines commented by Matei
-rw-r--r--mllib/src/main/scala/org/apache/spark/mllib/classification/NaiveBayes.scala5
1 files changed, 3 insertions, 2 deletions
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 4c96b241eb..2bc4c5afc0 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))
}