You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sm...@apache.org on 2016/03/28 01:22:11 UTC
mahout git commit: NoJira: Minor fixes for style,
closes apache/mahout#205
Repository: mahout
Updated Branches:
refs/heads/flink-binding b67398f93 -> 99c32f2d9
NoJira: Minor fixes for style, closes apache/mahout#205
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/99c32f2d
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/99c32f2d
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/99c32f2d
Branch: refs/heads/flink-binding
Commit: 99c32f2d9008e1a48c52183c638792bdbd4766f4
Parents: b67398f
Author: smarthi <sm...@apache.org>
Authored: Sun Mar 27 19:21:45 2016 -0400
Committer: smarthi <sm...@apache.org>
Committed: Sun Mar 27 19:21:45 2016 -0400
----------------------------------------------------------------------
.../scala/org/apache/mahout/flinkbindings/blas/FlinkOpAx.scala | 3 +--
h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java | 2 +-
.../scala/org/apache/mahout/math/scalabindings/RLikeOps.scala | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/99c32f2d/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpAx.scala
----------------------------------------------------------------------
diff --git a/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpAx.scala b/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpAx.scala
index 8a333c4..fa649fb 100644
--- a/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpAx.scala
+++ b/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpAx.scala
@@ -32,7 +32,6 @@ import org.apache.mahout.math.scalabindings.RLikeOps._
import org.apache.mahout.math.scalabindings._
import org.apache.mahout.math.{Matrix, Vector}
-
/**
* Implementation is taken from Spark's Ax
* https://github.com/apache/mahout/blob/master/spark/src/main/scala/org/apache/mahout/sparkbindings/blas/Ax.scala
@@ -83,7 +82,7 @@ object FlinkOpAx {
.reduce(_ += _)
// collect result
- .collect()(0)
+ .collect().head
// Convert back to mtx
.toColMatrix
http://git-wip-us.apache.org/repos/asf/mahout/blob/99c32f2d/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java
----------------------------------------------------------------------
diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java
index 3775708..c78e871 100644
--- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java
+++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java
@@ -43,7 +43,7 @@ public class Atx {
*/
public static H2ODrm exec(H2ODrm drmA, Vector x) {
Frame A = drmA.frame;
- final H2OBCast<Vector> bx = new H2OBCast<Vector>(x);
+ final H2OBCast<Vector> bx = new H2OBCast<>(x);
// A'x is computed into atx[] with an MRTask on A (with
// x available as a Broadcast
http://git-wip-us.apache.org/repos/asf/mahout/blob/99c32f2d/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeOps.scala
----------------------------------------------------------------------
diff --git a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeOps.scala
index e10a01b..a6f9f5b 100644
--- a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeOps.scala
+++ b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeOps.scala
@@ -17,7 +17,7 @@
package org.apache.mahout.math.scalabindings
-import org.apache.mahout.math.{Vector, MatrixTimesOps, Matrix}
+import org.apache.mahout.math.{Vector, Matrix}
/**
* R-like operators. Declare <code>import RLikeOps._</code> to enable.