spark git commit: Revert "[SPARK-25758][ML] Deprecate computeCost on BisectingKMeans"

2018-10-20 Thread wenchen 
Repository: spark
Updated Branches:
  refs/heads/master b8c6ba9e6 -> 2fbbcd0d2


Revert "[SPARK-25758][ML] Deprecate computeCost on BisectingKMeans"

This reverts commit c2962546d9a5900a5628a31b83d2c4b22c3a7936.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2fbbcd0d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2fbbcd0d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2fbbcd0d

Branch: refs/heads/master
Commit: 2fbbcd0d27b0db220648f3905c5a1518464512ff
Parents: b8c6ba9
Author: Wenchen Fan 
Authored: Sun Oct 21 09:12:29 2018 +0800
Committer: Wenchen Fan 
Committed: Sun Oct 21 09:12:29 2018 +0800

--
 .../scala/org/apache/spark/ml/clustering/BisectingKMeans.scala | 5 -
 python/pyspark/ml/clustering.py| 6 --
 2 files changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/2fbbcd0d/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala
--
diff --git 
a/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala 
b/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala
index 2243d99..5cb16cc 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala
@@ -125,13 +125,8 @@ class BisectingKMeansModel private[ml] (
   /**
* Computes the sum of squared distances between the input points and their 
corresponding cluster
* centers.
-   *
-   * @deprecated This method is deprecated and will be removed in 3.0.0. Use 
ClusteringEvaluator
-   * instead. You can also get the cost on the training dataset in 
the summary.
*/
   @Since("2.0.0")
-  @deprecated("This method is deprecated and will be removed in 3.0.0. Use 
ClusteringEvaluator " +
-"instead. You can also get the cost on the training dataset in the 
summary.", "2.4.0")
   def computeCost(dataset: Dataset[_]): Double = {
 SchemaUtils.validateVectorCompatibleColumn(dataset.schema, getFeaturesCol)
 val data = DatasetUtils.columnToOldVector(dataset, getFeaturesCol)

http://git-wip-us.apache.org/repos/asf/spark/blob/2fbbcd0d/python/pyspark/ml/clustering.py
--
diff --git a/python/pyspark/ml/clustering.py b/python/pyspark/ml/clustering.py
index 11eb124..5ef4e76 100644
--- a/python/pyspark/ml/clustering.py
+++ b/python/pyspark/ml/clustering.py
@@ -540,13 +540,7 @@ class BisectingKMeansModel(JavaModel, JavaMLWritable, 
JavaMLReadable):
 """
 Computes the sum of squared distances between the input points
 and their corresponding cluster centers.
-
-..note:: Deprecated in 2.4.0. It will be removed in 3.0.0. Use 
ClusteringEvaluator instead.
-   You can also get the cost on the training dataset in the summary.
 """
-warnings.warn("Deprecated in 2.4.0. It will be removed in 3.0.0. Use 
ClusteringEvaluator "
-  "instead. You can also get the cost on the training 
dataset in the summary.",
-  DeprecationWarning)
 return self._call_java("computeCost", dataset)
 
 @property


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: Revert "[SPARK-25758][ML] Deprecate computeCost on BisectingKMeans"

2018-10-19 Thread lixiao 
Repository: spark
Updated Branches:
  refs/heads/branch-2.4 1001d2314 -> 432697c7b


Revert "[SPARK-25758][ML] Deprecate computeCost on BisectingKMeans"

This reverts commit c2962546d9a5900a5628a31b83d2c4b22c3a7936.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/432697c7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/432697c7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/432697c7

Branch: refs/heads/branch-2.4
Commit: 432697c7b58785ca8439717fa748a72224cf0859
Parents: 1001d23
Author: gatorsmile 
Authored: Fri Oct 19 14:57:52 2018 -0700
Committer: gatorsmile 
Committed: Fri Oct 19 14:57:52 2018 -0700

--
 .../scala/org/apache/spark/ml/clustering/BisectingKMeans.scala | 5 -
 python/pyspark/ml/clustering.py| 6 --
 2 files changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/432697c7/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala
--
diff --git 
a/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala 
b/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala
index 2243d99..5cb16cc 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/clustering/BisectingKMeans.scala
@@ -125,13 +125,8 @@ class BisectingKMeansModel private[ml] (
   /**
* Computes the sum of squared distances between the input points and their 
corresponding cluster
* centers.
-   *
-   * @deprecated This method is deprecated and will be removed in 3.0.0. Use 
ClusteringEvaluator
-   * instead. You can also get the cost on the training dataset in 
the summary.
*/
   @Since("2.0.0")
-  @deprecated("This method is deprecated and will be removed in 3.0.0. Use 
ClusteringEvaluator " +
-"instead. You can also get the cost on the training dataset in the 
summary.", "2.4.0")
   def computeCost(dataset: Dataset[_]): Double = {
 SchemaUtils.validateVectorCompatibleColumn(dataset.schema, getFeaturesCol)
 val data = DatasetUtils.columnToOldVector(dataset, getFeaturesCol)

http://git-wip-us.apache.org/repos/asf/spark/blob/432697c7/python/pyspark/ml/clustering.py
--
diff --git a/python/pyspark/ml/clustering.py b/python/pyspark/ml/clustering.py
index 11eb124..5ef4e76 100644
--- a/python/pyspark/ml/clustering.py
+++ b/python/pyspark/ml/clustering.py
@@ -540,13 +540,7 @@ class BisectingKMeansModel(JavaModel, JavaMLWritable, 
JavaMLReadable):
 """
 Computes the sum of squared distances between the input points
 and their corresponding cluster centers.
-
-..note:: Deprecated in 2.4.0. It will be removed in 3.0.0. Use 
ClusteringEvaluator instead.
-   You can also get the cost on the training dataset in the summary.
 """
-warnings.warn("Deprecated in 2.4.0. It will be removed in 3.0.0. Use 
ClusteringEvaluator "
-  "instead. You can also get the cost on the training 
dataset in the summary.",
-  DeprecationWarning)
 return self._call_java("computeCost", dataset)
 
 @property


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org