Repository: spark Updated Branches: refs/heads/master a95252823 -> 00ad4f054
[SPARK-14900][ML][PYSPARK] Add accuracy and deprecate precison,recall,f1 ## What changes were proposed in this pull request? 1, add accuracy for MulticlassMetrics 2, deprecate overall precision,recall,f1 and recommend accuracy usage ## How was this patch tested? manual tests in pyspark shell Author: Zheng RuiFeng <ruife...@foxmail.com> Closes #13511 from zhengruifeng/deprecate_py_precisonrecall. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/00ad4f05 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/00ad4f05 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/00ad4f05 Branch: refs/heads/master Commit: 00ad4f054cd044e17d29b7c2c62efd8616462619 Parents: a952528 Author: Zheng RuiFeng <ruife...@foxmail.com> Authored: Mon Jun 6 15:19:22 2016 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Mon Jun 6 15:19:22 2016 +0100 ---------------------------------------------------------------------- python/pyspark/mllib/evaluation.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/00ad4f05/python/pyspark/mllib/evaluation.py ---------------------------------------------------------------------- diff --git a/python/pyspark/mllib/evaluation.py b/python/pyspark/mllib/evaluation.py index 5f32f09..2eaac87 100644 --- a/python/pyspark/mllib/evaluation.py +++ b/python/pyspark/mllib/evaluation.py @@ -15,6 +15,8 @@ # limitations under the License. # +import warnings + from pyspark import since from pyspark.mllib.common import JavaModelWrapper, callMLlibFunc from pyspark.sql import SQLContext @@ -181,6 +183,8 @@ class MulticlassMetrics(JavaModelWrapper): 0.66... >>> metrics.recall() 0.66... + >>> metrics.accuracy() + 0.66... >>> metrics.weightedFalsePositiveRate 0.19... >>> metrics.weightedPrecision @@ -233,6 +237,8 @@ class MulticlassMetrics(JavaModelWrapper): Returns precision or precision for a given label (category) if specified. """ if label is None: + # note:: Deprecated in 2.0.0. Use accuracy. + warnings.warn("Deprecated in 2.0.0. Use accuracy.") return self.call("precision") else: return self.call("precision", float(label)) @@ -243,6 +249,8 @@ class MulticlassMetrics(JavaModelWrapper): Returns recall or recall for a given label (category) if specified. """ if label is None: + # note:: Deprecated in 2.0.0. Use accuracy. + warnings.warn("Deprecated in 2.0.0. Use accuracy.") return self.call("recall") else: return self.call("recall", float(label)) @@ -254,6 +262,8 @@ class MulticlassMetrics(JavaModelWrapper): """ if beta is None: if label is None: + # note:: Deprecated in 2.0.0. Use accuracy. + warnings.warn("Deprecated in 2.0.0. Use accuracy.") return self.call("fMeasure") else: return self.call("fMeasure", label) @@ -263,6 +273,14 @@ class MulticlassMetrics(JavaModelWrapper): else: return self.call("fMeasure", label, beta) + @since('2.0.0') + def accuracy(self): + """ + Returns accuracy (equals to the total number of correctly classified instances + out of the total number of instances). + """ + return self.call("accuracy") + @property @since('1.4.0') def weightedTruePositiveRate(self): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
