Github user javadba commented on a diff in the pull request:
https://github.com/apache/spark/pull/4254#discussion_r23728909
--- Diff:
mllib/src/test/scala/org/apache/spark/mllib/clustering/PIClusteringSuite.scala
---
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.mllib.clustering
+
+import breeze.linalg.{DenseVector => BDV}
+import org.apache.log4j.Logger
+import org.apache.spark.graphx._
+import org.apache.spark.{SparkConf, SparkContext}
+import org.scalatest.FunSuite
+
+import scala.util.Random
+
+class PIClusteringSuite extends FunSuite with LocalSparkContext {
+
+ val logger = Logger.getLogger(getClass.getName)
+
+ import org.apache.spark.mllib.clustering.PIClusteringSuite._
+
+ val PIC = PIClustering
+ val A = Array
+
+ test("concentricCirclesTest") {
+ concentricCirclesTest()
+ }
+
+
+ def concentricCirclesTest() = {
+ val sigma = 1.0
+ val nIterations = 10
+
+ val circleSpecs = Seq(
+ // Best results for 30 points
+ CircleSpec(Point(0.0, 0.0), 0.03, 0.1, 3),
+ CircleSpec(Point(0.0, 0.0), 0.3, 0.03, 12),
+ CircleSpec(Point(0.0, 0.0), 1.0, 0.01, 15)
+ // Add following to get 100 points
+ , CircleSpec(Point(0.0, 0.0), 1.5, 0.005, 30),
+ CircleSpec(Point(0.0, 0.0), 2.0, 0.002, 40)
+ )
+
+ val nClusters = circleSpecs.size
+ val cdata = createConcentricCirclesData(circleSpecs)
+ withSpark { sc =>
+ val vertices = new Random().shuffle(cdata.map { p =>
+ (p.label, new BDV(Array(p.x, p.y)))
+ })
+
+ val nVertices = vertices.length
+ val (ccenters, estCollected) = PIC.run(sc, vertices, nClusters,
nIterations)
+ logger.info(s"Cluster centers: ${ccenters.mkString(",")} " +
+ s"\nEstimates: ${estCollected.mkString("[", ",", "]")}")
+ assert(ccenters.size == circleSpecs.length, "Did not get correct
number of centers")
+
+ }
+ }
+
+}
+
+object PIClusteringSuite {
+ val logger = Logger.getLogger(getClass.getName)
+ val A = Array
+
+ def pdoub(d: Double) = f"$d%1.6f"
+
+ case class Point(label: Long, x: Double, y: Double) {
+ def this(x: Double, y: Double) = this(-1L, x, y)
+
+ override def toString() = s"($label, (${pdoub(x)},${pdoub(y)}))"
+ }
+
+ object Point {
+ def apply(x: Double, y: Double) = new Point(-1L, x, y)
+ }
+
+ case class CircleSpec(center: Point, radius: Double, noiseToRadiusRatio:
Double,
+ nPoints: Int, uniformDistOnCircle: Boolean = true)
+
+ def createConcentricCirclesData(circleSpecs: Seq[CircleSpec]) = {
+ import org.apache.spark.mllib.random.StandardNormalGenerator
+ val normalGen = new StandardNormalGenerator
+ var idStart = 0
+ val circles = for (csp <- circleSpecs) yield {
+ idStart += 1000
+ val circlePoints = for (thetax <- 0 until csp.nPoints) yield {
+ val theta = thetax * 2 * Math.PI / csp.nPoints
+ val (x, y) = (csp.radius * Math.cos(theta)
+ * (1 + normalGen.nextValue * csp.noiseToRadiusRatio),
+ csp.radius * Math.sin(theta) * (1 + normalGen.nextValue *
csp.noiseToRadiusRatio))
+ (Point(idStart + thetax, x, y))
+ }
+ circlePoints
+ }
+ val points = circles.flatten.sortBy(_.label)
+ logger.info(printPoints(points))
+ points
+ }
+
+ def printPoints(points: Seq[Point]) = {
+ points.mkString("[", " , ", "]")
+ }
+
+ def main(args: Array[String]) {
+ val pictest = new PIClusteringSuite
+ pictest.concentricCirclesTest()
+ }
+}
+
+/**
+ * Provides a method to run tests against a {@link SparkContext} variable
that is correctly stopped
+ * after each test.
+ * TODO: import this from the graphx test cases package i.e. may need
update to pom.xml
+ */
+trait LocalSparkContext {
+ /** Runs `f` on a new SparkContext and ensures that it is stopped
afterwards. */
+ def withSpark[T](f: SparkContext => T) = {
+ val conf = new SparkConf()
+ GraphXUtils.registerKryoClasses(conf)
--- End diff --
OK changed to use MLLibTestSparkContext
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
