Repository: flink Updated Branches: refs/heads/master b849da14c -> aedc0fd48
[FLINK-3994] [ml, tests] Fix flaky KNN integration tests This closes #2056. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/aedc0fd4 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/aedc0fd4 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/aedc0fd4 Branch: refs/heads/master Commit: aedc0fd481a756ef2b1708f896d5500475715232 Parents: b849da1 Author: Chiwan Park <[email protected]> Authored: Tue May 31 17:50:05 2016 +0900 Committer: Chiwan Park <[email protected]> Committed: Wed Jun 1 10:23:05 2016 +0900 ---------------------------------------------------------------------- .../org/apache/flink/ml/nn/KNNITSuite.scala | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/aedc0fd4/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/nn/KNNITSuite.scala ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/nn/KNNITSuite.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/nn/KNNITSuite.scala index ac30c3f..389d69a 100644 --- a/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/nn/KNNITSuite.scala +++ b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/nn/KNNITSuite.scala @@ -42,18 +42,17 @@ class KNNITSuite extends FlatSpec with Matchers with FlinkTestBase { } } - val env = ExecutionEnvironment.getExecutionEnvironment - - // prepare data - val trainingSet = env.fromCollection(Classification.trainingData).map(_.vector) - val testingSet = env.fromElements(DenseVector(0.0, 0.0)) - // calculate answer val answer = Classification.trainingData.map { v => (v.vector, SquaredEuclideanDistanceMetric().distance(DenseVector(0.0, 0.0), v.vector)) }.sortBy(_._2).take(3).map(_._1).toArray it should "calculate kNN join correctly without using a Quadtree" in { + val env = ExecutionEnvironment.getExecutionEnvironment + + // prepare data + val trainingSet = env.fromCollection(Classification.trainingData).map(_.vector) + val testingSet = env.fromElements(DenseVector(0.0, 0.0)) val knn = KNN() .setK(3) @@ -72,6 +71,11 @@ class KNNITSuite extends FlatSpec with Matchers with FlinkTestBase { } it should "calculate kNN join correctly with a Quadtree" in { + val env = ExecutionEnvironment.getExecutionEnvironment + + // prepare data + val trainingSet = env.fromCollection(Classification.trainingData).map(_.vector) + val testingSet = env.fromElements(DenseVector(0.0, 0.0)) val knn = KNN() .setK(3) @@ -91,6 +95,12 @@ class KNNITSuite extends FlatSpec with Matchers with FlinkTestBase { it should "throw an exception when using a Quadtree with an incompatible metric" in { intercept[IllegalArgumentException] { + val env = ExecutionEnvironment.getExecutionEnvironment + + // prepare data + val trainingSet = env.fromCollection(Classification.trainingData).map(_.vector) + val testingSet = env.fromElements(DenseVector(0.0, 0.0)) + val knn = KNN() .setK(3) .setBlocks(10)
