aboutsummaryrefslogtreecommitdiff
path: root/mllib
diff options
context:
space:
mode:
authorXiangrui Meng <meng@databricks.com>2015-01-30 10:08:07 -0800
committerXiangrui Meng <meng@databricks.com>2015-01-30 10:08:07 -0800
commit0a95085f09754c7b883f29a2babb17209c6541bd (patch)
tree272e9d3251b7b62e1218262e379008d17f39b5ba /mllib
parent54d95758fcbe29a9af0f59673ac0b8a8c72b778e (diff)
downloadspark-0a95085f09754c7b883f29a2babb17209c6541bd.tar.gz
spark-0a95085f09754c7b883f29a2babb17209c6541bd.tar.bz2
spark-0a95085f09754c7b883f29a2babb17209c6541bd.zip
[SPARK-5496][MLLIB] Allow both classification and Classification in Algo for trees.
to be backward compatible. Author: Xiangrui Meng <meng@databricks.com> Closes #4287 from mengxr/SPARK-5496 and squashes the following commits: a025c53 [Xiangrui Meng] Allow both classification and Classification in Algo for trees.
Diffstat (limited to 'mllib')
-rw-r--r--mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Algo.scala4
-rw-r--r--mllib/src/test/scala/org/apache/spark/mllib/tree/GradientBoostedTreesSuite.scala5
2 files changed, 7 insertions, 2 deletions
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Algo.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Algo.scala
index 0ef9c6181a..b609925997 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Algo.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/configuration/Algo.scala
@@ -29,8 +29,8 @@ object Algo extends Enumeration {
val Classification, Regression = Value
private[mllib] def fromString(name: String): Algo = name match {
- case "classification" => Classification
- case "regression" => Regression
+ case "classification" | "Classification" => Classification
+ case "regression" | "Regression" => Regression
case _ => throw new IllegalArgumentException(s"Did not recognize Algo name: $name")
}
}
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/tree/GradientBoostedTreesSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/tree/GradientBoostedTreesSuite.scala
index 3aa97e5446..e8341a5d0d 100644
--- a/mllib/src/test/scala/org/apache/spark/mllib/tree/GradientBoostedTreesSuite.scala
+++ b/mllib/src/test/scala/org/apache/spark/mllib/tree/GradientBoostedTreesSuite.scala
@@ -128,6 +128,11 @@ class GradientBoostedTreesSuite extends FunSuite with MLlibTestSparkContext {
}
}
+ test("SPARK-5496: BoostingStrategy.defaultParams should recognize Classification") {
+ for (algo <- Seq("classification", "Classification", "regression", "Regression")) {
+ BoostingStrategy.defaultParams(algo)
+ }
+ }
}
object GradientBoostedTreesSuite {