Skip to content

Commit c3524de

Browse files
author
Robert Kruszewski
committed
Revert "[SPARK-26127][ML] Remove deprecated setters from tree regression and classification models"
This reverts commit 4aa9ccb.
1 parent f97d5d4 commit c3524de

File tree

8 files changed

+178
-138
lines changed

8 files changed

+178
-138
lines changed

‎mllib/src/main/scala/org/apache/spark/ml/classification/DecisionTreeClassifier.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,27 @@ class DecisionTreeClassifier @Since("1.4.0") (
5555

5656
/** @group setParam */
5757
@Since("1.4.0")
58-
def setMaxDepth(value: Int): this.type = set(maxDepth, value)
58+
override def setMaxDepth(value: Int): this.type = set(maxDepth, value)
5959

6060
/** @group setParam */
6161
@Since("1.4.0")
62-
def setMaxBins(value: Int): this.type = set(maxBins, value)
62+
override def setMaxBins(value: Int): this.type = set(maxBins, value)
6363

6464
/** @group setParam */
6565
@Since("1.4.0")
66-
def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
66+
override def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
6767

6868
/** @group setParam */
6969
@Since("1.4.0")
70-
def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
70+
override def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
7171

7272
/** @group expertSetParam */
7373
@Since("1.4.0")
74-
def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
74+
override def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
7575

7676
/** @group expertSetParam */
7777
@Since("1.4.0")
78-
def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
78+
override def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
7979

8080
/**
8181
* Specifies how often to checkpoint the cached node IDs.
@@ -87,15 +87,15 @@ class DecisionTreeClassifier @Since("1.4.0") (
8787
* @group setParam
8888
*/
8989
@Since("1.4.0")
90-
def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
90+
override def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
9191

9292
/** @group setParam */
9393
@Since("1.4.0")
94-
def setImpurity(value: String): this.type = set(impurity, value)
94+
override def setImpurity(value: String): this.type = set(impurity, value)
9595

9696
/** @group setParam */
9797
@Since("1.6.0")
98-
def setSeed(value: Long): this.type = set(seed, value)
98+
override def setSeed(value: Long): this.type = set(seed, value)
9999

100100
override protected def train(
101101
dataset: Dataset[_]): DecisionTreeClassificationModel = instrumented { instr =>

‎mllib/src/main/scala/org/apache/spark/ml/classification/GBTClassifier.scala

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,27 +69,27 @@ class GBTClassifier @Since("1.4.0") (
6969

7070
/** @group setParam */
7171
@Since("1.4.0")
72-
def setMaxDepth(value: Int): this.type = set(maxDepth, value)
72+
override def setMaxDepth(value: Int): this.type = set(maxDepth, value)
7373

7474
/** @group setParam */
7575
@Since("1.4.0")
76-
def setMaxBins(value: Int): this.type = set(maxBins, value)
76+
override def setMaxBins(value: Int): this.type = set(maxBins, value)
7777

7878
/** @group setParam */
7979
@Since("1.4.0")
80-
def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
80+
override def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
8181

8282
/** @group setParam */
8383
@Since("1.4.0")
84-
def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
84+
override def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
8585

8686
/** @group expertSetParam */
8787
@Since("1.4.0")
88-
def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
88+
override def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
8989

9090
/** @group expertSetParam */
9191
@Since("1.4.0")
92-
def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
92+
override def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
9393

9494
/**
9595
* Specifies how often to checkpoint the cached node IDs.
@@ -101,7 +101,7 @@ class GBTClassifier @Since("1.4.0") (
101101
* @group setParam
102102
*/
103103
@Since("1.4.0")
104-
def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
104+
override def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
105105

106106
/**
107107
* The impurity setting is ignored for GBT models.
@@ -110,7 +110,7 @@ class GBTClassifier @Since("1.4.0") (
110110
* @group setParam
111111
*/
112112
@Since("1.4.0")
113-
def setImpurity(value: String): this.type = {
113+
override def setImpurity(value: String): this.type = {
114114
logWarning("GBTClassifier.setImpurity should NOT be used")
115115
this
116116
}
@@ -119,25 +119,25 @@ class GBTClassifier @Since("1.4.0") (
119119

120120
/** @group setParam */
121121
@Since("1.4.0")
122-
def setSubsamplingRate(value: Double): this.type = set(subsamplingRate, value)
122+
override def setSubsamplingRate(value: Double): this.type = set(subsamplingRate, value)
123123

124124
/** @group setParam */
125125
@Since("1.4.0")
126-
def setSeed(value: Long): this.type = set(seed, value)
126+
override def setSeed(value: Long): this.type = set(seed, value)
127127

128128
// Parameters from GBTParams:
129129

130130
/** @group setParam */
131131
@Since("1.4.0")
132-
def setMaxIter(value: Int): this.type = set(maxIter, value)
132+
override def setMaxIter(value: Int): this.type = set(maxIter, value)
133133

134134
/** @group setParam */
135135
@Since("1.4.0")
136-
def setStepSize(value: Double): this.type = set(stepSize, value)
136+
override def setStepSize(value: Double): this.type = set(stepSize, value)
137137

138138
/** @group setParam */
139139
@Since("2.3.0")
140-
def setFeatureSubsetStrategy(value: String): this.type =
140+
override def setFeatureSubsetStrategy(value: String): this.type =
141141
set(featureSubsetStrategy, value)
142142

143143
// Parameters from GBTClassifierParams:

‎mllib/src/main/scala/org/apache/spark/ml/classification/RandomForestClassifier.scala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,27 @@ class RandomForestClassifier @Since("1.4.0") (
5757

5858
/** @group setParam */
5959
@Since("1.4.0")
60-
def setMaxDepth(value: Int): this.type = set(maxDepth, value)
60+
override def setMaxDepth(value: Int): this.type = set(maxDepth, value)
6161

6262
/** @group setParam */
6363
@Since("1.4.0")
64-
def setMaxBins(value: Int): this.type = set(maxBins, value)
64+
override def setMaxBins(value: Int): this.type = set(maxBins, value)
6565

6666
/** @group setParam */
6767
@Since("1.4.0")
68-
def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
68+
override def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
6969

7070
/** @group setParam */
7171
@Since("1.4.0")
72-
def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
72+
override def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
7373

7474
/** @group expertSetParam */
7575
@Since("1.4.0")
76-
def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
76+
override def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
7777

7878
/** @group expertSetParam */
7979
@Since("1.4.0")
80-
def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
80+
override def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
8181

8282
/**
8383
* Specifies how often to checkpoint the cached node IDs.
@@ -89,31 +89,31 @@ class RandomForestClassifier @Since("1.4.0") (
8989
* @group setParam
9090
*/
9191
@Since("1.4.0")
92-
def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
92+
override def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
9393

9494
/** @group setParam */
9595
@Since("1.4.0")
96-
def setImpurity(value: String): this.type = set(impurity, value)
96+
override def setImpurity(value: String): this.type = set(impurity, value)
9797

9898
// Parameters from TreeEnsembleParams:
9999

100100
/** @group setParam */
101101
@Since("1.4.0")
102-
def setSubsamplingRate(value: Double): this.type = set(subsamplingRate, value)
102+
override def setSubsamplingRate(value: Double): this.type = set(subsamplingRate, value)
103103

104104
/** @group setParam */
105105
@Since("1.4.0")
106-
def setSeed(value: Long): this.type = set(seed, value)
106+
override def setSeed(value: Long): this.type = set(seed, value)
107107

108108
// Parameters from RandomForestParams:
109109

110110
/** @group setParam */
111111
@Since("1.4.0")
112-
def setNumTrees(value: Int): this.type = set(numTrees, value)
112+
override def setNumTrees(value: Int): this.type = set(numTrees, value)
113113

114114
/** @group setParam */
115115
@Since("1.4.0")
116-
def setFeatureSubsetStrategy(value: String): this.type =
116+
override def setFeatureSubsetStrategy(value: String): this.type =
117117
set(featureSubsetStrategy, value)
118118

119119
override protected def train(

‎mllib/src/main/scala/org/apache/spark/ml/regression/DecisionTreeRegressor.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,27 @@ class DecisionTreeRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: S
5454
// Override parameter setters from parent trait for Java API compatibility.
5555
/** @group setParam */
5656
@Since("1.4.0")
57-
def setMaxDepth(value: Int): this.type = set(maxDepth, value)
57+
override def setMaxDepth(value: Int): this.type = set(maxDepth, value)
5858

5959
/** @group setParam */
6060
@Since("1.4.0")
61-
def setMaxBins(value: Int): this.type = set(maxBins, value)
61+
override def setMaxBins(value: Int): this.type = set(maxBins, value)
6262

6363
/** @group setParam */
6464
@Since("1.4.0")
65-
def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
65+
override def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
6666

6767
/** @group setParam */
6868
@Since("1.4.0")
69-
def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
69+
override def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
7070

7171
/** @group expertSetParam */
7272
@Since("1.4.0")
73-
def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
73+
override def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
7474

7575
/** @group expertSetParam */
7676
@Since("1.4.0")
77-
def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
77+
override def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
7878

7979
/**
8080
* Specifies how often to checkpoint the cached node IDs.
@@ -86,15 +86,15 @@ class DecisionTreeRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: S
8686
* @group setParam
8787
*/
8888
@Since("1.4.0")
89-
def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
89+
override def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
9090

9191
/** @group setParam */
9292
@Since("1.4.0")
93-
def setImpurity(value: String): this.type = set(impurity, value)
93+
override def setImpurity(value: String): this.type = set(impurity, value)
9494

9595
/** @group setParam */
9696
@Since("1.6.0")
97-
def setSeed(value: Long): this.type = set(seed, value)
97+
override def setSeed(value: Long): this.type = set(seed, value)
9898

9999
/** @group setParam */
100100
@Since("2.0.0")

‎mllib/src/main/scala/org/apache/spark/ml/regression/GBTRegressor.scala

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import org.apache.spark.ml.util.DefaultParamsReader.Metadata
3434
import org.apache.spark.ml.util.Instrumentation.instrumented
3535
import org.apache.spark.mllib.tree.configuration.{Algo => OldAlgo}
3636
import org.apache.spark.mllib.tree.model.{GradientBoostedTreesModel => OldGBTModel}
37+
import org.apache.spark.rdd.RDD
3738
import org.apache.spark.sql.{DataFrame, Dataset, Row}
3839
import org.apache.spark.sql.functions._
3940

@@ -68,27 +69,27 @@ class GBTRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
6869

6970
/** @group setParam */
7071
@Since("1.4.0")
71-
def setMaxDepth(value: Int): this.type = set(maxDepth, value)
72+
override def setMaxDepth(value: Int): this.type = set(maxDepth, value)
7273

7374
/** @group setParam */
7475
@Since("1.4.0")
75-
def setMaxBins(value: Int): this.type = set(maxBins, value)
76+
override def setMaxBins(value: Int): this.type = set(maxBins, value)
7677

7778
/** @group setParam */
7879
@Since("1.4.0")
79-
def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
80+
override def setMinInstancesPerNode(value: Int): this.type = set(minInstancesPerNode, value)
8081

8182
/** @group setParam */
8283
@Since("1.4.0")
83-
def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
84+
override def setMinInfoGain(value: Double): this.type = set(minInfoGain, value)
8485

8586
/** @group expertSetParam */
8687
@Since("1.4.0")
87-
def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
88+
override def setMaxMemoryInMB(value: Int): this.type = set(maxMemoryInMB, value)
8889

8990
/** @group expertSetParam */
9091
@Since("1.4.0")
91-
def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
92+
override def setCacheNodeIds(value: Boolean): this.type = set(cacheNodeIds, value)
9293

9394
/**
9495
* Specifies how often to checkpoint the cached node IDs.
@@ -100,7 +101,7 @@ class GBTRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
100101
* @group setParam
101102
*/
102103
@Since("1.4.0")
103-
def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
104+
override def setCheckpointInterval(value: Int): this.type = set(checkpointInterval, value)
104105

105106
/**
106107
* The impurity setting is ignored for GBT models.
@@ -109,7 +110,7 @@ class GBTRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
109110
* @group setParam
110111
*/
111112
@Since("1.4.0")
112-
def setImpurity(value: String): this.type = {
113+
override def setImpurity(value: String): this.type = {
113114
logWarning("GBTRegressor.setImpurity should NOT be used")
114115
this
115116
}
@@ -118,21 +119,21 @@ class GBTRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
118119

119120
/** @group setParam */
120121
@Since("1.4.0")
121-
def setSubsamplingRate(value: Double): this.type = set(subsamplingRate, value)
122+
override def setSubsamplingRate(value: Double): this.type = set(subsamplingRate, value)
122123

123124
/** @group setParam */
124125
@Since("1.4.0")
125-
def setSeed(value: Long): this.type = set(seed, value)
126+
override def setSeed(value: Long): this.type = set(seed, value)
126127

127128
// Parameters from GBTParams:
128129

129130
/** @group setParam */
130131
@Since("1.4.0")
131-
def setMaxIter(value: Int): this.type = set(maxIter, value)
132+
override def setMaxIter(value: Int): this.type = set(maxIter, value)
132133

133134
/** @group setParam */
134135
@Since("1.4.0")
135-
def setStepSize(value: Double): this.type = set(stepSize, value)
136+
override def setStepSize(value: Double): this.type = set(stepSize, value)
136137

137138
// Parameters from GBTRegressorParams:
138139

@@ -142,7 +143,7 @@ class GBTRegressor @Since("1.4.0") (@Since("1.4.0") override val uid: String)
142143

143144
/** @group setParam */
144145
@Since("2.3.0")
145-
def setFeatureSubsetStrategy(value: String): this.type =
146+
override def setFeatureSubsetStrategy(value: String): this.type =
146147
set(featureSubsetStrategy, value)
147148

148149
/** @group setParam */

0 commit comments

Comments
 (0)