diff options
-rw-r--r-- | searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/OperationMapper.java | 2 | ||||
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/OperationMapper.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/OperationMapper.java index 6236433b43a..f77699e8f9e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/OperationMapper.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/integration/tensorflow/OperationMapper.java @@ -397,7 +397,7 @@ class OperationMapper { TensorFunction xCond = new Join(x.function(), conditionFunction.function(), ScalarFunctions.multiply()); TensorFunction yCond = new Join(y.function(), conditionFunction.function(), new DoubleBinaryOperator() { @Override public double applyAsDouble(double a, double b) { return a * (1.0 - b); } - @Override public String toString() { return "f(a,b)(a * (1-b)"; } + @Override public String toString() { return "f(a,b)(a * (1-b))"; } }); TensorFunction outputFunction = new Join(xCond, yCond, ScalarFunctions.add()); diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java index da473941463..15d4dfc1d00 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/ScalarFunctions.java @@ -64,14 +64,14 @@ public class ScalarFunctions { @Override public double applyAsDouble(double left, double right) { return Math.max(left, right); } @Override - public String toString() { return "f(a,b)(max(a, b)"; } + public String toString() { return "f(a,b)(max(a, b))"; } } public static class Min implements DoubleBinaryOperator { @Override public double applyAsDouble(double left, double right) { return Math.min(left, right); } @Override - public String toString() { return "f(a,b)(min(a, b)"; } + public String toString() { return "f(a,b)(min(a, b))"; } } public static class Multiply implements DoubleBinaryOperator { @@ -140,7 +140,7 @@ public class ScalarFunctions { @Override public double applyAsDouble(double operand) { return scale * (operand >= 0.0 ? operand : alpha * (Math.exp(operand)-1)); } @Override - public String toString() { return String.format("f(a)(%f * if(a >= 0, a, %f*(exp(a)-1))", scale, alpha); } + public String toString() { return String.format("f(a)(%f * if(a >= 0, a, %f*(exp(a)-1)))", scale, alpha); } } public static class Rsqrt implements DoubleUnaryOperator { |