From 6a0ee38c53d8a53d219bfec8cad9953bc9571e0c Mon Sep 17 00:00:00 2001 From: Kazuaki Ishizaki Date: Fri, 10 Aug 2018 01:29:40 +0900 Subject: [PATCH 1/3] initial commit --- .../org/apache/spark/ml/evaluation/ClusteringEvaluator.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala b/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala index a6d6b4ea8b965..b2be29439cd9d 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala @@ -119,6 +119,9 @@ class ClusteringEvaluator @Since("2.3.0") (@Since("2.3.0") override val uid: Str df, $(predictionCol), $(featuresCol)) case ("silhouette", "cosine") => CosineSilhouette.computeSilhouetteScore(df, $(predictionCol), $(featuresCol)) + case (mn, dm) => + throw new IllegalArgumentException( + s"($mn, $dm) is not matched in evaluate") } } } From 5655d83bd2c9d6ca872c371bff421f69409b6d0b Mon Sep 17 00:00:00 2001 From: Kazuaki Ishizaki Date: Fri, 10 Aug 2018 01:45:23 +0900 Subject: [PATCH 2/3] make the change one-liner --- .../org/apache/spark/ml/evaluation/ClusteringEvaluator.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala b/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala index b2be29439cd9d..1919ac7188e3e 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala @@ -120,8 +120,7 @@ class ClusteringEvaluator @Since("2.3.0") (@Since("2.3.0") override val uid: Str case ("silhouette", "cosine") => CosineSilhouette.computeSilhouetteScore(df, $(predictionCol), $(featuresCol)) case (mn, dm) => - throw new IllegalArgumentException( - s"($mn, $dm) is not matched in evaluate") + throw new IllegalArgumentException(s"($mn, $dm) is not matched in evaluate") } } } From 3084b551322626f1f8dfaf5e5fc9c2ea1366f8b3 Mon Sep 17 00:00:00 2001 From: Kazuaki Ishizaki Date: Fri, 10 Aug 2018 03:17:29 +0900 Subject: [PATCH 3/3] address review comment --- .../org/apache/spark/ml/evaluation/ClusteringEvaluator.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala b/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala index 1919ac7188e3e..5c1d1aebdc315 100644 --- a/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala +++ b/mllib/src/main/scala/org/apache/spark/ml/evaluation/ClusteringEvaluator.scala @@ -120,7 +120,7 @@ class ClusteringEvaluator @Since("2.3.0") (@Since("2.3.0") override val uid: Str case ("silhouette", "cosine") => CosineSilhouette.computeSilhouetteScore(df, $(predictionCol), $(featuresCol)) case (mn, dm) => - throw new IllegalArgumentException(s"($mn, $dm) is not matched in evaluate") + throw new IllegalArgumentException(s"No support for metric $mn, distance $dm") } } }