You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2016/07/27 17:37:28 UTC
[2/2] incubator-systemml git commit: [SYSTEMML-766] Fix axpy runtime
operators (missing double-int support)
[SYSTEMML-766] Fix axpy runtime operators (missing double-int support)
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/97b13660
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/97b13660
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/97b13660
Branch: refs/heads/master
Commit: 97b136601d1fdd4d19cfccdf53b66131b2b03513
Parents: ca4fb97
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Tue Jul 26 20:41:26 2016 -0700
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Tue Jul 26 20:41:26 2016 -0700
----------------------------------------------------------------------
.../runtime/functionobjects/MinusMultiply.java | 17 ++++++++++++++++-
.../runtime/functionobjects/PlusMultiply.java | 17 ++++++++++++++++-
2 files changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/97b13660/src/main/java/org/apache/sysml/runtime/functionobjects/MinusMultiply.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/functionobjects/MinusMultiply.java b/src/main/java/org/apache/sysml/runtime/functionobjects/MinusMultiply.java
index 2036cf6..1d90b44 100644
--- a/src/main/java/org/apache/sysml/runtime/functionobjects/MinusMultiply.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/MinusMultiply.java
@@ -42,6 +42,21 @@ public class MinusMultiply extends ValueFunctionWithConstant implements Serializ
@Override
public double execute(double in1, double in2) {
- return in1 - _constant*in2;
+ return in1 - _constant * in2;
+ }
+
+ @Override
+ public double execute(double in1, long in2) {
+ return in1 - _constant * in2;
+ }
+
+ @Override
+ public double execute(long in1, double in2) {
+ return in1 - _constant * in2;
+ }
+
+ @Override
+ public double execute(long in1, long in2) {
+ return in1 - _constant * in2;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/97b13660/src/main/java/org/apache/sysml/runtime/functionobjects/PlusMultiply.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/functionobjects/PlusMultiply.java b/src/main/java/org/apache/sysml/runtime/functionobjects/PlusMultiply.java
index 2a1eea0..9d1a746 100644
--- a/src/main/java/org/apache/sysml/runtime/functionobjects/PlusMultiply.java
+++ b/src/main/java/org/apache/sysml/runtime/functionobjects/PlusMultiply.java
@@ -42,6 +42,21 @@ public class PlusMultiply extends ValueFunctionWithConstant implements Serializa
@Override
public double execute(double in1, double in2) {
- return in1 + _constant*in2;
+ return in1 + _constant * in2;
+ }
+
+ @Override
+ public double execute(double in1, long in2) {
+ return in1 + _constant * in2;
+ }
+
+ @Override
+ public double execute(long in1, double in2) {
+ return in1 + _constant * in2;
+ }
+
+ @Override
+ public double execute(long in1, long in2) {
+ return in1 + _constant * in2;
}
}