address review comments

apache · Jan 19, 2017 · e77cbaf · e77cbaf
1 parent 68e432e
commit e77cbaf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/R/pkg/R/mllib_clustering.R b/R/pkg/R/mllib_clustering.R
@@ -58,9 +58,11 @@ setClass("LDAModel", representation(jobj = "jobj"))
 #' @param k the desired number of leaf clusters. Must be > 1.
 #'          The actual number could be smaller if there are no divisible leaf clusters.
 #' @param maxIter maximum iteration number.
+#' @param seed the random seed.
 #' @param minDivisibleClusterSize The minimum number of points (if greater than or equal to 1.0)
 #'                                or the minimum proportion of points (if less than 1.0) of a divisible cluster.
-#' @param seed the random seed.
+#'                                Note that it is an advanced. The default value should be enough
+#'                                for most cases.
 #' @param ... additional argument(s) passed to the method.
 #' @return \code{spark.bisectingKmeans} returns a fitted bisecting k-means model.
 #' @rdname spark.bisectingKmeans
@@ -70,7 +72,6 @@ setClass("LDAModel", representation(jobj = "jobj"))
 #' @examples
 #' \dontrun{
 #' sparkR.session()
-#' data(iris)
 #' df <- createDataFrame(iris)
 #' model <- spark.bisectingKmeans(df, Sepal_Length ~ Sepal_Width, k = 4)
 #' summary(model)
@@ -90,14 +91,14 @@ setClass("LDAModel", representation(jobj = "jobj"))
 #' @note spark.bisectingKmeans since 2.2.0
 #' @seealso \link{predict}, \link{read.ml}, \link{write.ml}
 setMethod("spark.bisectingKmeans", signature(data = "SparkDataFrame", formula = "formula"),
-          function(data, formula, k = 4, maxIter = 20, minDivisibleClusterSize = 1.0, seed = NULL) {
+          function(data, formula, k = 4, maxIter = 20, seed = NULL, minDivisibleClusterSize = 1.0) {
             formula <- paste0(deparse(formula), collapse = "")
             if (!is.null(seed)) {
               seed <- as.character(as.integer(seed))
             }
             jobj <- callJStatic("org.apache.spark.ml.r.BisectingKMeansWrapper", "fit",
                                 data@sdf, formula, as.integer(k), as.integer(maxIter),
-                                as.numeric(minDivisibleClusterSize), seed)
+                                seed, as.numeric(minDivisibleClusterSize))
             new("BisectingKMeansModel", jobj = jobj)
           })
 
@@ -150,12 +151,12 @@ setMethod("predict", signature(object = "BisectingKMeansModel"),
 #' Note: A saved-loaded model does not support this method.
 #'
 #' @return \code{fitted} returns a SparkDataFrame containing fitted values.
-#' @rdname fitted
+#' @rdname spark.bisectingKmeans
 #' @export
 #' @examples
 #' \dontrun{
 #' model <- spark.bisectingKmeans(trainingData, ~ ., 2)
-#' fitted.model <- fitted(model)
+#' fitted.model <- fitted(model, "centers")
 #' showDF(fitted.model)
 #'}
 #' @note fitted since 2.2.0

diff --git a/mllib/src/main/scala/org/apache/spark/ml/r/BisectingKMeansWrapper.scala b/mllib/src/main/scala/org/apache/spark/ml/r/BisectingKMeansWrapper.scala
@@ -35,7 +35,7 @@ private[r] class BisectingKMeansWrapper private (
     val size: Array[Long],
     val isLoaded: Boolean = false) extends MLWritable {
   private val bisectingKmeansModel: BisectingKMeansModel =
-    pipeline.stages(1).asInstanceOf[BisectingKMeansModel]
+    pipeline.stages.last.asInstanceOf[BisectingKMeansModel]
 
   lazy val coefficients: Array[Double] = bisectingKmeansModel.clusterCenters.flatMap(_.toArray)
 
@@ -68,8 +68,9 @@ private[r] object BisectingKMeansWrapper extends MLReadable[BisectingKMeansWrapp
       formula: String,
       k: Int,
       maxIter: Int,
-      minDivisibleClusterSize: Double,
-      seed: String): BisectingKMeansWrapper = {
+      seed: String,
+      minDivisibleClusterSize: Double
+      ): BisectingKMeansWrapper = {
 
     val rFormula = new RFormula()
       .setFormula(formula)