From b2c205ca6fa8fd372ce1bd99f3aa14a1245f5efe Mon Sep 17 00:00:00 2001 From: Yu ISHIKAWA Date: Thu, 16 Jul 2015 12:51:03 +0900 Subject: [PATCH] Rename the method `getInitializationSteps` to `getInitSteps` and `setInitializationSteps` to `setInitSteps` in Scala and Python --- .../scala/org/apache/spark/ml/clustering/KMeans.scala | 4 ++-- .../org/apache/spark/ml/clustering/KMeansSuite.scala | 8 ++++---- python/pyspark/ml/clustering.py | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) 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 de032f6f58ac7..c419dc9875bd3 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 @@ -90,7 +90,7 @@ private[clustering] trait KMeansParams (value: Int) => value > 0) /** @group getParam */ - def getInitializationSteps: Int = $(initSteps) + def getInitSteps: Int = $(initSteps) /** * Validates and transforms the input schema. @@ -167,7 +167,7 @@ class KMeans(override val uid: String) extends Estimator[KMeansModel] with KMean def setInitMode(value: String): this.type = set(initMode, value) /** @group setParam */ - def setInitializationSteps(value: Int): this.type = set(initSteps, value) + def setInitSteps(value: Int): this.type = set(initSteps, value) /** @group setParam */ def setMaxIter(value: Int): this.type = set(maxIter, value) diff --git a/mllib/src/test/scala/org/apache/spark/ml/clustering/KMeansSuite.scala b/mllib/src/test/scala/org/apache/spark/ml/clustering/KMeansSuite.scala index 374c00fe9b660..b733238c3a374 100644 --- a/mllib/src/test/scala/org/apache/spark/ml/clustering/KMeansSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/ml/clustering/KMeansSuite.scala @@ -54,7 +54,7 @@ class KMeansSuite extends SparkFunSuite with MLlibTestSparkContext { assert(kmeans.getMaxIter === 20) assert(kmeans.getRuns === 1) assert(kmeans.getInitMode === MLlibKMeans.K_MEANS_PARALLEL) - assert(kmeans.getInitializationSteps === 5) + assert(kmeans.getInitSteps === 5) assert(kmeans.getEpsilon === 1e-4) } @@ -66,7 +66,7 @@ class KMeansSuite extends SparkFunSuite with MLlibTestSparkContext { .setMaxIter(33) .setRuns(7) .setInitMode(MLlibKMeans.RANDOM) - .setInitializationSteps(3) + .setInitSteps(3) .setSeed(123) .setEpsilon(1e-3) @@ -76,7 +76,7 @@ class KMeansSuite extends SparkFunSuite with MLlibTestSparkContext { assert(kmeans.getMaxIter === 33) assert(kmeans.getRuns === 7) assert(kmeans.getInitMode === MLlibKMeans.RANDOM) - assert(kmeans.getInitializationSteps === 3) + assert(kmeans.getInitSteps === 3) assert(kmeans.getSeed === 123) assert(kmeans.getEpsilon === 1e-3) } @@ -89,7 +89,7 @@ class KMeansSuite extends SparkFunSuite with MLlibTestSparkContext { new KMeans().setInitMode("no_such_a_mode") } intercept[IllegalArgumentException] { - new KMeans().setInitializationSteps(0) + new KMeans().setInitSteps(0) } intercept[IllegalArgumentException] { new KMeans().setRuns(0) diff --git a/python/pyspark/ml/clustering.py b/python/pyspark/ml/clustering.py index 2a56c13e98f84..e7a68de47034d 100644 --- a/python/pyspark/ml/clustering.py +++ b/python/pyspark/ml/clustering.py @@ -167,18 +167,18 @@ def getInitMode(self): """ return self.getOrDefault(self.initMode) - def setInitializationSteps(self, value): + def setInitSteps(self, value): """ Sets the value of :py:attr:`initSteps`. - >>> algo = KMeans().setInitializationSteps(10) - >>> algo.getInitializationSteps() + >>> algo = KMeans().setInitSteps(10) + >>> algo.getInitSteps() 10 """ self._paramMap[self.initSteps] = value return self - def getInitializationSteps(self): + def getInitSteps(self): """ Gets the value of `initSteps` """