spark git commit: [SPARK-20606][ML] Revert "[] ML 2.2 QA: Remove deprecated methods for ML"
Repository: spark
Updated Branches:
refs/heads/branch-2.2 3eb0ee06a -> 80a57fa90
[SPARK-20606][ML] Revert "[] ML 2.2 QA: Remove deprecated methods for ML"
This reverts commit b8733e0ad9f5a700f385e210450fd2c10137293e.
Author: Yanbo Liang
Closes #17944 from yanboliang/spark-20606-revert.
(cherry picked from commit 0698e6c88ca11fdfd6e5498cab784cf6dbcdfacb)
Signed-off-by: Yanbo Liang
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/80a57fa9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/80a57fa9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/80a57fa9
Branch: refs/heads/branch-2.2
Commit: 80a57fa90be8dca4340345c09b4ea28fbf11a516
Parents: 3eb0ee0
Author: Yanbo Liang
Authored: Thu May 11 14:48:13 2017 +0800
Committer: Yanbo Liang
Committed: Thu May 11 14:48:26 2017 +0800
--
.../classification/DecisionTreeClassifier.scala | 18 ++--
.../spark/ml/classification/GBTClassifier.scala | 24 ++---
.../classification/RandomForestClassifier.scala | 24 ++---
.../ml/regression/DecisionTreeRegressor.scala | 18 ++--
.../spark/ml/regression/GBTRegressor.scala | 24 ++---
.../ml/regression/RandomForestRegressor.scala | 24 ++---
.../org/apache/spark/ml/tree/treeParams.scala | 105 +++
.../org/apache/spark/ml/util/ReadWrite.scala| 16 +++
project/MimaExcludes.scala | 68
python/pyspark/ml/util.py | 32 ++
10 files changed, 219 insertions(+), 134 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/80a57fa9/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
--
diff --git
a/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
b/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
index 5fb105c..9f60f08 100644
---
a/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
+++
b/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
@@ -54,27 +54,27 @@ class DecisionTreeClassifier @Since("1.4.0") (
/** @group setParam */
@Since("1.4.0")
- def setMaxDepth(value: Int): this.type = set(maxDepth, value)
+ override def setMaxDepth(value: Int): this.type = set(maxDepth, value)
/** @group setParam */
@Since("1.4.0")
- def setMaxBins(value: Int): this.type = set(maxBins, value)
+ override def setMaxBins(value: Int): this.type = set(maxBins, value)
/** @group setParam */
@Since("1.4.0")
- def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode,
value)
+ override def setMinInstancesPerNode(value: Int): this.type =
set(minInstancesPerNode, value)
/** @group setParam */
@Since("1.4.0")
- def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
+ override def setMinInfoGain(value: Double): this.type = set(minInfoGain,
value)
/** @group expertSetParam */
@Since("1.4.0")
- def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
+ override def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB,
value)
/** @group expertSetParam */
@Since("1.4.0")
- def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
+ override def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds,
value)
/**
* Specifies how often to checkpoint the cached node IDs.
@@ -86,15 +86,15 @@ class DecisionTreeClassifier @Since("1.4.0") (
* @group setParam
*/
@Since("1.4.0")
- def setCheckpointInterval(value: Int): this.type = set(checkpointInterval,
value)
+ override def setCheckpointInterval(value: Int): this.type =
set(checkpointInterval, value)
/** @group setParam */
@Since("1.4.0")
- def setImpurity(value: String): this.type = set(impurity, value)
+ override def setImpurity(value: String): this.type = set(impurity, value)
/** @group setParam */
@Since("1.6.0")
- def setSeed(value: Long): this.type = set(seed, value)
+ override def setSeed(value: Long): this.type = set(seed, value)
override protected def train(dataset: Dataset[_]):
DecisionTreeClassificationModel = {
val categoricalFeatures: Map[Int, Int] =
http://git-wip-us.apache.org/repos/asf/spark/blob/80a57fa9/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
--
diff --git
a/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
b/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
index 263ed10..ade0960 100644
---
a/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
+++
b/mllib/src
spark git commit: [SPARK-20606][ML] Revert "[] ML 2.2 QA: Remove deprecated methods for ML"
Repository: spark
Updated Branches:
refs/heads/master 8ddbc431d -> 0698e6c88
[SPARK-20606][ML] Revert "[] ML 2.2 QA: Remove deprecated methods for ML"
This reverts commit b8733e0ad9f5a700f385e210450fd2c10137293e.
Author: Yanbo Liang
Closes #17944 from yanboliang/spark-20606-revert.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0698e6c8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0698e6c8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0698e6c8
Branch: refs/heads/master
Commit: 0698e6c88ca11fdfd6e5498cab784cf6dbcdfacb
Parents: 8ddbc43
Author: Yanbo Liang
Authored: Thu May 11 14:48:13 2017 +0800
Committer: Yanbo Liang
Committed: Thu May 11 14:48:13 2017 +0800
--
.../classification/DecisionTreeClassifier.scala | 18 ++--
.../spark/ml/classification/GBTClassifier.scala | 24 ++---
.../classification/RandomForestClassifier.scala | 24 ++---
.../ml/regression/DecisionTreeRegressor.scala | 18 ++--
.../spark/ml/regression/GBTRegressor.scala | 24 ++---
.../ml/regression/RandomForestRegressor.scala | 24 ++---
.../org/apache/spark/ml/tree/treeParams.scala | 105 +++
.../org/apache/spark/ml/util/ReadWrite.scala| 16 +++
project/MimaExcludes.scala | 68
python/pyspark/ml/util.py | 32 ++
10 files changed, 219 insertions(+), 134 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/0698e6c8/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
--
diff --git
a/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
b/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
index 5fb105c..9f60f08 100644
---
a/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
+++
b/mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala
@@ -54,27 +54,27 @@ class DecisionTreeClassifier @Since("1.4.0") (
/** @group setParam */
@Since("1.4.0")
- def setMaxDepth(value: Int): this.type = set(maxDepth, value)
+ override def setMaxDepth(value: Int): this.type = set(maxDepth, value)
/** @group setParam */
@Since("1.4.0")
- def setMaxBins(value: Int): this.type = set(maxBins, value)
+ override def setMaxBins(value: Int): this.type = set(maxBins, value)
/** @group setParam */
@Since("1.4.0")
- def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode,
value)
+ override def setMinInstancesPerNode(value: Int): this.type =
set(minInstancesPerNode, value)
/** @group setParam */
@Since("1.4.0")
- def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
+ override def setMinInfoGain(value: Double): this.type = set(minInfoGain,
value)
/** @group expertSetParam */
@Since("1.4.0")
- def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
+ override def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB,
value)
/** @group expertSetParam */
@Since("1.4.0")
- def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
+ override def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds,
value)
/**
* Specifies how often to checkpoint the cached node IDs.
@@ -86,15 +86,15 @@ class DecisionTreeClassifier @Since("1.4.0") (
* @group setParam
*/
@Since("1.4.0")
- def setCheckpointInterval(value: Int): this.type = set(checkpointInterval,
value)
+ override def setCheckpointInterval(value: Int): this.type =
set(checkpointInterval, value)
/** @group setParam */
@Since("1.4.0")
- def setImpurity(value: String): this.type = set(impurity, value)
+ override def setImpurity(value: String): this.type = set(impurity, value)
/** @group setParam */
@Since("1.6.0")
- def setSeed(value: Long): this.type = set(seed, value)
+ override def setSeed(value: Long): this.type = set(seed, value)
override protected def train(dataset: Dataset[_]):
DecisionTreeClassificationModel = {
val categoricalFeatures: Map[Int, Int] =
http://git-wip-us.apache.org/repos/asf/spark/blob/0698e6c8/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
--
diff --git
a/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
b/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
index 263ed10..ade0960 100644
---
a/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
+++
b/mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala
@@ -70,27 +70,27 @@ class GBTClassifier
