naming

DB Tsai · DB Tsai · commit bbff347ce8a1 · 2015-08-02T16:17:42.000-07:00
diff --git a/mllib/src/main/scala/org/apache/spark/ml/regression/LinearRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/regression/LinearRegression.scala
@@ -182,7 +182,7 @@ class LinearRegression(override val uid: String)
     val optimizer = if ($(elasticNetParam) == 0.0 || effectiveRegParam == 0.0) {
       new BreezeLBFGS[BDV[Double]]($(maxIter), 10, $(tol))
     } else {
-      def regParamL1Fun = (index: Int) => {
+      def effectiveL1RegFun = (index: Int) => {
         if ($(standardization)) {
           effectiveL1RegParam
         } else {
@@ -194,7 +194,7 @@ class LinearRegression(override val uid: String)
           if (featuresStd(index) != 0.0) effectiveL1RegParam / featuresStd(index) else 0.0
         }
       }
-      new BreezeOWLQN[Int, BDV[Double]]($(maxIter), 10, regParamL1Fun, $(tol))
+      new BreezeOWLQN[Int, BDV[Double]]($(maxIter), 10, effectiveL1RegFun, $(tol))
     }
 
     val initialWeights = Vectors.zeros(numFeatures)

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ class LinearRegression(override val uid: String)`
`182`	`182`	`val optimizer = if ($(elasticNetParam) == 0.0 \|\| effectiveRegParam == 0.0) {`
`183`	`183`	`new BreezeLBFGS[BDV[Double]]($(maxIter), 10, $(tol))`
`184`	`184`	`} else {`
`185`		`- def regParamL1Fun = (index: Int) => {`
	`185`	`+ def effectiveL1RegFun = (index: Int) => {`
`186`	`186`	`if ($(standardization)) {`
`187`	`187`	`effectiveL1RegParam`
`188`	`188`	`} else {`
`@@ -194,7 +194,7 @@ class LinearRegression(override val uid: String)`
`194`	`194`	`if (featuresStd(index) != 0.0) effectiveL1RegParam / featuresStd(index) else 0.0`
`195`	`195`	`}`
`196`	`196`	`}`
`197`		`- new BreezeOWLQN[Int, BDV[Double]]($(maxIter), 10, regParamL1Fun, $(tol))`
	`197`	`+ new BreezeOWLQN[Int, BDV[Double]]($(maxIter), 10, effectiveL1RegFun, $(tol))`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`val initialWeights = Vectors.zeros(numFeatures)`