From bd9482edb7fb8529acefc1fa043edf9bb5f49396 Mon Sep 17 00:00:00 2001 From: lewuathe Date: Mon, 26 Jan 2015 20:47:21 +0900 Subject: [PATCH] [SPARK-5399] tree Losses strings should match loss names --- .../apache/spark/mllib/tree/loss/Losses.scala | 6 ++--- .../apache/spark/mllib/tree/LossesSuite.scala | 22 +++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 mllib/src/test/scala/org/apache/spark/mllib/tree/LossesSuite.scala diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/loss/Losses.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/loss/Losses.scala index 42c9ead9884b..9bb54cef5c86 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/tree/loss/Losses.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/loss/Losses.scala @@ -20,9 +20,9 @@ package org.apache.spark.mllib.tree.loss object Losses { def fromString(name: String): Loss = name match { - case "leastSquaresError" => SquaredError - case "leastAbsoluteError" => AbsoluteError - case "logLoss" => LogLoss + case "SquaredError" => SquaredError + case "AbsoluteError" => AbsoluteError + case "LogLoss" => LogLoss case _ => throw new IllegalArgumentException(s"Did not recognize Loss name: $name") } diff --git a/mllib/src/test/scala/org/apache/spark/mllib/tree/LossesSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/tree/LossesSuite.scala new file mode 100644 index 000000000000..45f75d1cf1a3 --- /dev/null +++ b/mllib/src/test/scala/org/apache/spark/mllib/tree/LossesSuite.scala @@ -0,0 +1,22 @@ +package org.apache.spark.mllib.tree + +import org.apache.spark.mllib.util.MLlibTestSparkContext +import org.scalatest.FunSuite + +import org.apache.spark.mllib.tree.loss._ + +/** + * Test suite for [[Losses]] + */ +class LossesSuite extends FunSuite with MLlibTestSparkContext{ + test("Losses generated by fromString method") { + try { + Losses.fromString("SquaredError") + Losses.fromString("AbsoluteError") + Losses.fromString("LogLoss") + } catch { + case _: IllegalArgumentException => fail("Loss function is not supported") + } + } + +}