Skip to content

[SPARK-17748][FOLLOW-UP][ML] Fix build error for Scala 2.10. #15625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-17748][FOLLOW-UP][ML] Fix build error for Scala 2.10. #15625

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions mllib/src/test/scala/org/apache/spark/ml/optim/WeightedLeastSquaresSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ class WeightedLeastSquaresSuite extends SparkFunSuite with MLlibTestSparkContext
}

// Cholesky also fails when regularization is added but we don't wish to standardize
val wls = new WeightedLeastSquares(true, regParam = 0.5, elasticNetParam = 0.0,
val wls = new WeightedLeastSquares(fitIntercept = true, regParam = 0.5, elasticNetParam = 0.0,
standardizeFeatures = false, standardizeLabel = false,
solverType = WeightedLeastSquares.Cholesky)
intercept[SingularMatrixException] {
Expand Down Expand Up @@ -470,10 +470,11 @@ class WeightedLeastSquaresSuite extends SparkFunSuite with MLlibTestSparkContext
var idx = 0
for (fitIntercept <- Seq(false, true);
regParam <- Seq(0.1, 0.5, 1.0);
standardizeFeatures <- Seq(false, true);
standardization <- Seq(false, true);
elasticNetParam <- Seq(0.1, 0.5, 1.0)) {
val wls = new WeightedLeastSquares(fitIntercept, regParam, elasticNetParam = elasticNetParam,
standardizeFeatures, standardizeLabel = true, solverType = WeightedLeastSquares.Auto)
val wls = new WeightedLeastSquares(fitIntercept, regParam, elasticNetParam,
standardizeFeatures = standardization, standardizeLabel = true,
solverType = WeightedLeastSquares.Auto)
.fit(instances)
val actual = Vectors.dense(wls.intercept, wls.coefficients(0), wls.coefficients(1))
assert(actual ~== expected(idx) absTol 1e-4)
Expand Down Expand Up @@ -528,10 +529,10 @@ class WeightedLeastSquaresSuite extends SparkFunSuite with MLlibTestSparkContext
var idx = 0
for (fitIntercept <- Seq(false, true);
regParam <- Seq(0.0, 0.1, 1.0);
standardizeFeatures <- Seq(false, true)) {
standardization <- Seq(false, true)) {
for (solver <- WeightedLeastSquares.supportedSolvers) {
val wls = new WeightedLeastSquares(fitIntercept, regParam, elasticNetParam = 0.0,
standardizeFeatures, standardizeLabel = true, solverType = solver)
standardizeFeatures = standardization, standardizeLabel = true, solverType = solver)
.fit(instances)
val actual = Vectors.dense(wls.intercept, wls.coefficients(0), wls.coefficients(1))
assert(actual ~== expected(idx) absTol 1e-4)
Expand Down