You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2016/03/18 12:22:50 UTC
spark git commit: [MINOR][ML] When trainingSummary is None,
it should throw RuntimeException.
Repository: spark
Updated Branches:
refs/heads/master bb1fda01f -> 7783b6f38
[MINOR][ML] When trainingSummary is None, it should throw RuntimeException.
## What changes were proposed in this pull request?
When trainingSummary is None, it should throw ```RuntimeException```.
cc mengxr
## How was this patch tested?
Existing tests.
Author: Yanbo Liang <yb...@gmail.com>
Closes #11784 from yanboliang/fix-summary.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7783b6f3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7783b6f3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7783b6f3
Branch: refs/heads/master
Commit: 7783b6f38ffb320050e1c826134187cd0f29ee9b
Parents: bb1fda0
Author: Yanbo Liang <yb...@gmail.com>
Authored: Fri Mar 18 11:23:17 2016 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Fri Mar 18 11:23:17 2016 +0000
----------------------------------------------------------------------
.../apache/spark/ml/classification/LogisticRegression.scala | 8 ++------
.../main/scala/org/apache/spark/ml/clustering/KMeans.scala | 9 +++------
.../spark/ml/regression/GeneralizedLinearRegression.scala | 3 +--
.../org/apache/spark/ml/regression/LinearRegression.scala | 8 ++------
4 files changed, 8 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7783b6f3/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala
index 77e59d9..861b1d4 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/classification/LogisticRegression.scala
@@ -509,12 +509,8 @@ class LogisticRegressionModel private[spark] (
* thrown if `trainingSummary == None`.
*/
@Since("1.5.0")
- def summary: LogisticRegressionTrainingSummary = trainingSummary match {
- case Some(summ) => summ
- case None =>
- throw new SparkException(
- "No training summary available for this LogisticRegressionModel",
- new NullPointerException())
+ def summary: LogisticRegressionTrainingSummary = trainingSummary.getOrElse {
+ throw new SparkException("No training summary available for this LogisticRegressionModel")
}
/**
http://git-wip-us.apache.org/repos/asf/spark/blob/7783b6f3/mllib/src/main/scala/org/apache/spark/ml/clustering/KMeans.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/clustering/KMeans.scala b/mllib/src/main/scala/org/apache/spark/ml/clustering/KMeans.scala
index ab00127..3842882 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/clustering/KMeans.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/clustering/KMeans.scala
@@ -148,12 +148,9 @@ class KMeansModel private[ml] (
* thrown if `trainingSummary == None`.
*/
@Since("2.0.0")
- def summary: KMeansSummary = trainingSummary match {
- case Some(summ) => summ
- case None =>
- throw new SparkException(
- s"No training summary available for the ${this.getClass.getSimpleName}",
- new NullPointerException())
+ def summary: KMeansSummary = trainingSummary.getOrElse {
+ throw new SparkException(
+ s"No training summary available for the ${this.getClass.getSimpleName}")
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/7783b6f3/mllib/src/main/scala/org/apache/spark/ml/regression/GeneralizedLinearRegression.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/regression/GeneralizedLinearRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/regression/GeneralizedLinearRegression.scala
index 6e74cb5..0e71e8d 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/regression/GeneralizedLinearRegression.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/regression/GeneralizedLinearRegression.scala
@@ -681,8 +681,7 @@ class GeneralizedLinearRegressionModel private[ml] (
@Since("2.0.0")
def summary: GeneralizedLinearRegressionSummary = trainingSummary.getOrElse {
throw new SparkException(
- "No training summary available for this GeneralizedLinearRegressionModel",
- new RuntimeException())
+ "No training summary available for this GeneralizedLinearRegressionModel")
}
private[regression] def setSummary(summary: GeneralizedLinearRegressionSummary): this.type = {
http://git-wip-us.apache.org/repos/asf/spark/blob/7783b6f3/mllib/src/main/scala/org/apache/spark/ml/regression/LinearRegression.scala
----------------------------------------------------------------------
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
index c8f3f70..b81c588 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/regression/LinearRegression.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/regression/LinearRegression.scala
@@ -398,12 +398,8 @@ class LinearRegressionModel private[ml] (
* thrown if `trainingSummary == None`.
*/
@Since("1.5.0")
- def summary: LinearRegressionTrainingSummary = trainingSummary match {
- case Some(summ) => summ
- case None =>
- throw new SparkException(
- "No training summary available for this LinearRegressionModel",
- new NullPointerException())
+ def summary: LinearRegressionTrainingSummary = trainingSummary.getOrElse {
+ throw new SparkException("No training summary available for this LinearRegressionModel")
}
private[regression] def setSummary(summary: LinearRegressionTrainingSummary): this.type = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org