You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by me...@apache.org on 2015/07/27 20:16:39 UTC
spark git commit: [SPARK-7423] [MLLIB] Modify ClassificationModel and
Probabalistic model to use Vector.argmax
Repository: spark
Updated Branches:
refs/heads/master e2f38167f -> 1f7b3d9dc
[SPARK-7423] [MLLIB] Modify ClassificationModel and Probabalistic model to use Vector.argmax
Use Vector.argmax call instead of converting to dense vector before calculating predictions.
Author: George Dittmar <ge...@gmail.com>
Closes #7670 from GeorgeDittmar/sprk-7423 and squashes the following commits:
e796747 [George Dittmar] Changing ClassificationModel and ProbabilisticClassificationModel to use Vector.argmax instead of converting to DenseVector
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1f7b3d9d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1f7b3d9d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1f7b3d9d
Branch: refs/heads/master
Commit: 1f7b3d9dc7c2ed9d31f9083284cf900fd4c21e42
Parents: e2f3816
Author: George Dittmar <ge...@gmail.com>
Authored: Mon Jul 27 11:16:33 2015 -0700
Committer: Xiangrui Meng <me...@databricks.com>
Committed: Mon Jul 27 11:16:33 2015 -0700
----------------------------------------------------------------------
.../main/scala/org/apache/spark/ml/classification/Classifier.scala | 2 +-
.../apache/spark/ml/classification/ProbabilisticClassifier.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1f7b3d9d/mllib/src/main/scala/org/apache/spark/ml/classification/Classifier.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/Classifier.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/Classifier.scala
index 85c097b..581d8fa 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/classification/Classifier.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/classification/Classifier.scala
@@ -156,5 +156,5 @@ abstract class ClassificationModel[FeaturesType, M <: ClassificationModel[Featur
* This may be overridden to support thresholds which favor particular labels.
* @return predicted label
*/
- protected def raw2prediction(rawPrediction: Vector): Double = rawPrediction.toDense.argmax
+ protected def raw2prediction(rawPrediction: Vector): Double = rawPrediction.argmax
}
http://git-wip-us.apache.org/repos/asf/spark/blob/1f7b3d9d/mllib/src/main/scala/org/apache/spark/ml/classification/ProbabilisticClassifier.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/ProbabilisticClassifier.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/ProbabilisticClassifier.scala
index 38e8323..dad4511 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/classification/ProbabilisticClassifier.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/classification/ProbabilisticClassifier.scala
@@ -173,5 +173,5 @@ private[spark] abstract class ProbabilisticClassificationModel[
* This may be overridden to support thresholds which favor particular labels.
* @return predicted label
*/
- protected def probability2prediction(probability: Vector): Double = probability.toDense.argmax
+ protected def probability2prediction(probability: Vector): Double = probability.argmax
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org