From 3ae8ae5189a257ad9d9242b7ef6957831ef0a2c8 Mon Sep 17 00:00:00 2001 From: Vincenzo Selvaggio Date: Sat, 29 Nov 2014 08:46:39 +0000 Subject: [PATCH] [SPARK-1406] Adjusted imported order according to the guidelines --- .../spark/mllib/export/ModelExportFactory.scala | 7 ++++--- .../pmml/GeneralizedLinearPMMLModelExport.scala | 16 +++------------- .../mllib/export/ModelExportFactorySuite.scala | 12 ++++++------ .../GeneralizedLinearPMMLModelExportSuite.scala | 6 +++--- .../export/pmml/KMeansPMMLModelExportSuite.scala | 6 +++--- 5 files changed, 19 insertions(+), 28 deletions(-) diff --git a/mllib/src/main/scala/org/apache/spark/mllib/export/ModelExportFactory.scala b/mllib/src/main/scala/org/apache/spark/mllib/export/ModelExportFactory.scala index 079a5efc5c219..f52d22093739d 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/export/ModelExportFactory.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/export/ModelExportFactory.scala @@ -18,12 +18,13 @@ package org.apache.spark.mllib.export import org.apache.spark.mllib.clustering.KMeansModel +import org.apache.spark.mllib.export.ModelExportType.ModelExportType +import org.apache.spark.mllib.export.ModelExportType.PMML +import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport -import org.apache.spark.mllib.export.ModelExportType._ +import org.apache.spark.mllib.regression.LassoModel import org.apache.spark.mllib.regression.LinearRegressionModel -import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport import org.apache.spark.mllib.regression.RidgeRegressionModel -import org.apache.spark.mllib.regression.LassoModel private[mllib] object ModelExportFactory { diff --git a/mllib/src/main/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExport.scala b/mllib/src/main/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExport.scala index edfacafa258ed..aed7ef5b26bc2 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExport.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExport.scala @@ -17,14 +17,6 @@ package org.apache.spark.mllib.export.pmml -import org.dmg.pmml.Array.Type -import org.dmg.pmml.Cluster -import org.dmg.pmml.ClusteringField -import org.dmg.pmml.ClusteringModel -import org.dmg.pmml.ClusteringModel.ModelClass -import org.dmg.pmml.CompareFunctionType -import org.dmg.pmml.ComparisonMeasure -import org.dmg.pmml.ComparisonMeasure.Kind import org.dmg.pmml.DataDictionary import org.dmg.pmml.DataField import org.dmg.pmml.DataType @@ -33,14 +25,12 @@ import org.dmg.pmml.FieldUsageType import org.dmg.pmml.MiningField import org.dmg.pmml.MiningFunctionType import org.dmg.pmml.MiningSchema +import org.dmg.pmml.NumericPredictor import org.dmg.pmml.OpType -import org.dmg.pmml.SquaredEuclidean -import org.apache.spark.mllib.clustering.KMeansModel -import org.apache.spark.mllib.regression.LinearRegressionModel -import org.apache.spark.mllib.regression.GeneralizedLinearModel import org.dmg.pmml.RegressionModel import org.dmg.pmml.RegressionTable -import org.dmg.pmml.NumericPredictor + +import org.apache.spark.mllib.regression.GeneralizedLinearModel /** * PMML Model Export for GeneralizedLinear abstract class diff --git a/mllib/src/test/scala/org/apache/spark/mllib/export/ModelExportFactorySuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/export/ModelExportFactorySuite.scala index ec4b300d71e56..b2208dd6d0c7d 100644 --- a/mllib/src/test/scala/org/apache/spark/mllib/export/ModelExportFactorySuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/export/ModelExportFactorySuite.scala @@ -17,16 +17,16 @@ package org.apache.spark.mllib.export -import scala.annotation.varargs +import org.scalatest.FunSuite + import org.apache.spark.mllib.clustering.KMeansModel import org.apache.spark.mllib.linalg.Vectors -import org.scalatest.FunSuite -import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport -import org.apache.spark.mllib.util.LinearDataGenerator -import org.apache.spark.mllib.regression.LinearRegressionModel -import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport import org.apache.spark.mllib.regression.LassoModel +import org.apache.spark.mllib.regression.LinearRegressionModel import org.apache.spark.mllib.regression.RidgeRegressionModel +import org.apache.spark.mllib.util.LinearDataGenerator +import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport +import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport class ModelExportFactorySuite extends FunSuite{ diff --git a/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExportSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExportSuite.scala index 20245c6917c5b..c3ecbd0b4b2cb 100644 --- a/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExportSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExportSuite.scala @@ -17,15 +17,15 @@ package org.apache.spark.mllib.export.pmml -import org.apache.spark.annotation.DeveloperApi +import org.dmg.pmml.RegressionModel +import org.scalatest.FunSuite + import org.apache.spark.mllib.export.ModelExportFactory import org.apache.spark.mllib.export.ModelExportType import org.apache.spark.mllib.regression.LassoModel import org.apache.spark.mllib.regression.LinearRegressionModel import org.apache.spark.mllib.regression.RidgeRegressionModel import org.apache.spark.mllib.util.LinearDataGenerator -import org.scalatest.FunSuite -import org.dmg.pmml.RegressionModel class GeneralizedLinearPMMLModelExportSuite extends FunSuite{ diff --git a/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/KMeansPMMLModelExportSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/KMeansPMMLModelExportSuite.scala index 30fafe146f367..471e311b53653 100644 --- a/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/KMeansPMMLModelExportSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/export/pmml/KMeansPMMLModelExportSuite.scala @@ -17,13 +17,13 @@ package org.apache.spark.mllib.export.pmml -import scala.annotation.varargs +import org.dmg.pmml.ClusteringModel +import org.scalatest.FunSuite + import org.apache.spark.mllib.clustering.KMeansModel import org.apache.spark.mllib.export.ModelExportFactory import org.apache.spark.mllib.export.ModelExportType import org.apache.spark.mllib.linalg.Vectors -import org.scalatest.FunSuite -import org.dmg.pmml.ClusteringModel class KMeansPMMLModelExportSuite extends FunSuite{