Skip to content

Commit 3ae8ae5

Browse files
committed
[SPARK-1406] Adjusted imported order according to the guidelines
1 parent c67ce81 commit 3ae8ae5

File tree

5 files changed

+19
-28
lines changed

5 files changed

+19
-28
lines changed

mllib/src/main/scala/org/apache/spark/mllib/export/ModelExportFactory.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
package org.apache.spark.mllib.export
1919

2020
import org.apache.spark.mllib.clustering.KMeansModel
21+
import org.apache.spark.mllib.export.ModelExportType.ModelExportType
22+
import org.apache.spark.mllib.export.ModelExportType.PMML
23+
import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport
2124
import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport
22-
import org.apache.spark.mllib.export.ModelExportType._
25+
import org.apache.spark.mllib.regression.LassoModel
2326
import org.apache.spark.mllib.regression.LinearRegressionModel
24-
import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport
2527
import org.apache.spark.mllib.regression.RidgeRegressionModel
26-
import org.apache.spark.mllib.regression.LassoModel
2728

2829
private[mllib] object ModelExportFactory {
2930

mllib/src/main/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExport.scala

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717

1818
package org.apache.spark.mllib.export.pmml
1919

20-
import org.dmg.pmml.Array.Type
21-
import org.dmg.pmml.Cluster
22-
import org.dmg.pmml.ClusteringField
23-
import org.dmg.pmml.ClusteringModel
24-
import org.dmg.pmml.ClusteringModel.ModelClass
25-
import org.dmg.pmml.CompareFunctionType
26-
import org.dmg.pmml.ComparisonMeasure
27-
import org.dmg.pmml.ComparisonMeasure.Kind
2820
import org.dmg.pmml.DataDictionary
2921
import org.dmg.pmml.DataField
3022
import org.dmg.pmml.DataType
@@ -33,14 +25,12 @@ import org.dmg.pmml.FieldUsageType
3325
import org.dmg.pmml.MiningField
3426
import org.dmg.pmml.MiningFunctionType
3527
import org.dmg.pmml.MiningSchema
28+
import org.dmg.pmml.NumericPredictor
3629
import org.dmg.pmml.OpType
37-
import org.dmg.pmml.SquaredEuclidean
38-
import org.apache.spark.mllib.clustering.KMeansModel
39-
import org.apache.spark.mllib.regression.LinearRegressionModel
40-
import org.apache.spark.mllib.regression.GeneralizedLinearModel
4130
import org.dmg.pmml.RegressionModel
4231
import org.dmg.pmml.RegressionTable
43-
import org.dmg.pmml.NumericPredictor
32+
33+
import org.apache.spark.mllib.regression.GeneralizedLinearModel
4434

4535
/**
4636
* PMML Model Export for GeneralizedLinear abstract class

mllib/src/test/scala/org/apache/spark/mllib/export/ModelExportFactorySuite.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717

1818
package org.apache.spark.mllib.export
1919

20-
import scala.annotation.varargs
20+
import org.scalatest.FunSuite
21+
2122
import org.apache.spark.mllib.clustering.KMeansModel
2223
import org.apache.spark.mllib.linalg.Vectors
23-
import org.scalatest.FunSuite
24-
import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport
25-
import org.apache.spark.mllib.util.LinearDataGenerator
26-
import org.apache.spark.mllib.regression.LinearRegressionModel
27-
import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport
2824
import org.apache.spark.mllib.regression.LassoModel
25+
import org.apache.spark.mllib.regression.LinearRegressionModel
2926
import org.apache.spark.mllib.regression.RidgeRegressionModel
27+
import org.apache.spark.mllib.util.LinearDataGenerator
28+
import org.apache.spark.mllib.export.pmml.GeneralizedLinearPMMLModelExport
29+
import org.apache.spark.mllib.export.pmml.KMeansPMMLModelExport
3030

3131
class ModelExportFactorySuite extends FunSuite{
3232

mllib/src/test/scala/org/apache/spark/mllib/export/pmml/GeneralizedLinearPMMLModelExportSuite.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.spark.mllib.export.pmml
1919

20-
import org.apache.spark.annotation.DeveloperApi
20+
import org.dmg.pmml.RegressionModel
21+
import org.scalatest.FunSuite
22+
2123
import org.apache.spark.mllib.export.ModelExportFactory
2224
import org.apache.spark.mllib.export.ModelExportType
2325
import org.apache.spark.mllib.regression.LassoModel
2426
import org.apache.spark.mllib.regression.LinearRegressionModel
2527
import org.apache.spark.mllib.regression.RidgeRegressionModel
2628
import org.apache.spark.mllib.util.LinearDataGenerator
27-
import org.scalatest.FunSuite
28-
import org.dmg.pmml.RegressionModel
2929

3030
class GeneralizedLinearPMMLModelExportSuite extends FunSuite{
3131

mllib/src/test/scala/org/apache/spark/mllib/export/pmml/KMeansPMMLModelExportSuite.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
package org.apache.spark.mllib.export.pmml
1919

20-
import scala.annotation.varargs
20+
import org.dmg.pmml.ClusteringModel
21+
import org.scalatest.FunSuite
22+
2123
import org.apache.spark.mllib.clustering.KMeansModel
2224
import org.apache.spark.mllib.export.ModelExportFactory
2325
import org.apache.spark.mllib.export.ModelExportType
2426
import org.apache.spark.mllib.linalg.Vectors
25-
import org.scalatest.FunSuite
26-
import org.dmg.pmml.ClusteringModel
2727

2828
class KMeansPMMLModelExportSuite extends FunSuite{
2929

0 commit comments

Comments
 (0)