diff options
Diffstat (limited to 'mllib/src')
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/classification/ClassificationModel.scala (renamed from mllib/src/main/scala/spark/mllib/classification/ClassificationModel.scala) | 4 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/classification/LogisticRegression.scala (renamed from mllib/src/main/scala/spark/mllib/classification/LogisticRegression.scala) | 12 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/classification/SVM.scala (renamed from mllib/src/main/scala/spark/mllib/classification/SVM.scala) | 12 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/clustering/KMeans.scala (renamed from mllib/src/main/scala/spark/mllib/clustering/KMeans.scala) | 10 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/clustering/KMeansModel.scala (renamed from mllib/src/main/scala/spark/mllib/clustering/KMeansModel.scala) | 8 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/clustering/LocalKMeans.scala (renamed from mllib/src/main/scala/spark/mllib/clustering/LocalKMeans.scala) | 2 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/optimization/Gradient.scala (renamed from mllib/src/main/scala/spark/mllib/optimization/Gradient.scala) | 2 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/optimization/GradientDescent.scala (renamed from mllib/src/main/scala/spark/mllib/optimization/GradientDescent.scala) | 6 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/optimization/Optimizer.scala (renamed from mllib/src/main/scala/spark/mllib/optimization/Optimizer.scala) | 4 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/optimization/Updater.scala (renamed from mllib/src/main/scala/spark/mllib/optimization/Updater.scala) | 2 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala (renamed from mllib/src/main/scala/spark/mllib/recommendation/ALS.scala) | 12 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/recommendation/MatrixFactorizationModel.scala (renamed from mllib/src/main/scala/spark/mllib/recommendation/MatrixFactorizationModel.scala) | 6 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/regression/GeneralizedLinearAlgorithm.scala (renamed from mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala) | 8 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala (renamed from mllib/src/main/scala/spark/mllib/regression/LabeledPoint.scala) | 2 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/regression/Lasso.scala (renamed from mllib/src/main/scala/spark/mllib/regression/Lasso.scala) | 8 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/regression/LinearRegression.scala (renamed from mllib/src/main/scala/spark/mllib/regression/LinearRegression.scala) | 8 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/regression/RegressionModel.scala (renamed from mllib/src/main/scala/spark/mllib/regression/RegressionModel.scala) | 4 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/regression/RidgeRegression.scala (renamed from mllib/src/main/scala/spark/mllib/regression/RidgeRegression.scala) | 8 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/util/DataValidators.scala (renamed from mllib/src/main/scala/spark/mllib/util/DataValidators.scala) | 6 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/util/KMeansDataGenerator.scala (renamed from mllib/src/main/scala/spark/mllib/util/KMeansDataGenerator.scala) | 4 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/util/LinearDataGenerator.scala (renamed from mllib/src/main/scala/spark/mllib/util/LinearDataGenerator.scala) | 8 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/util/LogisticRegressionDataGenerator.scala (renamed from mllib/src/main/scala/spark/mllib/util/LogisticRegressionDataGenerator.scala) | 6 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/util/MFDataGenerator.scala (renamed from mllib/src/main/scala/spark/mllib/util/MFDataGenerator.scala) | 8 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/util/MLUtils.scala (renamed from mllib/src/main/scala/spark/mllib/util/MLUtils.scala) | 8 | ||||
-rw-r--r-- | mllib/src/main/scala/org/apache/spark/mllib/util/SVMDataGenerator.scala (renamed from mllib/src/main/scala/spark/mllib/util/SVMDataGenerator.scala) | 6 | ||||
-rw-r--r-- | mllib/src/test/java/org/apache/spark/mllib/classification/JavaLogisticRegressionSuite.java (renamed from mllib/src/test/java/spark/mllib/classification/JavaLogisticRegressionSuite.java) | 8 | ||||
-rw-r--r-- | mllib/src/test/java/org/apache/spark/mllib/classification/JavaSVMSuite.java (renamed from mllib/src/test/java/spark/mllib/classification/JavaSVMSuite.java) | 8 | ||||
-rw-r--r-- | mllib/src/test/java/org/apache/spark/mllib/clustering/JavaKMeansSuite.java (renamed from mllib/src/test/java/spark/mllib/clustering/JavaKMeansSuite.java) | 6 | ||||
-rw-r--r-- | mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java (renamed from mllib/src/test/java/spark/mllib/recommendation/JavaALSSuite.java) | 6 | ||||
-rw-r--r-- | mllib/src/test/java/org/apache/spark/mllib/regression/JavaLassoSuite.java (renamed from mllib/src/test/java/spark/mllib/regression/JavaLassoSuite.java) | 8 | ||||
-rw-r--r-- | mllib/src/test/java/org/apache/spark/mllib/regression/JavaLinearRegressionSuite.java (renamed from mllib/src/test/java/spark/mllib/regression/JavaLinearRegressionSuite.java) | 8 | ||||
-rw-r--r-- | mllib/src/test/java/org/apache/spark/mllib/regression/JavaRidgeRegressionSuite.java (renamed from mllib/src/test/java/spark/mllib/regression/JavaRidgeRegressionSuite.java) | 8 | ||||
-rw-r--r-- | mllib/src/test/scala/org/apache/spark/mllib/classification/LogisticRegressionSuite.scala (renamed from mllib/src/test/scala/spark/mllib/classification/LogisticRegressionSuite.scala) | 6 | ||||
-rw-r--r-- | mllib/src/test/scala/org/apache/spark/mllib/classification/SVMSuite.scala (renamed from mllib/src/test/scala/spark/mllib/classification/SVMSuite.scala) | 10 | ||||
-rw-r--r-- | mllib/src/test/scala/org/apache/spark/mllib/clustering/KMeansSuite.scala (renamed from mllib/src/test/scala/spark/mllib/clustering/KMeansSuite.scala) | 6 | ||||
-rw-r--r-- | mllib/src/test/scala/org/apache/spark/mllib/recommendation/ALSSuite.scala (renamed from mllib/src/test/scala/spark/mllib/recommendation/ALSSuite.scala) | 6 | ||||
-rw-r--r-- | mllib/src/test/scala/org/apache/spark/mllib/regression/LassoSuite.scala (renamed from mllib/src/test/scala/spark/mllib/regression/LassoSuite.scala) | 6 | ||||
-rw-r--r-- | mllib/src/test/scala/org/apache/spark/mllib/regression/LinearRegressionSuite.scala (renamed from mllib/src/test/scala/spark/mllib/regression/LinearRegressionSuite.scala) | 8 | ||||
-rw-r--r-- | mllib/src/test/scala/org/apache/spark/mllib/regression/RidgeRegressionSuite.scala (renamed from mllib/src/test/scala/spark/mllib/regression/RidgeRegressionSuite.scala) | 8 |
39 files changed, 133 insertions, 133 deletions
diff --git a/mllib/src/main/scala/spark/mllib/classification/ClassificationModel.scala b/mllib/src/main/scala/org/apache/spark/mllib/classification/ClassificationModel.scala index 70fae8c15a..4f4a7f5296 100644 --- a/mllib/src/main/scala/spark/mllib/classification/ClassificationModel.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/classification/ClassificationModel.scala @@ -1,6 +1,6 @@ -package spark.mllib.classification +package org.apache.spark.mllib.classification -import spark.RDD +import org.apache.spark.RDD trait ClassificationModel extends Serializable { /** diff --git a/mllib/src/main/scala/spark/mllib/classification/LogisticRegression.scala b/mllib/src/main/scala/org/apache/spark/mllib/classification/LogisticRegression.scala index 482e4a6745..91bb50c829 100644 --- a/mllib/src/main/scala/spark/mllib/classification/LogisticRegression.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/classification/LogisticRegression.scala @@ -15,15 +15,15 @@ * limitations under the License. */ -package spark.mllib.classification +package org.apache.spark.mllib.classification import scala.math.round -import spark.{Logging, RDD, SparkContext} -import spark.mllib.optimization._ -import spark.mllib.regression._ -import spark.mllib.util.MLUtils -import spark.mllib.util.DataValidators +import org.apache.spark.{Logging, RDD, SparkContext} +import org.apache.spark.mllib.optimization._ +import org.apache.spark.mllib.regression._ +import org.apache.spark.mllib.util.MLUtils +import org.apache.spark.mllib.util.DataValidators import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/classification/SVM.scala b/mllib/src/main/scala/org/apache/spark/mllib/classification/SVM.scala index 69393cd7b0..c92c7cc3f3 100644 --- a/mllib/src/main/scala/spark/mllib/classification/SVM.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/classification/SVM.scala @@ -15,15 +15,15 @@ * limitations under the License. */ -package spark.mllib.classification +package org.apache.spark.mllib.classification import scala.math.signum -import spark.{Logging, RDD, SparkContext} -import spark.mllib.optimization._ -import spark.mllib.regression._ -import spark.mllib.util.MLUtils -import spark.mllib.util.DataValidators +import org.apache.spark.{Logging, RDD, SparkContext} +import org.apache.spark.mllib.optimization._ +import org.apache.spark.mllib.regression._ +import org.apache.spark.mllib.util.MLUtils +import org.apache.spark.mllib.util.DataValidators import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/clustering/KMeans.scala b/mllib/src/main/scala/org/apache/spark/mllib/clustering/KMeans.scala index 97e3d110ae..2c3db099fa 100644 --- a/mllib/src/main/scala/spark/mllib/clustering/KMeans.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/clustering/KMeans.scala @@ -15,15 +15,15 @@ * limitations under the License. */ -package spark.mllib.clustering +package org.apache.spark.mllib.clustering import scala.collection.mutable.ArrayBuffer import scala.util.Random -import spark.{SparkContext, RDD} -import spark.SparkContext._ -import spark.Logging -import spark.mllib.util.MLUtils +import org.apache.spark.{SparkContext, RDD} +import org.apache.spark.SparkContext._ +import org.apache.spark.Logging +import org.apache.spark.mllib.util.MLUtils import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/clustering/KMeansModel.scala b/mllib/src/main/scala/org/apache/spark/mllib/clustering/KMeansModel.scala index b8f80e80cd..d1fe5d138d 100644 --- a/mllib/src/main/scala/spark/mllib/clustering/KMeansModel.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/clustering/KMeansModel.scala @@ -15,11 +15,11 @@ * limitations under the License. */ -package spark.mllib.clustering +package org.apache.spark.mllib.clustering -import spark.RDD -import spark.SparkContext._ -import spark.mllib.util.MLUtils +import org.apache.spark.RDD +import org.apache.spark.SparkContext._ +import org.apache.spark.mllib.util.MLUtils /** diff --git a/mllib/src/main/scala/spark/mllib/clustering/LocalKMeans.scala b/mllib/src/main/scala/org/apache/spark/mllib/clustering/LocalKMeans.scala index 89fe7d7e85..baf8251d8f 100644 --- a/mllib/src/main/scala/spark/mllib/clustering/LocalKMeans.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/clustering/LocalKMeans.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.clustering +package org.apache.spark.mllib.clustering import scala.util.Random diff --git a/mllib/src/main/scala/spark/mllib/optimization/Gradient.scala b/mllib/src/main/scala/org/apache/spark/mllib/optimization/Gradient.scala index 05568f55af..749e7364f4 100644 --- a/mllib/src/main/scala/spark/mllib/optimization/Gradient.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/optimization/Gradient.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.optimization +package org.apache.spark.mllib.optimization import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/optimization/GradientDescent.scala b/mllib/src/main/scala/org/apache/spark/mllib/optimization/GradientDescent.scala index 31917df7e8..b62c9b3340 100644 --- a/mllib/src/main/scala/spark/mllib/optimization/GradientDescent.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/optimization/GradientDescent.scala @@ -15,10 +15,10 @@ * limitations under the License. */ -package spark.mllib.optimization +package org.apache.spark.mllib.optimization -import spark.{Logging, RDD, SparkContext} -import spark.SparkContext._ +import org.apache.spark.{Logging, RDD, SparkContext} +import org.apache.spark.SparkContext._ import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/optimization/Optimizer.scala b/mllib/src/main/scala/org/apache/spark/mllib/optimization/Optimizer.scala index 76a519c338..50059d385d 100644 --- a/mllib/src/main/scala/spark/mllib/optimization/Optimizer.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/optimization/Optimizer.scala @@ -15,9 +15,9 @@ * limitations under the License. */ -package spark.mllib.optimization +package org.apache.spark.mllib.optimization -import spark.RDD +import org.apache.spark.RDD trait Optimizer { diff --git a/mllib/src/main/scala/spark/mllib/optimization/Updater.scala b/mllib/src/main/scala/org/apache/spark/mllib/optimization/Updater.scala index db67d6b0bc..4c51f4f881 100644 --- a/mllib/src/main/scala/spark/mllib/optimization/Updater.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/optimization/Updater.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.optimization +package org.apache.spark.mllib.optimization import scala.math._ import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/recommendation/ALS.scala b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala index dbfbf59975..218217acfe 100644 --- a/mllib/src/main/scala/spark/mllib/recommendation/ALS.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/ALS.scala @@ -15,16 +15,16 @@ * limitations under the License. */ -package spark.mllib.recommendation +package org.apache.spark.mllib.recommendation import scala.collection.mutable.{ArrayBuffer, BitSet} import scala.util.Random import scala.util.Sorting -import spark.{HashPartitioner, Partitioner, SparkContext, RDD} -import spark.storage.StorageLevel -import spark.KryoRegistrator -import spark.SparkContext._ +import org.apache.spark.{HashPartitioner, Partitioner, SparkContext, RDD} +import org.apache.spark.storage.StorageLevel +import org.apache.spark.KryoRegistrator +import org.apache.spark.SparkContext._ import com.esotericsoftware.kryo.Kryo import org.jblas.{DoubleMatrix, SimpleBlas, Solve} @@ -432,7 +432,7 @@ object ALS { val (master, ratingsFile, rank, iters, outputDir) = (args(0), args(1), args(2).toInt, args(3).toInt, args(4)) val blocks = if (args.length == 6) args(5).toInt else -1 - System.setProperty("spark.serializer", "spark.KryoSerializer") + System.setProperty("spark.serializer", "org.apache.spark.KryoSerializer") System.setProperty("spark.kryo.registrator", classOf[ALSRegistrator].getName) System.setProperty("spark.kryo.referenceTracking", "false") System.setProperty("spark.kryoserializer.buffer.mb", "8") diff --git a/mllib/src/main/scala/spark/mllib/recommendation/MatrixFactorizationModel.scala b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/MatrixFactorizationModel.scala index 5e21717da5..ae9fe48aec 100644 --- a/mllib/src/main/scala/spark/mllib/recommendation/MatrixFactorizationModel.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/recommendation/MatrixFactorizationModel.scala @@ -15,10 +15,10 @@ * limitations under the License. */ -package spark.mllib.recommendation +package org.apache.spark.mllib.recommendation -import spark.RDD -import spark.SparkContext._ +import org.apache.spark.RDD +import org.apache.spark.SparkContext._ import org.jblas._ diff --git a/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/GeneralizedLinearAlgorithm.scala index d164d415d6..06015110ac 100644 --- a/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/regression/GeneralizedLinearAlgorithm.scala @@ -15,10 +15,10 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression -import spark.{Logging, RDD, SparkException} -import spark.mllib.optimization._ +import org.apache.spark.{Logging, RDD, SparkException} +import org.apache.spark.mllib.optimization._ import org.jblas.DoubleMatrix @@ -52,7 +52,7 @@ abstract class GeneralizedLinearModel(val weights: Array[Double], val intercept: * @param testData RDD representing data points to be predicted * @return RDD[Double] where each entry contains the corresponding prediction */ - def predict(testData: spark.RDD[Array[Double]]): RDD[Double] = { + def predict(testData: RDD[Array[Double]]): RDD[Double] = { // A small optimization to avoid serializing the entire model. Only the weightsMatrix // and intercept is needed. val localWeights = weightsMatrix diff --git a/mllib/src/main/scala/spark/mllib/regression/LabeledPoint.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala index 3de60482c5..63240e24dc 100644 --- a/mllib/src/main/scala/spark/mllib/regression/LabeledPoint.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression /** * Class that represents the features and labels of a data point. diff --git a/mllib/src/main/scala/spark/mllib/regression/Lasso.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/Lasso.scala index 0f33456ef4..df3beb1959 100644 --- a/mllib/src/main/scala/spark/mllib/regression/Lasso.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/regression/Lasso.scala @@ -15,11 +15,11 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression -import spark.{Logging, RDD, SparkContext} -import spark.mllib.optimization._ -import spark.mllib.util.MLUtils +import org.apache.spark.{Logging, RDD, SparkContext} +import org.apache.spark.mllib.optimization._ +import org.apache.spark.mllib.util.MLUtils import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/regression/LinearRegression.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/LinearRegression.scala index 885ff5a30d..71f968471c 100644 --- a/mllib/src/main/scala/spark/mllib/regression/LinearRegression.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/regression/LinearRegression.scala @@ -15,11 +15,11 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression -import spark.{Logging, RDD, SparkContext} -import spark.mllib.optimization._ -import spark.mllib.util.MLUtils +import org.apache.spark.{Logging, RDD, SparkContext} +import org.apache.spark.mllib.optimization._ +import org.apache.spark.mllib.util.MLUtils import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/regression/RegressionModel.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/RegressionModel.scala index b845ba1a89..8dd325efc0 100644 --- a/mllib/src/main/scala/spark/mllib/regression/RegressionModel.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/regression/RegressionModel.scala @@ -15,9 +15,9 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression -import spark.RDD +import org.apache.spark.RDD trait RegressionModel extends Serializable { /** diff --git a/mllib/src/main/scala/spark/mllib/regression/RidgeRegression.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/RidgeRegression.scala index cb1303dd99..228ab9e4e8 100644 --- a/mllib/src/main/scala/spark/mllib/regression/RidgeRegression.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/regression/RidgeRegression.scala @@ -15,11 +15,11 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression -import spark.{Logging, RDD, SparkContext} -import spark.mllib.optimization._ -import spark.mllib.util.MLUtils +import org.apache.spark.{Logging, RDD, SparkContext} +import org.apache.spark.mllib.optimization._ +import org.apache.spark.mllib.util.MLUtils import org.jblas.DoubleMatrix diff --git a/mllib/src/main/scala/spark/mllib/util/DataValidators.scala b/mllib/src/main/scala/org/apache/spark/mllib/util/DataValidators.scala index 57553accf1..7fd4623071 100644 --- a/mllib/src/main/scala/spark/mllib/util/DataValidators.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/util/DataValidators.scala @@ -15,10 +15,10 @@ * limitations under the License. */ -package spark.mllib.util +package org.apache.spark.mllib.util -import spark.{RDD, Logging} -import spark.mllib.regression.LabeledPoint +import org.apache.spark.{RDD, Logging} +import org.apache.spark.mllib.regression.LabeledPoint /** * A collection of methods used to validate data before applying ML algorithms. diff --git a/mllib/src/main/scala/spark/mllib/util/KMeansDataGenerator.scala b/mllib/src/main/scala/org/apache/spark/mllib/util/KMeansDataGenerator.scala index 672b63f65a..6500d47183 100644 --- a/mllib/src/main/scala/spark/mllib/util/KMeansDataGenerator.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/util/KMeansDataGenerator.scala @@ -15,11 +15,11 @@ * limitations under the License. */ -package spark.mllib.util +package org.apache.spark.mllib.util import scala.util.Random -import spark.{RDD, SparkContext} +import org.apache.spark.{RDD, SparkContext} /** * Generate test data for KMeans. This class first chooses k cluster centers diff --git a/mllib/src/main/scala/spark/mllib/util/LinearDataGenerator.scala b/mllib/src/main/scala/org/apache/spark/mllib/util/LinearDataGenerator.scala index 9f48477f84..4c49d484b4 100644 --- a/mllib/src/main/scala/spark/mllib/util/LinearDataGenerator.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/util/LinearDataGenerator.scala @@ -15,16 +15,16 @@ * limitations under the License. */ -package spark.mllib.util +package org.apache.spark.mllib.util import scala.collection.JavaConversions._ import scala.util.Random import org.jblas.DoubleMatrix -import spark.{RDD, SparkContext} -import spark.mllib.regression.LabeledPoint -import spark.mllib.regression.LabeledPoint +import org.apache.spark.{RDD, SparkContext} +import org.apache.spark.mllib.regression.LabeledPoint +import org.apache.spark.mllib.regression.LabeledPoint /** * Generate sample data used for Linear Data. This class generates diff --git a/mllib/src/main/scala/spark/mllib/util/LogisticRegressionDataGenerator.scala b/mllib/src/main/scala/org/apache/spark/mllib/util/LogisticRegressionDataGenerator.scala index d6402f23e2..f553298fc5 100644 --- a/mllib/src/main/scala/spark/mllib/util/LogisticRegressionDataGenerator.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/util/LogisticRegressionDataGenerator.scala @@ -15,12 +15,12 @@ * limitations under the License. */ -package spark.mllib.util +package org.apache.spark.mllib.util import scala.util.Random -import spark.{RDD, SparkContext} -import spark.mllib.regression.LabeledPoint +import org.apache.spark.{RDD, SparkContext} +import org.apache.spark.mllib.regression.LabeledPoint /** * Generate test data for LogisticRegression. This class chooses positive labels diff --git a/mllib/src/main/scala/spark/mllib/util/MFDataGenerator.scala b/mllib/src/main/scala/org/apache/spark/mllib/util/MFDataGenerator.scala index 88992cde0c..7eb69ae81c 100644 --- a/mllib/src/main/scala/spark/mllib/util/MFDataGenerator.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/util/MFDataGenerator.scala @@ -15,14 +15,14 @@ * limitations under the License. */ -package spark.mllib.recommendation +package org.apache.spark.mllib.recommendation import scala.util.Random import org.jblas.DoubleMatrix -import spark.{RDD, SparkContext} -import spark.mllib.util.MLUtils +import org.apache.spark.{RDD, SparkContext} +import org.apache.spark.mllib.util.MLUtils /** * Generate RDD(s) containing data for Matrix Factorization. @@ -110,4 +110,4 @@ object MFDataGenerator{ sc.stop() } -}
\ No newline at end of file +} diff --git a/mllib/src/main/scala/spark/mllib/util/MLUtils.scala b/mllib/src/main/scala/org/apache/spark/mllib/util/MLUtils.scala index a8e6ae9953..0aeafbe23c 100644 --- a/mllib/src/main/scala/spark/mllib/util/MLUtils.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/util/MLUtils.scala @@ -15,13 +15,13 @@ * limitations under the License. */ -package spark.mllib.util +package org.apache.spark.mllib.util -import spark.{RDD, SparkContext} -import spark.SparkContext._ +import org.apache.spark.{RDD, SparkContext} +import org.apache.spark.SparkContext._ import org.jblas.DoubleMatrix -import spark.mllib.regression.LabeledPoint +import org.apache.spark.mllib.regression.LabeledPoint /** * Helper methods to load, save and pre-process data used in ML Lib. diff --git a/mllib/src/main/scala/spark/mllib/util/SVMDataGenerator.scala b/mllib/src/main/scala/org/apache/spark/mllib/util/SVMDataGenerator.scala index eff456cad6..d3f191b05b 100644 --- a/mllib/src/main/scala/spark/mllib/util/SVMDataGenerator.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/util/SVMDataGenerator.scala @@ -1,11 +1,11 @@ -package spark.mllib.util +package org.apache.spark.mllib.util import scala.util.Random -import spark.{RDD, SparkContext} +import org.apache.spark.{RDD, SparkContext} import org.jblas.DoubleMatrix -import spark.mllib.regression.LabeledPoint +import org.apache.spark.mllib.regression.LabeledPoint /** * Generate sample data used for SVM. This class generates uniform random values diff --git a/mllib/src/test/java/spark/mllib/classification/JavaLogisticRegressionSuite.java b/mllib/src/test/java/org/apache/spark/mllib/classification/JavaLogisticRegressionSuite.java index e0ebd45cd8..e18e3bc6a8 100644 --- a/mllib/src/test/java/spark/mllib/classification/JavaLogisticRegressionSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/classification/JavaLogisticRegressionSuite.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.classification; +package org.apache.spark.mllib.classification; import java.io.Serializable; import java.util.List; @@ -25,10 +25,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import spark.api.java.JavaRDD; -import spark.api.java.JavaSparkContext; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; -import spark.mllib.regression.LabeledPoint; +import org.apache.spark.mllib.regression.LabeledPoint; public class JavaLogisticRegressionSuite implements Serializable { private transient JavaSparkContext sc; diff --git a/mllib/src/test/java/spark/mllib/classification/JavaSVMSuite.java b/mllib/src/test/java/org/apache/spark/mllib/classification/JavaSVMSuite.java index 7881b3c38f..117e5eaa8b 100644 --- a/mllib/src/test/java/spark/mllib/classification/JavaSVMSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/classification/JavaSVMSuite.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.classification; +package org.apache.spark.mllib.classification; import java.io.Serializable; @@ -26,10 +26,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import spark.api.java.JavaRDD; -import spark.api.java.JavaSparkContext; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; -import spark.mllib.regression.LabeledPoint; +import org.apache.spark.mllib.regression.LabeledPoint; public class JavaSVMSuite implements Serializable { private transient JavaSparkContext sc; diff --git a/mllib/src/test/java/spark/mllib/clustering/JavaKMeansSuite.java b/mllib/src/test/java/org/apache/spark/mllib/clustering/JavaKMeansSuite.java index 3f2d82bfb4..32d3934ac1 100644 --- a/mllib/src/test/java/spark/mllib/clustering/JavaKMeansSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/clustering/JavaKMeansSuite.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.clustering; +package org.apache.spark.mllib.clustering; import java.io.Serializable; import java.util.ArrayList; @@ -26,8 +26,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import spark.api.java.JavaRDD; -import spark.api.java.JavaSparkContext; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; public class JavaKMeansSuite implements Serializable { private transient JavaSparkContext sc; diff --git a/mllib/src/test/java/spark/mllib/recommendation/JavaALSSuite.java b/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java index 7993629a6d..3323f6cee2 100644 --- a/mllib/src/test/java/spark/mllib/recommendation/JavaALSSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.recommendation; +package org.apache.spark.mllib.recommendation; import java.io.Serializable; import java.util.List; @@ -27,8 +27,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import spark.api.java.JavaRDD; -import spark.api.java.JavaSparkContext; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; import org.jblas.DoubleMatrix; diff --git a/mllib/src/test/java/spark/mllib/regression/JavaLassoSuite.java b/mllib/src/test/java/org/apache/spark/mllib/regression/JavaLassoSuite.java index 5863140baf..f44b25cd44 100644 --- a/mllib/src/test/java/spark/mllib/regression/JavaLassoSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/regression/JavaLassoSuite.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.regression; +package org.apache.spark.mllib.regression; import java.io.Serializable; import java.util.List; @@ -25,9 +25,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import spark.api.java.JavaRDD; -import spark.api.java.JavaSparkContext; -import spark.mllib.util.LinearDataGenerator; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; +import org.apache.spark.mllib.util.LinearDataGenerator; public class JavaLassoSuite implements Serializable { private transient JavaSparkContext sc; diff --git a/mllib/src/test/java/spark/mllib/regression/JavaLinearRegressionSuite.java b/mllib/src/test/java/org/apache/spark/mllib/regression/JavaLinearRegressionSuite.java index 50716c7861..5a4410a632 100644 --- a/mllib/src/test/java/spark/mllib/regression/JavaLinearRegressionSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/regression/JavaLinearRegressionSuite.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.regression; +package org.apache.spark.mllib.regression; import java.io.Serializable; import java.util.List; @@ -25,9 +25,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import spark.api.java.JavaRDD; -import spark.api.java.JavaSparkContext; -import spark.mllib.util.LinearDataGenerator; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; +import org.apache.spark.mllib.util.LinearDataGenerator; public class JavaLinearRegressionSuite implements Serializable { private transient JavaSparkContext sc; diff --git a/mllib/src/test/java/spark/mllib/regression/JavaRidgeRegressionSuite.java b/mllib/src/test/java/org/apache/spark/mllib/regression/JavaRidgeRegressionSuite.java index 2c0aabad30..2fdd5fc8fd 100644 --- a/mllib/src/test/java/spark/mllib/regression/JavaRidgeRegressionSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/regression/JavaRidgeRegressionSuite.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.regression; +package org.apache.spark.mllib.regression; import java.io.Serializable; import java.util.List; @@ -27,9 +27,9 @@ import org.junit.Test; import org.jblas.DoubleMatrix; -import spark.api.java.JavaRDD; -import spark.api.java.JavaSparkContext; -import spark.mllib.util.LinearDataGenerator; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; +import org.apache.spark.mllib.util.LinearDataGenerator; public class JavaRidgeRegressionSuite implements Serializable { private transient JavaSparkContext sc; diff --git a/mllib/src/test/scala/spark/mllib/classification/LogisticRegressionSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/classification/LogisticRegressionSuite.scala index bd87c528c3..34c67294e9 100644 --- a/mllib/src/test/scala/spark/mllib/classification/LogisticRegressionSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/classification/LogisticRegressionSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.classification +package org.apache.spark.mllib.classification import scala.util.Random import scala.collection.JavaConversions._ @@ -24,8 +24,8 @@ import org.scalatest.BeforeAndAfterAll import org.scalatest.FunSuite import org.scalatest.matchers.ShouldMatchers -import spark.SparkContext -import spark.mllib.regression._ +import org.apache.spark.SparkContext +import org.apache.spark.mllib.regression._ object LogisticRegressionSuite { diff --git a/mllib/src/test/scala/spark/mllib/classification/SVMSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/classification/SVMSuite.scala index 894ae458ad..6a957e3ddc 100644 --- a/mllib/src/test/scala/spark/mllib/classification/SVMSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/classification/SVMSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.classification +package org.apache.spark.mllib.classification import scala.util.Random import scala.math.signum @@ -24,11 +24,11 @@ import scala.collection.JavaConversions._ import org.scalatest.BeforeAndAfterAll import org.scalatest.FunSuite -import spark.SparkContext -import spark.mllib.regression._ - import org.jblas.DoubleMatrix +import org.apache.spark.{SparkException, SparkContext} +import org.apache.spark.mllib.regression._ + object SVMSuite { def generateSVMInputAsList( @@ -159,7 +159,7 @@ class SVMSuite extends FunSuite with BeforeAndAfterAll { } } - intercept[spark.SparkException] { + intercept[SparkException] { val model = SVMWithSGD.train(testRDDInvalid, 100) } diff --git a/mllib/src/test/scala/spark/mllib/clustering/KMeansSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/clustering/KMeansSuite.scala index d5d95c8639..94245f6027 100644 --- a/mllib/src/test/scala/spark/mllib/clustering/KMeansSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/clustering/KMeansSuite.scala @@ -15,15 +15,15 @@ * limitations under the License. */ -package spark.mllib.clustering +package org.apache.spark.mllib.clustering import scala.util.Random import org.scalatest.BeforeAndAfterAll import org.scalatest.FunSuite -import spark.SparkContext -import spark.SparkContext._ +import org.apache.spark.SparkContext +import org.apache.spark.SparkContext._ import org.jblas._ diff --git a/mllib/src/test/scala/spark/mllib/recommendation/ALSSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/recommendation/ALSSuite.scala index 15a60efda6..347ef238f4 100644 --- a/mllib/src/test/scala/spark/mllib/recommendation/ALSSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/recommendation/ALSSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.recommendation +package org.apache.spark.mllib.recommendation import scala.collection.JavaConversions._ import scala.util.Random @@ -23,8 +23,8 @@ import scala.util.Random import org.scalatest.BeforeAndAfterAll import org.scalatest.FunSuite -import spark.SparkContext -import spark.SparkContext._ +import org.apache.spark.SparkContext +import org.apache.spark.SparkContext._ import org.jblas._ diff --git a/mllib/src/test/scala/spark/mllib/regression/LassoSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/regression/LassoSuite.scala index 622dbbab7f..db980c7bae 100644 --- a/mllib/src/test/scala/spark/mllib/regression/LassoSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/regression/LassoSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression import scala.collection.JavaConversions._ import scala.util.Random @@ -23,8 +23,8 @@ import scala.util.Random import org.scalatest.BeforeAndAfterAll import org.scalatest.FunSuite -import spark.SparkContext -import spark.mllib.util.LinearDataGenerator +import org.apache.spark.SparkContext +import org.apache.spark.mllib.util.LinearDataGenerator class LassoSuite extends FunSuite with BeforeAndAfterAll { diff --git a/mllib/src/test/scala/spark/mllib/regression/LinearRegressionSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/regression/LinearRegressionSuite.scala index acc48a3283..ef500c704c 100644 --- a/mllib/src/test/scala/spark/mllib/regression/LinearRegressionSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/regression/LinearRegressionSuite.scala @@ -15,14 +15,14 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression import org.scalatest.BeforeAndAfterAll import org.scalatest.FunSuite -import spark.SparkContext -import spark.SparkContext._ -import spark.mllib.util.LinearDataGenerator +import org.apache.spark.SparkContext +import org.apache.spark.SparkContext._ +import org.apache.spark.mllib.util.LinearDataGenerator class LinearRegressionSuite extends FunSuite with BeforeAndAfterAll { @transient private var sc: SparkContext = _ diff --git a/mllib/src/test/scala/spark/mllib/regression/RidgeRegressionSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/regression/RidgeRegressionSuite.scala index c482035706..c18092d804 100644 --- a/mllib/src/test/scala/spark/mllib/regression/RidgeRegressionSuite.scala +++ b/mllib/src/test/scala/org/apache/spark/mllib/regression/RidgeRegressionSuite.scala @@ -15,7 +15,7 @@ * limitations under the License. */ -package spark.mllib.regression +package org.apache.spark.mllib.regression import scala.collection.JavaConversions._ import scala.util.Random @@ -24,9 +24,9 @@ import org.jblas.DoubleMatrix import org.scalatest.BeforeAndAfterAll import org.scalatest.FunSuite -import spark.SparkContext -import spark.SparkContext._ -import spark.mllib.util.LinearDataGenerator +import org.apache.spark.SparkContext +import org.apache.spark.SparkContext._ +import org.apache.spark.mllib.util.LinearDataGenerator class RidgeRegressionSuite extends FunSuite with BeforeAndAfterAll { @transient private var sc: SparkContext = _ |