rebase

Author: DB Tsai

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

@@ -46,7 +46,7 @@ private[shared] object SharedParamsCodeGen {
       ParamDesc[String]("outputCol", "output column name"),
       ParamDesc[Int]("checkpointInterval", "checkpoint interval"),
       ParamDesc[Boolean]("fitIntercept", "whether to fit an intercept term", Some("true")),
-      ParamDesc[Long]("seed", "random seed", Some("Utils.random.nextLong()")))
+      ParamDesc[Long]("seed", "random seed", Some("Utils.random.nextLong()")),
       ParamDesc[Double]("elasticNetParam", "the ElasticNet mixing parameter"),
       ParamDesc[Double]("tol", "the convergence tolerance for iterative algorithms"))
 

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

@@ -19,7 +19,6 @@ package org.apache.spark.ml.param.shared
 
 import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.ml.param._
-import org.apache.spark.util.Utils
 
 // DO NOT MODIFY THIS FILE! It was generated by SharedParamsCodeGen.
 
@@ -42,43 +41,6 @@ trait HasRegParam extends Params {
   final def getRegParam: Double = getOrDefault(regParam)
 }
 
-/**
- * :: DeveloperApi ::
- * Trait for shared param elasticNetParam.
- */
-@DeveloperApi
-trait HasElasticNetParam extends HasRegParam {
-
-  /**
-   * param for elastic net regularization parameter
-   * @group param
-   */
-  final val elasticNetParam: DoubleParam =
-    new DoubleParam(this, "elasticNetParam", "the ElasticNet mixing parameter")
-
-  /** @group getParam */
-  def getElasticNetParam: Double = getOrDefault(elasticNetParam)
-}
-
-/**
- * :: DeveloperApi ::
- * Trait for shared param tol.
- */
-@DeveloperApi
-trait HasTol extends Params {
-
-  /**
-   * param for the convergence tolerance in the iterative algorithms;
-   * smaller value will lead to higher accuracy with the cost of more iterations
-   * @group param
-   */
-  final val tol: DoubleParam =
-    new DoubleParam(this, "tol", "the convergence tolerance for iterative algorithms")
-
-  /** @group getParam */
-  def getTol: Double = getOrDefault(tol)
-}
-
 /**
  * :: DeveloperApi ::
  * Trait for shared param maxIter.
@@ -313,4 +275,38 @@ trait HasSeed extends Params {
   /** @group getParam */
   final def getSeed: Long = getOrDefault(seed)
 }
+
+/**
+ * :: DeveloperApi ::
+ * Trait for shared param elasticNetParam.
+ */
+@DeveloperApi
+trait HasElasticNetParam extends Params {
+
+  /**
+   * Param for the ElasticNet mixing parameter.
+   * @group param
+   */
+  final val elasticNetParam: DoubleParam = new DoubleParam(this, "elasticNetParam", "the ElasticNet mixing parameter")
+
+  /** @group getParam */
+  final def getElasticNetParam: Double = getOrDefault(elasticNetParam)
+}
+
+/**
+ * :: DeveloperApi ::
+ * Trait for shared param tol.
+ */
+@DeveloperApi
+trait HasTol extends Params {
+
+  /**
+   * Param for the convergence tolerance for iterative algorithms.
+   * @group param
+   */
+  final val tol: DoubleParam = new DoubleParam(this, "tol", "the convergence tolerance for iterative algorithms")
+
+  /** @group getParam */
+  final def getTol: Double = getOrDefault(tol)
+}
 // scalastyle:on