diff options
| author | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-08-10 18:54:10 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-08-10 18:54:10 -0700 |
| commit | a65a6ed5140446651916aff1761a9a755194eaf4 (patch) | |
| tree | 181508dd67935af1709b23885b166e909540128a /mllib | |
| parent | 2812e722008b772756cbd0ef0600a55b65d6ee0e (diff) | |
| download | spark-a65a6ed5140446651916aff1761a9a755194eaf4.tar.gz spark-a65a6ed5140446651916aff1761a9a755194eaf4.tar.bz2 spark-a65a6ed5140446651916aff1761a9a755194eaf4.zip | |
Fix GLM code review comments and move java tests
Diffstat (limited to 'mllib')
| -rw-r--r-- | mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala | 8 | ||||
| -rw-r--r-- | mllib/src/test/java/spark/mllib/classification/JavaLogisticRegressionSuite.java (renamed from mllib/src/test/scala/spark/mllib/classification/JavaLogisticRegressionSuite.java) | 0 | ||||
| -rw-r--r-- | mllib/src/test/java/spark/mllib/classification/JavaSVMSuite.java (renamed from mllib/src/test/scala/spark/mllib/classification/JavaSVMSuite.java) | 0 | ||||
| -rw-r--r-- | mllib/src/test/java/spark/mllib/regression/JavaLassoSuite.java (renamed from mllib/src/test/scala/spark/mllib/regression/JavaLassoSuite.java) | 0 |
4 files changed, 2 insertions, 6 deletions
diff --git a/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala b/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala index 03a7755541..8ea823b307 100644 --- a/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala +++ b/mllib/src/main/scala/spark/mllib/regression/GeneralizedLinearAlgorithm.scala @@ -65,8 +65,7 @@ abstract class GeneralizedLinearModel(val weights: Array[Double], val intercept: * GeneralizedLinearAlgorithm abstracts out the training for all GLMs. * This class should be extended with an Optimizer to create a new GLM. */ -abstract class GeneralizedLinearAlgorithm[M](implicit - methodEv: M <:< GeneralizedLinearModel) +abstract class GeneralizedLinearAlgorithm[M <: GeneralizedLinearModel] extends Logging with Serializable { val optimizer: Optimizer @@ -89,10 +88,7 @@ abstract class GeneralizedLinearAlgorithm[M](implicit run(input, initialWeights) } - def run( - input: RDD[LabeledPoint], - initialWeights: Array[Double]) - : M = { + def run(input: RDD[LabeledPoint], initialWeights: Array[Double]) : M = { // Add a extra variable consisting of all 1.0's for the intercept. val data = if (addIntercept) { diff --git a/mllib/src/test/scala/spark/mllib/classification/JavaLogisticRegressionSuite.java b/mllib/src/test/java/spark/mllib/classification/JavaLogisticRegressionSuite.java index e0ebd45cd8..e0ebd45cd8 100644 --- a/mllib/src/test/scala/spark/mllib/classification/JavaLogisticRegressionSuite.java +++ b/mllib/src/test/java/spark/mllib/classification/JavaLogisticRegressionSuite.java diff --git a/mllib/src/test/scala/spark/mllib/classification/JavaSVMSuite.java b/mllib/src/test/java/spark/mllib/classification/JavaSVMSuite.java index 7881b3c38f..7881b3c38f 100644 --- a/mllib/src/test/scala/spark/mllib/classification/JavaSVMSuite.java +++ b/mllib/src/test/java/spark/mllib/classification/JavaSVMSuite.java diff --git a/mllib/src/test/scala/spark/mllib/regression/JavaLassoSuite.java b/mllib/src/test/java/spark/mllib/regression/JavaLassoSuite.java index e26d7b385c..e26d7b385c 100644 --- a/mllib/src/test/scala/spark/mllib/regression/JavaLassoSuite.java +++ b/mllib/src/test/java/spark/mllib/regression/JavaLassoSuite.java |