setDefault after param

nemccarthy · Apr 8, 2015 · 0d3fc5b · 0d3fc5b
1 parent a9dbf59
commit 0d3fc5b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/ml/param/params.scala b/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
@@ -186,6 +186,9 @@ trait Params extends Identifiable with Serializable {
    * Sets a default value.
    */
   protected final def setDefault[T](param: Param[T], value: T): this.type = {
+    println(s"param: $param")
+    println(param.parent)
+    println(value)
     require(param.parent.eq(this))
     defaultValues.put(param, value)
     this

diff --git a/mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamCodeGen.scala b/mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamCodeGen.scala
@@ -104,8 +104,8 @@ private[shared] object SharedParamCodeGen {
     }.getOrElse("")
     val setDefault = defaultValue.map { v =>
       s"""
-        |  setDefault($name, $v)
-        |""".stripMargin
+         |  setDefault($name, $v)
+         |""".stripMargin
     }.getOrElse("")
 
     s"""
@@ -115,13 +115,13 @@ private[shared] object SharedParamCodeGen {
       | */
       |@DeveloperApi
       |trait Has$Name extends Params {
-      |$setDefault
+      |
       |  /**
       |   * Param for $doc.
       |   * @group param
       |   */
       |  final val $name: $Param = new $Param(this, "$name", "$doc")
-      |
+      |$setDefault
       |  /** @group getParam */
       |  final def get$Name: $T = get($name)
       |}

diff --git a/mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala b/mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala
@@ -65,14 +65,14 @@ trait HasMaxIter extends Params {
 @DeveloperApi
 trait HasFeaturesCol extends Params {
 
-  setDefault(featuresCol, "features")
-
   /**
    * Param for features column name.
    * @group param
    */
   final val featuresCol: Param[String] = new Param[String](this, "featuresCol", "features column name")
 
+  setDefault(featuresCol, "features")
+
   /** @group getParam */
   final def getFeaturesCol: String = get(featuresCol)
 }
@@ -84,14 +84,14 @@ trait HasFeaturesCol extends Params {
 @DeveloperApi
 trait HasLabelCol extends Params {
 
-  setDefault(labelCol, "label")
-
   /**
    * Param for label column name.
    * @group param
    */
   final val labelCol: Param[String] = new Param[String](this, "labelCol", "label column name")
 
+  setDefault(labelCol, "label")
+
   /** @group getParam */
   final def getLabelCol: String = get(labelCol)
 }
@@ -103,14 +103,14 @@ trait HasLabelCol extends Params {
 @DeveloperApi
 trait HasPredictionCol extends Params {
 
-  setDefault(predictionCol, "prediction")
-
   /**
    * Param for prediction column name.
    * @group param
    */
   final val predictionCol: Param[String] = new Param[String](this, "predictionCol", "prediction column name")
 
+  setDefault(predictionCol, "prediction")
+
   /** @group getParam */
   final def getPredictionCol: String = get(predictionCol)
 }
@@ -122,14 +122,14 @@ trait HasPredictionCol extends Params {
 @DeveloperApi
 trait HasRawPredictionCol extends Params {
 
-  setDefault(rawPredictionCol, "rawPrediction")
-
   /**
    * Param for raw prediction (a.k.a. confidence) column name.
    * @group param
    */
   final val rawPredictionCol: Param[String] = new Param[String](this, "rawPredictionCol", "raw prediction (a.k.a. confidence) column name")
 
+  setDefault(rawPredictionCol, "rawPrediction")
+
   /** @group getParam */
   final def getRawPredictionCol: String = get(rawPredictionCol)
 }
@@ -141,14 +141,14 @@ trait HasRawPredictionCol extends Params {
 @DeveloperApi
 trait HasProbabilityCol extends Params {
 
-  setDefault(probabilityCol, "probability")
-
   /**
    * Param for column name for predicted class conditional probabilities.
    * @group param
    */
   final val probabilityCol: Param[String] = new Param[String](this, "probabilityCol", "column name for predicted class conditional probabilities")
 
+  setDefault(probabilityCol, "probability")
+
   /** @group getParam */
   final def getProbabilityCol: String = get(probabilityCol)
 }