diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-11-24 15:40:06 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-11-24 15:40:06 +0100 |
commit | 0114377d53c1e70bba679582abb88cc7af038bc1 (patch) | |
tree | ef7b7c7dc66b3810d8d6b1a0641bdd98fa238c1e /searchlib/src/main/javacc | |
parent | bd6d16ba66a7b6745fc15a8b25dc7120fb5580ab (diff) |
Comparison functions on tensors
Diffstat (limited to 'searchlib/src/main/javacc')
-rwxr-xr-x | searchlib/src/main/javacc/RankingExpressionParser.jj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj index d5f4c67e62a..0fcfdb5d40c 100755 --- a/searchlib/src/main/javacc/RankingExpressionParser.jj +++ b/searchlib/src/main/javacc/RankingExpressionParser.jj @@ -73,6 +73,7 @@ TOKEN : <LE: "<="> | <LT: "<"> | <EQ: "=="> | + <NQ: "!="> | <AQ: "~="> | <GE: ">="> | <GT: ">"> | @@ -110,7 +111,6 @@ TOKEN : <TANH: "tanh"> | <ATAN2: "atan2"> | - <EQUAL: "equal"> | <FMOD: "fmod"> | <LDEXP: "ldexp"> | // MAX @@ -206,6 +206,7 @@ TruthOperator comparator() : { } ( <LE> { return TruthOperator.SMALLEREQUAL; } | <LT> { return TruthOperator.SMALLER; } | <EQ> { return TruthOperator.EQUAL; } | + <NQ> { return TruthOperator.NOTEQUAL; } | <AQ> { return TruthOperator.APPROX_EQUAL; } | <GE> { return TruthOperator.LARGEREQUAL; } | <GT> { return TruthOperator.LARGER; } ) @@ -552,7 +553,6 @@ Function unaryFunctionName() : { } Function binaryFunctionName() : { } { <ATAN2> { return Function.atan2; } | - <EQUAL> { return Function.equal; } | <FMOD> { return Function.fmod; } | <LDEXP> { return Function.ldexp; } | <MAX> { return Function.max; } | |