From 21c2d625187577fdcaa6985c4330eae62d2ef567 Mon Sep 17 00:00:00 2001 From: Suneel Marthi Date: Fri, 17 Jul 2015 00:31:31 -0400 Subject: [PATCH] Adding missing in-place operations in the form 5 +=: vec-expr and 5*=: vec-expr or vec *=: vec-expr --- .../org/apache/mahout/math/scalabindings/RLikeVectorOps.scala | 4 ++++ .../org/apache/mahout/math/scalabindings/VectorOps.scala | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala index bf1bb3036e..3a64351c52 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala @@ -31,12 +31,16 @@ class RLikeVectorOps(_v: Vector) extends VectorOps(_v) { /** Elementwise *= */ def *=(that: Vector) = v.assign(that, Functions.MULT) + def *=:(that:Vector) = *=(that) + /** Elementwise /= */ def /=(that: Vector) = v.assign(that, Functions.DIV) /** Elementwise *= */ def *=(that: Double) = v.assign(Functions.MULT, that) + def *=:(that: Double) = *=(that) + /** Elementwise /= */ def /=(that: Double) = v.assign(Functions.DIV, that) diff --git a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala index ef9c494c5f..de1a954bff 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala @@ -101,10 +101,14 @@ class VectorOps(private[scalabindings] val v: Vector) { def +=(that: Vector) = v.assign(that, Functions.PLUS) + def +=:(that: Vector) = +=(that) + def -=(that: Vector) = v.assign(that, Functions.MINUS) def +=(that: Double) = v.assign(Functions.PLUS, that) + def +=:(that: Double) = +=(that) + def -=(that: Double) = +=(-that) def -=:(that: Vector) = v.assign(Functions.NEGATE).assign(that, Functions.PLUS)