Skip to content

Commit 0d3fc5b

Browse files
committed
setDefault after param
1 parent a9dbf59 commit 0d3fc5b

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

mllib/src/main/scala/org/apache/spark/ml/param/params.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ trait Params extends Identifiable with Serializable {
186186
* Sets a default value.
187187
*/
188188
protected final def setDefault[T](param: Param[T], value: T): this.type = {
189+
println(s"param: $param")
190+
println(param.parent)
191+
println(value)
189192
require(param.parent.eq(this))
190193
defaultValues.put(param, value)
191194
this

mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamCodeGen.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ private[shared] object SharedParamCodeGen {
104104
}.getOrElse("")
105105
val setDefault = defaultValue.map { v =>
106106
s"""
107-
| setDefault($name, $v)
108-
|""".stripMargin
107+
| setDefault($name, $v)
108+
|""".stripMargin
109109
}.getOrElse("")
110110

111111
s"""
@@ -115,13 +115,13 @@ private[shared] object SharedParamCodeGen {
115115
| */
116116
|@DeveloperApi
117117
|trait Has$Name extends Params {
118-
|$setDefault
118+
|
119119
| /**
120120
| * Param for $doc.
121121
| * @group param
122122
| */
123123
| final val $name: $Param = new $Param(this, "$name", "$doc")
124-
|
124+
|$setDefault
125125
| /** @group getParam */
126126
| final def get$Name: $T = get($name)
127127
|}

mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ trait HasMaxIter extends Params {
6565
@DeveloperApi
6666
trait HasFeaturesCol extends Params {
6767

68-
setDefault(featuresCol, "features")
69-
7068
/**
7169
* Param for features column name.
7270
* @group param
7371
*/
7472
final val featuresCol: Param[String] = new Param[String](this, "featuresCol", "features column name")
7573

74+
setDefault(featuresCol, "features")
75+
7676
/** @group getParam */
7777
final def getFeaturesCol: String = get(featuresCol)
7878
}
@@ -84,14 +84,14 @@ trait HasFeaturesCol extends Params {
8484
@DeveloperApi
8585
trait HasLabelCol extends Params {
8686

87-
setDefault(labelCol, "label")
88-
8987
/**
9088
* Param for label column name.
9189
* @group param
9290
*/
9391
final val labelCol: Param[String] = new Param[String](this, "labelCol", "label column name")
9492

93+
setDefault(labelCol, "label")
94+
9595
/** @group getParam */
9696
final def getLabelCol: String = get(labelCol)
9797
}
@@ -103,14 +103,14 @@ trait HasLabelCol extends Params {
103103
@DeveloperApi
104104
trait HasPredictionCol extends Params {
105105

106-
setDefault(predictionCol, "prediction")
107-
108106
/**
109107
* Param for prediction column name.
110108
* @group param
111109
*/
112110
final val predictionCol: Param[String] = new Param[String](this, "predictionCol", "prediction column name")
113111

112+
setDefault(predictionCol, "prediction")
113+
114114
/** @group getParam */
115115
final def getPredictionCol: String = get(predictionCol)
116116
}
@@ -122,14 +122,14 @@ trait HasPredictionCol extends Params {
122122
@DeveloperApi
123123
trait HasRawPredictionCol extends Params {
124124

125-
setDefault(rawPredictionCol, "rawPrediction")
126-
127125
/**
128126
* Param for raw prediction (a.k.a. confidence) column name.
129127
* @group param
130128
*/
131129
final val rawPredictionCol: Param[String] = new Param[String](this, "rawPredictionCol", "raw prediction (a.k.a. confidence) column name")
132130

131+
setDefault(rawPredictionCol, "rawPrediction")
132+
133133
/** @group getParam */
134134
final def getRawPredictionCol: String = get(rawPredictionCol)
135135
}
@@ -141,14 +141,14 @@ trait HasRawPredictionCol extends Params {
141141
@DeveloperApi
142142
trait HasProbabilityCol extends Params {
143143

144-
setDefault(probabilityCol, "probability")
145-
146144
/**
147145
* Param for column name for predicted class conditional probabilities.
148146
* @group param
149147
*/
150148
final val probabilityCol: Param[String] = new Param[String](this, "probabilityCol", "column name for predicted class conditional probabilities")
151149

150+
setDefault(probabilityCol, "probability")
151+
152152
/** @group getParam */
153153
final def getProbabilityCol: String = get(probabilityCol)
154154
}

0 commit comments

Comments
 (0)