renamed probabilities to probability in method names

apache · May 5, 2015 · 15b9957 · 15b9957
1 parent 5cda84d
commit 15b9957
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala
@@ -119,7 +119,7 @@ class LogisticRegressionModel private[ml] (
     if (score(features) > getThreshold) 1 else 0
   }
 
-  override protected def raw2probabilitiesInPlace(rawPrediction: Vector): Vector = {
+  override protected def raw2probabilityInPlace(rawPrediction: Vector): Vector = {
     rawPrediction match {
       case dv: DenseVector =>
         var i = 0

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
@@ -104,9 +104,9 @@ private[spark] abstract class ProbabilisticClassificationModel[
     }
     if ($(probabilityCol).nonEmpty) {
       val probUDF = if ($(rawPredictionCol).nonEmpty) {
-        callUDF(raw2probabilities _, new VectorUDT, col($(rawPredictionCol)))
+        callUDF(raw2probability _, new VectorUDT, col($(rawPredictionCol)))
       } else {
-        callUDF(predictProbabilities _, new VectorUDT, col($(featuresCol)))
+        callUDF(predictProbability _, new VectorUDT, col($(featuresCol)))
       }
       outputData = outputData.withColumn($(probabilityCol), probUDF)
       numColsOutput += 1
@@ -139,12 +139,12 @@ private[spark] abstract class ProbabilisticClassificationModel[
    *
    * @return Estimated class conditional probabilities (modified input vector)
    */
-  protected def raw2probabilitiesInPlace(rawPrediction: Vector): Vector
+  protected def raw2probabilityInPlace(rawPrediction: Vector): Vector
 
-  /** Non-in-place version of raw2probabilitiesInPlace */
-  protected def raw2probabilities(rawPrediction: Vector): Vector = {
+  /** Non-in-place version of [[raw2probabilityInPlace()]] */
+  protected def raw2probability(rawPrediction: Vector): Vector = {
     val probs = rawPrediction.copy
-    raw2probabilitiesInPlace(probs)
+    raw2probabilityInPlace(probs)
   }
 
   /**
@@ -155,9 +155,9 @@ private[spark] abstract class ProbabilisticClassificationModel[
    *
    * @return Estimated class conditional probabilities
    */
-  protected def predictProbabilities(features: FeaturesType): Vector = {
+  protected def predictProbability(features: FeaturesType): Vector = {
     val rawPreds = predictRaw(features)
-    raw2probabilitiesInPlace(rawPreds)
+    raw2probabilityInPlace(rawPreds)
   }
 
   /**