Repository: spark Updated Branches: refs/heads/master 7475a9655 -> 3da3d7635
[SPARK-14516][ML][FOLLOW-UP] Move ClusteringEvaluatorSuite test data to data/mllib. ## What changes were proposed in this pull request? Move ```ClusteringEvaluatorSuite``` test data(iris) to data/mllib, to prevent from re-creating a new folder. ## How was this patch tested? Existing tests. Author: Yanbo Liang <yblia...@gmail.com> Closes #19648 from yanboliang/spark-14516. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3da3d763 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3da3d763 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3da3d763 Branch: refs/heads/master Commit: 3da3d76352cc471252a54088cc55208bb4ea5b3a Parents: 7475a96 Author: Yanbo Liang <yblia...@gmail.com> Authored: Tue Nov 7 20:07:30 2017 -0800 Committer: Yanbo Liang <yblia...@gmail.com> Committed: Tue Nov 7 20:07:30 2017 -0800 ---------------------------------------------------------------------- data/mllib/iris_libsvm.txt | 150 +++++++++++++++++++ mllib/src/test/resources/test-data/iris.libsvm | 150 ------------------- .../evaluation/ClusteringEvaluatorSuite.scala | 30 ++-- 3 files changed, 161 insertions(+), 169 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/3da3d763/data/mllib/iris_libsvm.txt ---------------------------------------------------------------------- diff --git a/data/mllib/iris_libsvm.txt b/data/mllib/iris_libsvm.txt new file mode 100644 index 0000000..db95901 --- /dev/null +++ b/data/mllib/iris_libsvm.txt @@ -0,0 +1,150 @@ +0.0 1:5.1 2:3.5 3:1.4 4:0.2 +0.0 1:4.9 2:3.0 3:1.4 4:0.2 +0.0 1:4.7 2:3.2 3:1.3 4:0.2 +0.0 1:4.6 2:3.1 3:1.5 4:0.2 +0.0 1:5.0 2:3.6 3:1.4 4:0.2 +0.0 1:5.4 2:3.9 3:1.7 4:0.4 +0.0 1:4.6 2:3.4 3:1.4 4:0.3 +0.0 1:5.0 2:3.4 3:1.5 4:0.2 +0.0 1:4.4 2:2.9 3:1.4 4:0.2 +0.0 1:4.9 2:3.1 3:1.5 4:0.1 +0.0 1:5.4 2:3.7 3:1.5 4:0.2 +0.0 1:4.8 2:3.4 3:1.6 4:0.2 +0.0 1:4.8 2:3.0 3:1.4 4:0.1 +0.0 1:4.3 2:3.0 3:1.1 4:0.1 +0.0 1:5.8 2:4.0 3:1.2 4:0.2 +0.0 1:5.7 2:4.4 3:1.5 4:0.4 +0.0 1:5.4 2:3.9 3:1.3 4:0.4 +0.0 1:5.1 2:3.5 3:1.4 4:0.3 +0.0 1:5.7 2:3.8 3:1.7 4:0.3 +0.0 1:5.1 2:3.8 3:1.5 4:0.3 +0.0 1:5.4 2:3.4 3:1.7 4:0.2 +0.0 1:5.1 2:3.7 3:1.5 4:0.4 +0.0 1:4.6 2:3.6 3:1.0 4:0.2 +0.0 1:5.1 2:3.3 3:1.7 4:0.5 +0.0 1:4.8 2:3.4 3:1.9 4:0.2 +0.0 1:5.0 2:3.0 3:1.6 4:0.2 +0.0 1:5.0 2:3.4 3:1.6 4:0.4 +0.0 1:5.2 2:3.5 3:1.5 4:0.2 +0.0 1:5.2 2:3.4 3:1.4 4:0.2 +0.0 1:4.7 2:3.2 3:1.6 4:0.2 +0.0 1:4.8 2:3.1 3:1.6 4:0.2 +0.0 1:5.4 2:3.4 3:1.5 4:0.4 +0.0 1:5.2 2:4.1 3:1.5 4:0.1 +0.0 1:5.5 2:4.2 3:1.4 4:0.2 +0.0 1:4.9 2:3.1 3:1.5 4:0.1 +0.0 1:5.0 2:3.2 3:1.2 4:0.2 +0.0 1:5.5 2:3.5 3:1.3 4:0.2 +0.0 1:4.9 2:3.1 3:1.5 4:0.1 +0.0 1:4.4 2:3.0 3:1.3 4:0.2 +0.0 1:5.1 2:3.4 3:1.5 4:0.2 +0.0 1:5.0 2:3.5 3:1.3 4:0.3 +0.0 1:4.5 2:2.3 3:1.3 4:0.3 +0.0 1:4.4 2:3.2 3:1.3 4:0.2 +0.0 1:5.0 2:3.5 3:1.6 4:0.6 +0.0 1:5.1 2:3.8 3:1.9 4:0.4 +0.0 1:4.8 2:3.0 3:1.4 4:0.3 +0.0 1:5.1 2:3.8 3:1.6 4:0.2 +0.0 1:4.6 2:3.2 3:1.4 4:0.2 +0.0 1:5.3 2:3.7 3:1.5 4:0.2 +0.0 1:5.0 2:3.3 3:1.4 4:0.2 +1.0 1:7.0 2:3.2 3:4.7 4:1.4 +1.0 1:6.4 2:3.2 3:4.5 4:1.5 +1.0 1:6.9 2:3.1 3:4.9 4:1.5 +1.0 1:5.5 2:2.3 3:4.0 4:1.3 +1.0 1:6.5 2:2.8 3:4.6 4:1.5 +1.0 1:5.7 2:2.8 3:4.5 4:1.3 +1.0 1:6.3 2:3.3 3:4.7 4:1.6 +1.0 1:4.9 2:2.4 3:3.3 4:1.0 +1.0 1:6.6 2:2.9 3:4.6 4:1.3 +1.0 1:5.2 2:2.7 3:3.9 4:1.4 +1.0 1:5.0 2:2.0 3:3.5 4:1.0 +1.0 1:5.9 2:3.0 3:4.2 4:1.5 +1.0 1:6.0 2:2.2 3:4.0 4:1.0 +1.0 1:6.1 2:2.9 3:4.7 4:1.4 +1.0 1:5.6 2:2.9 3:3.6 4:1.3 +1.0 1:6.7 2:3.1 3:4.4 4:1.4 +1.0 1:5.6 2:3.0 3:4.5 4:1.5 +1.0 1:5.8 2:2.7 3:4.1 4:1.0 +1.0 1:6.2 2:2.2 3:4.5 4:1.5 +1.0 1:5.6 2:2.5 3:3.9 4:1.1 +1.0 1:5.9 2:3.2 3:4.8 4:1.8 +1.0 1:6.1 2:2.8 3:4.0 4:1.3 +1.0 1:6.3 2:2.5 3:4.9 4:1.5 +1.0 1:6.1 2:2.8 3:4.7 4:1.2 +1.0 1:6.4 2:2.9 3:4.3 4:1.3 +1.0 1:6.6 2:3.0 3:4.4 4:1.4 +1.0 1:6.8 2:2.8 3:4.8 4:1.4 +1.0 1:6.7 2:3.0 3:5.0 4:1.7 +1.0 1:6.0 2:2.9 3:4.5 4:1.5 +1.0 1:5.7 2:2.6 3:3.5 4:1.0 +1.0 1:5.5 2:2.4 3:3.8 4:1.1 +1.0 1:5.5 2:2.4 3:3.7 4:1.0 +1.0 1:5.8 2:2.7 3:3.9 4:1.2 +1.0 1:6.0 2:2.7 3:5.1 4:1.6 +1.0 1:5.4 2:3.0 3:4.5 4:1.5 +1.0 1:6.0 2:3.4 3:4.5 4:1.6 +1.0 1:6.7 2:3.1 3:4.7 4:1.5 +1.0 1:6.3 2:2.3 3:4.4 4:1.3 +1.0 1:5.6 2:3.0 3:4.1 4:1.3 +1.0 1:5.5 2:2.5 3:4.0 4:1.3 +1.0 1:5.5 2:2.6 3:4.4 4:1.2 +1.0 1:6.1 2:3.0 3:4.6 4:1.4 +1.0 1:5.8 2:2.6 3:4.0 4:1.2 +1.0 1:5.0 2:2.3 3:3.3 4:1.0 +1.0 1:5.6 2:2.7 3:4.2 4:1.3 +1.0 1:5.7 2:3.0 3:4.2 4:1.2 +1.0 1:5.7 2:2.9 3:4.2 4:1.3 +1.0 1:6.2 2:2.9 3:4.3 4:1.3 +1.0 1:5.1 2:2.5 3:3.0 4:1.1 +1.0 1:5.7 2:2.8 3:4.1 4:1.3 +2.0 1:6.3 2:3.3 3:6.0 4:2.5 +2.0 1:5.8 2:2.7 3:5.1 4:1.9 +2.0 1:7.1 2:3.0 3:5.9 4:2.1 +2.0 1:6.3 2:2.9 3:5.6 4:1.8 +2.0 1:6.5 2:3.0 3:5.8 4:2.2 +2.0 1:7.6 2:3.0 3:6.6 4:2.1 +2.0 1:4.9 2:2.5 3:4.5 4:1.7 +2.0 1:7.3 2:2.9 3:6.3 4:1.8 +2.0 1:6.7 2:2.5 3:5.8 4:1.8 +2.0 1:7.2 2:3.6 3:6.1 4:2.5 +2.0 1:6.5 2:3.2 3:5.1 4:2.0 +2.0 1:6.4 2:2.7 3:5.3 4:1.9 +2.0 1:6.8 2:3.0 3:5.5 4:2.1 +2.0 1:5.7 2:2.5 3:5.0 4:2.0 +2.0 1:5.8 2:2.8 3:5.1 4:2.4 +2.0 1:6.4 2:3.2 3:5.3 4:2.3 +2.0 1:6.5 2:3.0 3:5.5 4:1.8 +2.0 1:7.7 2:3.8 3:6.7 4:2.2 +2.0 1:7.7 2:2.6 3:6.9 4:2.3 +2.0 1:6.0 2:2.2 3:5.0 4:1.5 +2.0 1:6.9 2:3.2 3:5.7 4:2.3 +2.0 1:5.6 2:2.8 3:4.9 4:2.0 +2.0 1:7.7 2:2.8 3:6.7 4:2.0 +2.0 1:6.3 2:2.7 3:4.9 4:1.8 +2.0 1:6.7 2:3.3 3:5.7 4:2.1 +2.0 1:7.2 2:3.2 3:6.0 4:1.8 +2.0 1:6.2 2:2.8 3:4.8 4:1.8 +2.0 1:6.1 2:3.0 3:4.9 4:1.8 +2.0 1:6.4 2:2.8 3:5.6 4:2.1 +2.0 1:7.2 2:3.0 3:5.8 4:1.6 +2.0 1:7.4 2:2.8 3:6.1 4:1.9 +2.0 1:7.9 2:3.8 3:6.4 4:2.0 +2.0 1:6.4 2:2.8 3:5.6 4:2.2 +2.0 1:6.3 2:2.8 3:5.1 4:1.5 +2.0 1:6.1 2:2.6 3:5.6 4:1.4 +2.0 1:7.7 2:3.0 3:6.1 4:2.3 +2.0 1:6.3 2:3.4 3:5.6 4:2.4 +2.0 1:6.4 2:3.1 3:5.5 4:1.8 +2.0 1:6.0 2:3.0 3:4.8 4:1.8 +2.0 1:6.9 2:3.1 3:5.4 4:2.1 +2.0 1:6.7 2:3.1 3:5.6 4:2.4 +2.0 1:6.9 2:3.1 3:5.1 4:2.3 +2.0 1:5.8 2:2.7 3:5.1 4:1.9 +2.0 1:6.8 2:3.2 3:5.9 4:2.3 +2.0 1:6.7 2:3.3 3:5.7 4:2.5 +2.0 1:6.7 2:3.0 3:5.2 4:2.3 +2.0 1:6.3 2:2.5 3:5.0 4:1.9 +2.0 1:6.5 2:3.0 3:5.2 4:2.0 +2.0 1:6.2 2:3.4 3:5.4 4:2.3 +2.0 1:5.9 2:3.0 3:5.1 4:1.8 http://git-wip-us.apache.org/repos/asf/spark/blob/3da3d763/mllib/src/test/resources/test-data/iris.libsvm ---------------------------------------------------------------------- diff --git a/mllib/src/test/resources/test-data/iris.libsvm b/mllib/src/test/resources/test-data/iris.libsvm deleted file mode 100644 index db95901..0000000 --- a/mllib/src/test/resources/test-data/iris.libsvm +++ /dev/null @@ -1,150 +0,0 @@ -0.0 1:5.1 2:3.5 3:1.4 4:0.2 -0.0 1:4.9 2:3.0 3:1.4 4:0.2 -0.0 1:4.7 2:3.2 3:1.3 4:0.2 -0.0 1:4.6 2:3.1 3:1.5 4:0.2 -0.0 1:5.0 2:3.6 3:1.4 4:0.2 -0.0 1:5.4 2:3.9 3:1.7 4:0.4 -0.0 1:4.6 2:3.4 3:1.4 4:0.3 -0.0 1:5.0 2:3.4 3:1.5 4:0.2 -0.0 1:4.4 2:2.9 3:1.4 4:0.2 -0.0 1:4.9 2:3.1 3:1.5 4:0.1 -0.0 1:5.4 2:3.7 3:1.5 4:0.2 -0.0 1:4.8 2:3.4 3:1.6 4:0.2 -0.0 1:4.8 2:3.0 3:1.4 4:0.1 -0.0 1:4.3 2:3.0 3:1.1 4:0.1 -0.0 1:5.8 2:4.0 3:1.2 4:0.2 -0.0 1:5.7 2:4.4 3:1.5 4:0.4 -0.0 1:5.4 2:3.9 3:1.3 4:0.4 -0.0 1:5.1 2:3.5 3:1.4 4:0.3 -0.0 1:5.7 2:3.8 3:1.7 4:0.3 -0.0 1:5.1 2:3.8 3:1.5 4:0.3 -0.0 1:5.4 2:3.4 3:1.7 4:0.2 -0.0 1:5.1 2:3.7 3:1.5 4:0.4 -0.0 1:4.6 2:3.6 3:1.0 4:0.2 -0.0 1:5.1 2:3.3 3:1.7 4:0.5 -0.0 1:4.8 2:3.4 3:1.9 4:0.2 -0.0 1:5.0 2:3.0 3:1.6 4:0.2 -0.0 1:5.0 2:3.4 3:1.6 4:0.4 -0.0 1:5.2 2:3.5 3:1.5 4:0.2 -0.0 1:5.2 2:3.4 3:1.4 4:0.2 -0.0 1:4.7 2:3.2 3:1.6 4:0.2 -0.0 1:4.8 2:3.1 3:1.6 4:0.2 -0.0 1:5.4 2:3.4 3:1.5 4:0.4 -0.0 1:5.2 2:4.1 3:1.5 4:0.1 -0.0 1:5.5 2:4.2 3:1.4 4:0.2 -0.0 1:4.9 2:3.1 3:1.5 4:0.1 -0.0 1:5.0 2:3.2 3:1.2 4:0.2 -0.0 1:5.5 2:3.5 3:1.3 4:0.2 -0.0 1:4.9 2:3.1 3:1.5 4:0.1 -0.0 1:4.4 2:3.0 3:1.3 4:0.2 -0.0 1:5.1 2:3.4 3:1.5 4:0.2 -0.0 1:5.0 2:3.5 3:1.3 4:0.3 -0.0 1:4.5 2:2.3 3:1.3 4:0.3 -0.0 1:4.4 2:3.2 3:1.3 4:0.2 -0.0 1:5.0 2:3.5 3:1.6 4:0.6 -0.0 1:5.1 2:3.8 3:1.9 4:0.4 -0.0 1:4.8 2:3.0 3:1.4 4:0.3 -0.0 1:5.1 2:3.8 3:1.6 4:0.2 -0.0 1:4.6 2:3.2 3:1.4 4:0.2 -0.0 1:5.3 2:3.7 3:1.5 4:0.2 -0.0 1:5.0 2:3.3 3:1.4 4:0.2 -1.0 1:7.0 2:3.2 3:4.7 4:1.4 -1.0 1:6.4 2:3.2 3:4.5 4:1.5 -1.0 1:6.9 2:3.1 3:4.9 4:1.5 -1.0 1:5.5 2:2.3 3:4.0 4:1.3 -1.0 1:6.5 2:2.8 3:4.6 4:1.5 -1.0 1:5.7 2:2.8 3:4.5 4:1.3 -1.0 1:6.3 2:3.3 3:4.7 4:1.6 -1.0 1:4.9 2:2.4 3:3.3 4:1.0 -1.0 1:6.6 2:2.9 3:4.6 4:1.3 -1.0 1:5.2 2:2.7 3:3.9 4:1.4 -1.0 1:5.0 2:2.0 3:3.5 4:1.0 -1.0 1:5.9 2:3.0 3:4.2 4:1.5 -1.0 1:6.0 2:2.2 3:4.0 4:1.0 -1.0 1:6.1 2:2.9 3:4.7 4:1.4 -1.0 1:5.6 2:2.9 3:3.6 4:1.3 -1.0 1:6.7 2:3.1 3:4.4 4:1.4 -1.0 1:5.6 2:3.0 3:4.5 4:1.5 -1.0 1:5.8 2:2.7 3:4.1 4:1.0 -1.0 1:6.2 2:2.2 3:4.5 4:1.5 -1.0 1:5.6 2:2.5 3:3.9 4:1.1 -1.0 1:5.9 2:3.2 3:4.8 4:1.8 -1.0 1:6.1 2:2.8 3:4.0 4:1.3 -1.0 1:6.3 2:2.5 3:4.9 4:1.5 -1.0 1:6.1 2:2.8 3:4.7 4:1.2 -1.0 1:6.4 2:2.9 3:4.3 4:1.3 -1.0 1:6.6 2:3.0 3:4.4 4:1.4 -1.0 1:6.8 2:2.8 3:4.8 4:1.4 -1.0 1:6.7 2:3.0 3:5.0 4:1.7 -1.0 1:6.0 2:2.9 3:4.5 4:1.5 -1.0 1:5.7 2:2.6 3:3.5 4:1.0 -1.0 1:5.5 2:2.4 3:3.8 4:1.1 -1.0 1:5.5 2:2.4 3:3.7 4:1.0 -1.0 1:5.8 2:2.7 3:3.9 4:1.2 -1.0 1:6.0 2:2.7 3:5.1 4:1.6 -1.0 1:5.4 2:3.0 3:4.5 4:1.5 -1.0 1:6.0 2:3.4 3:4.5 4:1.6 -1.0 1:6.7 2:3.1 3:4.7 4:1.5 -1.0 1:6.3 2:2.3 3:4.4 4:1.3 -1.0 1:5.6 2:3.0 3:4.1 4:1.3 -1.0 1:5.5 2:2.5 3:4.0 4:1.3 -1.0 1:5.5 2:2.6 3:4.4 4:1.2 -1.0 1:6.1 2:3.0 3:4.6 4:1.4 -1.0 1:5.8 2:2.6 3:4.0 4:1.2 -1.0 1:5.0 2:2.3 3:3.3 4:1.0 -1.0 1:5.6 2:2.7 3:4.2 4:1.3 -1.0 1:5.7 2:3.0 3:4.2 4:1.2 -1.0 1:5.7 2:2.9 3:4.2 4:1.3 -1.0 1:6.2 2:2.9 3:4.3 4:1.3 -1.0 1:5.1 2:2.5 3:3.0 4:1.1 -1.0 1:5.7 2:2.8 3:4.1 4:1.3 -2.0 1:6.3 2:3.3 3:6.0 4:2.5 -2.0 1:5.8 2:2.7 3:5.1 4:1.9 -2.0 1:7.1 2:3.0 3:5.9 4:2.1 -2.0 1:6.3 2:2.9 3:5.6 4:1.8 -2.0 1:6.5 2:3.0 3:5.8 4:2.2 -2.0 1:7.6 2:3.0 3:6.6 4:2.1 -2.0 1:4.9 2:2.5 3:4.5 4:1.7 -2.0 1:7.3 2:2.9 3:6.3 4:1.8 -2.0 1:6.7 2:2.5 3:5.8 4:1.8 -2.0 1:7.2 2:3.6 3:6.1 4:2.5 -2.0 1:6.5 2:3.2 3:5.1 4:2.0 -2.0 1:6.4 2:2.7 3:5.3 4:1.9 -2.0 1:6.8 2:3.0 3:5.5 4:2.1 -2.0 1:5.7 2:2.5 3:5.0 4:2.0 -2.0 1:5.8 2:2.8 3:5.1 4:2.4 -2.0 1:6.4 2:3.2 3:5.3 4:2.3 -2.0 1:6.5 2:3.0 3:5.5 4:1.8 -2.0 1:7.7 2:3.8 3:6.7 4:2.2 -2.0 1:7.7 2:2.6 3:6.9 4:2.3 -2.0 1:6.0 2:2.2 3:5.0 4:1.5 -2.0 1:6.9 2:3.2 3:5.7 4:2.3 -2.0 1:5.6 2:2.8 3:4.9 4:2.0 -2.0 1:7.7 2:2.8 3:6.7 4:2.0 -2.0 1:6.3 2:2.7 3:4.9 4:1.8 -2.0 1:6.7 2:3.3 3:5.7 4:2.1 -2.0 1:7.2 2:3.2 3:6.0 4:1.8 -2.0 1:6.2 2:2.8 3:4.8 4:1.8 -2.0 1:6.1 2:3.0 3:4.9 4:1.8 -2.0 1:6.4 2:2.8 3:5.6 4:2.1 -2.0 1:7.2 2:3.0 3:5.8 4:1.6 -2.0 1:7.4 2:2.8 3:6.1 4:1.9 -2.0 1:7.9 2:3.8 3:6.4 4:2.0 -2.0 1:6.4 2:2.8 3:5.6 4:2.2 -2.0 1:6.3 2:2.8 3:5.1 4:1.5 -2.0 1:6.1 2:2.6 3:5.6 4:1.4 -2.0 1:7.7 2:3.0 3:6.1 4:2.3 -2.0 1:6.3 2:3.4 3:5.6 4:2.4 -2.0 1:6.4 2:3.1 3:5.5 4:1.8 -2.0 1:6.0 2:3.0 3:4.8 4:1.8 -2.0 1:6.9 2:3.1 3:5.4 4:2.1 -2.0 1:6.7 2:3.1 3:5.6 4:2.4 -2.0 1:6.9 2:3.1 3:5.1 4:2.3 -2.0 1:5.8 2:2.7 3:5.1 4:1.9 -2.0 1:6.8 2:3.2 3:5.9 4:2.3 -2.0 1:6.7 2:3.3 3:5.7 4:2.5 -2.0 1:6.7 2:3.0 3:5.2 4:2.3 -2.0 1:6.3 2:2.5 3:5.0 4:1.9 -2.0 1:6.5 2:3.0 3:5.2 4:2.0 -2.0 1:6.2 2:3.4 3:5.4 4:2.3 -2.0 1:5.9 2:3.0 3:5.1 4:1.8 http://git-wip-us.apache.org/repos/asf/spark/blob/3da3d763/mllib/src/test/scala/org/apache/spark/ml/evaluation/ClusteringEvaluatorSuite.scala ---------------------------------------------------------------------- diff --git a/mllib/src/test/scala/org/apache/spark/ml/evaluation/ClusteringEvaluatorSuite.scala b/mllib/src/test/scala/org/apache/spark/ml/evaluation/ClusteringEvaluatorSuite.scala index e60ebbd..677ce49 100644 --- a/mllib/src/test/scala/org/apache/spark/ml/evaluation/ClusteringEvaluatorSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/ml/evaluation/ClusteringEvaluatorSuite.scala @@ -22,8 +22,7 @@ import org.apache.spark.ml.param.ParamsSuite import org.apache.spark.ml.util.DefaultReadWriteTest import org.apache.spark.ml.util.TestingUtils._ import org.apache.spark.mllib.util.MLlibTestSparkContext -import org.apache.spark.sql.{DataFrame, SparkSession} -import org.apache.spark.sql.types.IntegerType +import org.apache.spark.sql.Dataset class ClusteringEvaluatorSuite @@ -31,6 +30,13 @@ class ClusteringEvaluatorSuite import testImplicits._ + @transient var irisDataset: Dataset[_] = _ + + override def beforeAll(): Unit = { + super.beforeAll() + irisDataset = spark.read.format("libsvm").load("../data/mllib/iris_libsvm.txt") + } + test("params") { ParamsSuite.checkParams(new ClusteringEvaluator) } @@ -53,37 +59,23 @@ class ClusteringEvaluatorSuite 0.6564679231 */ test("squared euclidean Silhouette") { - val iris = ClusteringEvaluatorSuite.irisDataset(spark) val evaluator = new ClusteringEvaluator() .setFeaturesCol("features") .setPredictionCol("label") - assert(evaluator.evaluate(iris) ~== 0.6564679231 relTol 1e-5) + assert(evaluator.evaluate(irisDataset) ~== 0.6564679231 relTol 1e-5) } test("number of clusters must be greater than one") { - val iris = ClusteringEvaluatorSuite.irisDataset(spark) - .where($"label" === 0.0) + val singleClusterDataset = irisDataset.where($"label" === 0.0) val evaluator = new ClusteringEvaluator() .setFeaturesCol("features") .setPredictionCol("label") val e = intercept[AssertionError]{ - evaluator.evaluate(iris) + evaluator.evaluate(singleClusterDataset) } assert(e.getMessage.contains("Number of clusters must be greater than one")) } } - -object ClusteringEvaluatorSuite { - def irisDataset(spark: SparkSession): DataFrame = { - - val irisPath = Thread.currentThread() - .getContextClassLoader - .getResource("test-data/iris.libsvm") - .toString - - spark.read.format("libsvm").load(irisPath) - } -} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
