Revert "Lesters/add relu function"

3 files changed, 18 insertions, 26 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/Function.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/Function.java
index 0bdd02c85b5..ecd8182a108 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/Function.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/Function.java
@@ -29,8 +29,6 @@ public enum Function implements Serializable {
     fabs      { public double evaluate(double x, double y) { return abs(x); } },
     floor     { public double evaluate(double x, double y) { return floor(x); } },
     isNan     { public double evaluate(double x, double y) { return Double.isNaN(x) ? 1.0 : 0.0; } },
-    relu      { public double evaluate(double x, double y) { return max(x,0); } },
-    sigmoid   { public double evaluate(double x, double y) { return 1.0 / (1.0 + exp(-1.0 * x)); } },
     atan2(2)  { public double evaluate(double x, double y) { return atan2(x,y); } },
     pow(2)    { public double evaluate(double x, double y) { return pow(x,y); } },
     ldexp(2)  { public double evaluate(double x, double y) { return x*pow(2,y); } },
@@ -54,4 +52,4 @@ public enum Function implements Serializable {
     /** Returns the number of arguments this function takes */
     public int arity() { return arity; }
 
-}
+}
\ No newline at end of file
diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj
index 78ad665c414..40dc31f13ae 100755
--- a/searchlib/src/main/javacc/RankingExpressionParser.jj
+++ b/searchlib/src/main/javacc/RankingExpressionParser.jj
@@ -103,8 +103,6 @@ TOKEN :
     <IN: "in"> |
     <SUM: "sum"> |
     <MATCH: "match"> |
-    <RELU: "relu"> |
-    <SIGMOID: "sigmoid"> |
     <IDENTIFIER: (["A"-"Z","a"-"z","0"-"9","_","@"](["A"-"Z","a"-"z","0"-"9","_","@","$"])*)>
 }
 
@@ -338,25 +336,23 @@ String tensorFunctionName() :
 
 Function unaryFunctionName() : { }
 {
-    <COS>     { return Function.cos;     } |
-    <SIN>     { return Function.sin;     } |
-    <TAN>     { return Function.tan;     } |
-    <COSH>    { return Function.cosh;    } |
-    <SINH>    { return Function.sinh;    } |
-    <TANH>    { return Function.tanh;    } |
-    <ACOS>    { return Function.acos;    } |
-    <ASIN>    { return Function.asin;    } |
-    <ATAN>    { return Function.atan;    } |
-    <EXP>     { return Function.exp;     } |
-    <LOG10>   { return Function.log10;   } |
-    <LOG>     { return Function.log;     } |
-    <SQRT>    { return Function.sqrt;    } |
-    <CEIL>    { return Function.ceil;    } |
-    <FABS>    { return Function.fabs;    } |
-    <FLOOR>   { return Function.floor;   } |
-    <ISNAN>   { return Function.isNan;   } |
-    <RELU>    { return Function.relu;    } |
-    <SIGMOID> { return Function.sigmoid; }
+    <COS>   { return Function.cos;   } |
+    <SIN>   { return Function.sin;   } |
+    <TAN>   { return Function.tan;   } |
+    <COSH>  { return Function.cosh;  } |
+    <SINH>  { return Function.sinh;  } |
+    <TANH>  { return Function.tanh;  } |
+    <ACOS>  { return Function.acos;  } |
+    <ASIN>  { return Function.asin;  } |
+    <ATAN>  { return Function.atan;  } |
+    <EXP>   { return Function.exp;   } |
+    <LOG10> { return Function.log10; } |
+    <LOG>   { return Function.log;   } |
+    <SQRT>  { return Function.sqrt;  } |
+    <CEIL>  { return Function.ceil;  } |
+    <FABS>  { return Function.fabs;  } |
+    <FLOOR> { return Function.floor; } |
+    <ISNAN> { return Function.isNan; }
 }
 
 Function binaryFunctionName() : { }
diff --git a/searchlib/src/tests/rankingexpression/rankingexpressionlist b/searchlib/src/tests/rankingexpression/rankingexpressionlist
index 327f2b161cd..2ff1350025b 100644
--- a/searchlib/src/tests/rankingexpression/rankingexpressionlist
+++ b/searchlib/src/tests/rankingexpression/rankingexpressionlist
@@ -84,8 +84,6 @@ sqrt(10)
 ceil(10)
 fabs(10)
 floor(10)
-relu(10)
-sigmoid(10)
 atan2(10, 20); atan2(10,20)
 ldexp(10, 20); ldexp(10,20)
 pow(10, 20); pow(10,20)