aboutsummaryrefslogtreecommitdiff
path: root/mllib
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-10-09 10:32:42 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-10-09 10:32:42 -0700
commit7d50f9f87baeb1f4b8d77d669d25649b97dd1d57 (patch)
tree7c5c0602a36fe17feff8d0bb1db6c6f30d756199 /mllib
parent3fe12cc2cab45e08e80f6cc355dc935c3473757a (diff)
parente09f4a9601b18921c309903737d309eab5c6d891 (diff)
downloadspark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.tar.gz
spark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.tar.bz2
spark-7d50f9f87baeb1f4b8d77d669d25649b97dd1d57.zip
Merge pull request #35 from MartinWeindel/scala-2.10
Fixing inconsistencies and warnings on Scala 2.10 branch - scala 2.10 requires Java 1.6 - using newest Scala release: 2.10.3 - resolved maven-scala-plugin warning - fixed various compiler warnings
Diffstat (limited to 'mllib')
-rw-r--r--mllib/src/test/java/org/apache/spark/mllib/clustering/JavaKMeansSuite.java4
-rw-r--r--mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java2
2 files changed, 2 insertions, 4 deletions
diff --git a/mllib/src/test/java/org/apache/spark/mllib/clustering/JavaKMeansSuite.java b/mllib/src/test/java/org/apache/spark/mllib/clustering/JavaKMeansSuite.java
index 32d3934ac1..33b99f4bd3 100644
--- a/mllib/src/test/java/org/apache/spark/mllib/clustering/JavaKMeansSuite.java
+++ b/mllib/src/test/java/org/apache/spark/mllib/clustering/JavaKMeansSuite.java
@@ -77,7 +77,7 @@ public class JavaKMeansSuite implements Serializable {
@Test
public void runKMeansUsingStaticMethods() {
- List<double[]> points = new ArrayList();
+ List<double[]> points = new ArrayList<double[]>();
points.add(new double[]{1.0, 2.0, 6.0});
points.add(new double[]{1.0, 3.0, 0.0});
points.add(new double[]{1.0, 4.0, 6.0});
@@ -94,7 +94,7 @@ public class JavaKMeansSuite implements Serializable {
@Test
public void runKMeansUsingConstructor() {
- List<double[]> points = new ArrayList();
+ List<double[]> points = new ArrayList<double[]>();
points.add(new double[]{1.0, 2.0, 6.0});
points.add(new double[]{1.0, 3.0, 0.0});
points.add(new double[]{1.0, 4.0, 6.0});
diff --git a/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java b/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java
index 3323f6cee2..c474e01188 100644
--- a/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java
+++ b/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java
@@ -20,8 +20,6 @@ package org.apache.spark.mllib.recommendation;
import java.io.Serializable;
import java.util.List;
-import scala.Tuple2;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;