minor updates

Author: mengxr

mllib/src/main/scala/org/apache/spark/ml/classification/Classifier.scala

@@ -37,8 +37,6 @@ import org.apache.spark.sql.types.{DataType, DoubleType, StructType}
 private[spark] trait ClassifierParams extends PredictorParams
   with HasRawPredictionCol {
 
-  setDefault(rawPredictionCol, "rawPrediction")
-
   override protected def validateAndTransformSchema(
       schema: StructType,
       paramMap: ParamMap,

mllib/src/main/scala/org/apache/spark/ml/evaluation/BinaryClassificationEvaluator.scala

@@ -36,6 +36,8 @@ import org.apache.spark.sql.types.DoubleType
 class BinaryClassificationEvaluator extends Evaluator with Params
   with HasRawPredictionCol with HasLabelCol {
 
+  setDefault(metricName -> "areaUnderROC")
+
   /**
    * param for metric name in evaluation
    * @group param

mllib/src/main/scala/org/apache/spark/ml/param/shared/SharedParamCodeGen.scala

@@ -105,7 +105,7 @@ private[shared] object SharedParamCodeGen {
     val setDefault = defaultValue.map { v =>
       s"""
         |  setDefault($name, $v)
-      """.stripMargin
+        |""".stripMargin
     }.getOrElse("")
 
     s"""
@@ -125,14 +125,13 @@ private[shared] object SharedParamCodeGen {
       |  /** @group getParam */
       |  final def get$Name: $T = get($name)
       |}
-    """.stripMargin
+      |""".stripMargin
   }
 
   /** Generates Scala source code for the input params with header. */
   private def genSharedParams(params: Seq[ParamDesc[_]]): String = {
     val header =
-      """
-        |/*
+      """/*
         | * 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.
@@ -157,12 +156,9 @@ private[shared] object SharedParamCodeGen {
         |// DO NOT MODIFY THIS FILE! It was generated by SharedParamCodeGen.
         |
         |// scalastyle:off
-      """.stripMargin
+        |""".stripMargin
 
-    val footer =
-      """
-        |// scalastyle:on
-      """.stripMargin
+    val footer = "// scalastyle:on\n"
 
     val traits = params.map(genHasParamTrait).mkString
 

mllib/src/main/scala/org/apache/spark/ml/param/shared/sharedParams.scala

@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -24,7 +23,7 @@ import org.apache.spark.ml.param._
 // DO NOT MODIFY THIS FILE! It was generated by SharedParamCodeGen.
 
 // scalastyle:off
-      
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param regParam.
@@ -41,7 +40,7 @@ trait HasRegParam extends Params {
   /** @group getParam */
   final def getRegParam: Double = get(regParam)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param maxIter.
@@ -58,7 +57,7 @@ trait HasMaxIter extends Params {
   /** @group getParam */
   final def getMaxIter: Int = get(maxIter)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param featuresCol (default: "features").
@@ -67,7 +66,7 @@ trait HasMaxIter extends Params {
 trait HasFeaturesCol extends Params {
 
   setDefault(featuresCol, "features")
-      
+
   /**
    * Param for features column name.
    * @group param
@@ -77,7 +76,7 @@ trait HasFeaturesCol extends Params {
   /** @group getParam */
   final def getFeaturesCol: String = get(featuresCol)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param labelCol (default: "label").
@@ -86,7 +85,7 @@ trait HasFeaturesCol extends Params {
 trait HasLabelCol extends Params {
 
   setDefault(labelCol, "label")
-      
+
   /**
    * Param for label column name.
    * @group param
@@ -96,7 +95,7 @@ trait HasLabelCol extends Params {
   /** @group getParam */
   final def getLabelCol: String = get(labelCol)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param predictionCol (default: "prediction").
@@ -105,7 +104,7 @@ trait HasLabelCol extends Params {
 trait HasPredictionCol extends Params {
 
   setDefault(predictionCol, "prediction")
-      
+
   /**
    * Param for prediction column name.
    * @group param
@@ -115,7 +114,7 @@ trait HasPredictionCol extends Params {
   /** @group getParam */
   final def getPredictionCol: String = get(predictionCol)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param rawPredictionCol (default: "rawPrediction").
@@ -124,7 +123,7 @@ trait HasPredictionCol extends Params {
 trait HasRawPredictionCol extends Params {
 
   setDefault(rawPredictionCol, "rawPrediction")
-      
+
   /**
    * Param for raw prediction (a.k.a. confidence) column name.
    * @group param
@@ -134,7 +133,7 @@ trait HasRawPredictionCol extends Params {
   /** @group getParam */
   final def getRawPredictionCol: String = get(rawPredictionCol)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param probabilityCol (default: "probability").
@@ -143,7 +142,7 @@ trait HasRawPredictionCol extends Params {
 trait HasProbabilityCol extends Params {
 
   setDefault(probabilityCol, "probability")
-      
+
   /**
    * Param for column name for predicted class conditional probabilities.
    * @group param
@@ -153,7 +152,7 @@ trait HasProbabilityCol extends Params {
   /** @group getParam */
   final def getProbabilityCol: String = get(probabilityCol)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param threshold.
@@ -170,7 +169,7 @@ trait HasThreshold extends Params {
   /** @group getParam */
   final def getThreshold: Double = get(threshold)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param inputCol.
@@ -187,7 +186,7 @@ trait HasInputCol extends Params {
   /** @group getParam */
   final def getInputCol: String = get(inputCol)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param outputCol.
@@ -204,7 +203,7 @@ trait HasOutputCol extends Params {
   /** @group getParam */
   final def getOutputCol: String = get(outputCol)
 }
-    
+
 /**
  * :: DeveloperApi ::
  * Trait for shared param checkpointInterval.
@@ -221,6 +220,4 @@ trait HasCheckpointInterval extends Params {
   /** @group getParam */
   final def getCheckpointInterval: Int = get(checkpointInterval)
 }
-    
 // scalastyle:on
-      

mllib/src/main/scala/org/apache/spark/ml/recommendation/ALS.scala

@@ -51,8 +51,9 @@ import org.apache.spark.util.random.XORShiftRandom
 private[recommendation] trait ALSParams extends Params with HasMaxIter with HasRegParam
   with HasPredictionCol with HasCheckpointInterval {
 
-  setDefault(rank -> 10, numUserBlocks -> 10, numItemBlocks -> 10, implicitPrefs -> false,
-    alpha -> 1.0, userCol -> "user", itemCol -> "item", ratingCol -> "rating", nonnegative -> false)
+  setDefault(rank -> 10, maxIter -> 10, regParam -> 0.1, numUserBlocks -> 10, numItemBlocks -> 10,
+    implicitPrefs -> false, alpha -> 1.0, userCol -> "user", itemCol -> "item",
+    ratingCol -> "rating", nonnegative -> false)
 
   /**
    * Param for rank of the matrix factorization.