Skip to content

Commit c16821b

Browse files
committed
Small fixes based on code review.
1 parent d955581 commit c16821b

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

mllib/src/main/scala/org/apache/spark/mllib/clustering/LDAModel.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,7 @@ class DistributedLDAModel private (
348348

349349
/** Java-friendly version of [[topicDistributions]] */
350350
def javaTopicDistributions: JavaPairRDD[java.lang.Long, Vector] = {
351-
new JavaPairRDD[java.lang.Long, Vector](
352-
topicDistributions.asInstanceOf[RDD[(java.lang.Long, Vector)]])
351+
JavaPairRDD.fromRDD(topicDistributions.asInstanceOf[RDD[(java.lang.Long, Vector)]])
353352
}
354353

355354
// TODO:

mllib/src/main/scala/org/apache/spark/mllib/stat/Statistics.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ object Statistics {
101101
*/
102102
def corr(x: RDD[Double], y: RDD[Double], method: String): Double = Correlations.corr(x, y, method)
103103

104+
/** Java-friendly version of [[corr()]] */
104105
def corr(x: JavaRDD[java.lang.Double], y: JavaRDD[java.lang.Double], method: String): Double =
105106
corr(x.rdd.asInstanceOf[RDD[Double]], y.rdd.asInstanceOf[RDD[Double]], method)
106107

mllib/src/test/java/org/apache/spark/ml/param/JavaParamsSuite.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void testParams() {
5050
testParams.setMyIntParam(2).setMyDoubleParam(0.4).setMyStringParam("a");
5151
Assert.assertEquals(testParams.getMyDoubleParam(), 0.4, 0.0);
5252
Assert.assertEquals(testParams.getMyStringParam(), "a");
53-
Assert.assertArrayEquals(testParams.getMyDoubleArrayParam(), new double[]{1.0, 2.0}, 0.0);
53+
Assert.assertArrayEquals(testParams.getMyDoubleArrayParam(), new double[] {1.0, 2.0}, 0.0);
5454
}
5555

5656
@Test

mllib/src/test/java/org/apache/spark/ml/param/JavaTestParams.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ public String uid() {
5151
public int getMyIntParam() { return (Integer)getOrDefault(myIntParam_); }
5252

5353
public JavaTestParams setMyIntParam(int value) {
54-
set(myIntParam_, value); return this;
54+
set(myIntParam_, value);
55+
return this;
5556
}
5657

5758
private DoubleParam myDoubleParam_;
@@ -60,7 +61,8 @@ public JavaTestParams setMyIntParam(int value) {
6061
public double getMyDoubleParam() { return (Double)getOrDefault(myDoubleParam_); }
6162

6263
public JavaTestParams setMyDoubleParam(double value) {
63-
set(myDoubleParam_, value); return this;
64+
set(myDoubleParam_, value);
65+
return this;
6466
}
6567

6668
private Param<String> myStringParam_;
@@ -69,7 +71,8 @@ public JavaTestParams setMyDoubleParam(double value) {
6971
public String getMyStringParam() { return getOrDefault(myStringParam_); }
7072

7173
public JavaTestParams setMyStringParam(String value) {
72-
set(myStringParam_, value); return this;
74+
set(myStringParam_, value);
75+
return this;
7376
}
7477

7578
private DoubleArrayParam myDoubleArrayParam_;
@@ -78,12 +81,12 @@ public JavaTestParams setMyStringParam(String value) {
7881
public double[] getMyDoubleArrayParam() { return getOrDefault(myDoubleArrayParam_); }
7982

8083
public JavaTestParams setMyDoubleArrayParam(double[] value) {
81-
set(myDoubleArrayParam_, value); return this;
84+
set(myDoubleArrayParam_, value);
85+
return this;
8286
}
8387

8488
private void init() {
85-
myIntParam_ = new IntParam(this, "myIntParam", "this is an int param",
86-
ParamValidators.gt(0));
89+
myIntParam_ = new IntParam(this, "myIntParam", "this is an int param", ParamValidators.gt(0));
8790
myDoubleParam_ = new DoubleParam(this, "myDoubleParam", "this is a double param",
8891
ParamValidators.inRange(0.0, 1.0));
8992
List<String> validStrings = Lists.newArrayList("a", "b");
@@ -92,11 +95,11 @@ private void init() {
9295
myDoubleArrayParam_ =
9396
new DoubleArrayParam(this, "myDoubleArrayParam", "this is a double param");
9497

95-
setDefault(myIntParam_, 1);
96-
setDefault(myIntParam_.w(1));
97-
setDefault(myDoubleParam_, 0.5);
98+
setDefault(myIntParam(), 1);
99+
setDefault(myIntParam().w(1));
100+
setDefault(myDoubleParam(), 0.5);
98101
setDefault(myIntParam().w(1), myDoubleParam().w(0.5));
99-
setDefault(myDoubleArrayParam_, new double[]{1.0, 2.0});
100-
setDefault(myDoubleArrayParam_.w(new double[]{1.0, 2.0}));
102+
setDefault(myDoubleArrayParam(), new double[] {1.0, 2.0});
103+
setDefault(myDoubleArrayParam().w(new double[] {1.0, 2.0}));
101104
}
102105
}

mllib/src/test/java/org/apache/spark/mllib/stat/JavaStatisticsSuite.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void tearDown() {
4444
}
4545

4646
@Test
47-
public void runStatisticsUsingStaticMethods() {
47+
public void testCorr() {
4848
JavaRDD<Double> x = sc.parallelize(Lists.newArrayList(1.0, 2.0, 3.0, 4.0));
4949
JavaRDD<Double> y = sc.parallelize(Lists.newArrayList(1.1, 2.2, 3.1, 4.3));
5050

0 commit comments

Comments
 (0)