fix code style

nemccarthy · Apr 21, 2015 · 872028d · 872028d
1 parent f80ec1b
commit 872028d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/regression/IsotonicRegression.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/IsotonicRegression.scala
@@ -160,15 +160,15 @@ object IsotonicRegressionModel extends Loader[IsotonicRegressionModel] {
         predictions: Array[Double], 
         isotonic: Boolean): Unit = {
       val sqlContext = new SQLContext(sc)
-      import sqlContext.implicits._
 
       val metadata = compact(render(
         ("class" -> thisClassName) ~ ("version" -> thisFormatVersion) ~ 
           ("isotonic" -> isotonic)))
       sc.parallelize(Seq(metadata), 1).saveAsTextFile(metadataPath(path))
 
-      sqlContext.createDataFrame(boundaries.toSeq.zip(predictions)
-        .map { case (b, p) => Data(b, p) }).saveAsParquetFile(dataPath(path))
+      sqlContext.createDataFrame(
+        boundaries.toSeq.zip(predictions).map { case (b, p) => Data(b, p) }
+      ).saveAsParquetFile(dataPath(path))
     }
 
     def load(sc: SparkContext, path: String): (Array[Double], Array[Double]) = {
@@ -177,8 +177,9 @@ object IsotonicRegressionModel extends Loader[IsotonicRegressionModel] {
 
       checkSchema[Data](dataRDD.schema)
       val dataArray = dataRDD.select("boundary", "prediction").collect()
-      val (boundaries, predictions) = dataArray.map {
-        x => (x.getDouble(0), x.getDouble(1)) }.toList.sortBy(_._1).unzip
+      val (boundaries, predictions) = dataArray.map { x =>
+        (x.getDouble(0), x.getDouble(1))
+      }.toList.sortBy(_._1).unzip
       (boundaries.toArray, predictions.toArray)
     }
   }

diff --git a/mllib/src/test/scala/org/apache/spark/mllib/regression/IsotonicRegressionSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/regression/IsotonicRegressionSuite.scala
@@ -88,7 +88,7 @@ class IsotonicRegressionSuite extends FunSuite with MLlibTestSparkContext with M
       val sameModel = IsotonicRegressionModel.load(sc, path)
       assert(model.boundaries === sameModel.boundaries)
       assert(model.predictions === sameModel.predictions)
-      assert(model.isotonic == model.isotonic)
+      assert(model.isotonic === model.isotonic)
     } finally {
       Utils.deleteRecursively(tempDir)
     }