diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-09-28 16:19:30 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-09-28 16:19:30 +0200 |
commit | 3d49f155fccfa4fc08882b01e7a6e3a982c55212 (patch) | |
tree | 865d6e301e5fcd3fba248807ff980bcc7e18d41f /searchlib/abi-spec.json | |
parent | 7cfc4fa47828261ee1f839a27a437d8bc49eb26f (diff) |
Fold comparisons into the other operators
Diffstat (limited to 'searchlib/abi-spec.json')
-rw-r--r-- | searchlib/abi-spec.json | 130 |
1 files changed, 56 insertions, 74 deletions
diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json index 7caf5a06032..a4adf92210c 100644 --- a/searchlib/abi-spec.json +++ b/searchlib/abi-spec.json @@ -496,16 +496,22 @@ "public boolean hasDouble()", "public com.yahoo.tensor.Tensor asTensor()", "public com.yahoo.searchlib.rankingexpression.evaluation.Value negate()", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value not()", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value or(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value and(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value greaterEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value greater(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value lessEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value less(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value approx(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value notEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value equal(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value add(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value subtract(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value multiply(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value divide(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value modulo(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value and(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value or(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value not()", "public com.yahoo.searchlib.rankingexpression.evaluation.Value power(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value compare(com.yahoo.searchlib.rankingexpression.rule.TruthOperator, com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value function(com.yahoo.searchlib.rankingexpression.rule.Function, com.yahoo.searchlib.rankingexpression.evaluation.Value)" ], "fields": [] @@ -691,16 +697,22 @@ "public boolean hasDouble()", "public boolean asBoolean()", "public com.yahoo.searchlib.rankingexpression.evaluation.Value negate()", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value not()", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value or(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value and(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value greaterEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value greater(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value lessEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value less(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value approx(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value notEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value equal(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value add(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value subtract(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value multiply(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value divide(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value modulo(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value and(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value or(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value not()", "public com.yahoo.searchlib.rankingexpression.evaluation.Value power(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value compare(com.yahoo.searchlib.rankingexpression.rule.TruthOperator, com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value function(com.yahoo.searchlib.rankingexpression.rule.Function, com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value asMutable()", "public java.lang.String toString()", @@ -723,17 +735,23 @@ "public boolean hasDouble()", "public boolean asBoolean()", "public com.yahoo.searchlib.rankingexpression.evaluation.Value negate()", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value not()", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value or(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value and(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value greaterEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value greater(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value lessEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value less(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value approx(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value notEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public com.yahoo.searchlib.rankingexpression.evaluation.Value equal(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value add(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value subtract(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value multiply(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value divide(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value modulo(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value and(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value or(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value not()", "public com.yahoo.searchlib.rankingexpression.evaluation.Value power(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.tensor.Tensor asTensor()", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value compare(com.yahoo.searchlib.rankingexpression.rule.TruthOperator, com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value function(com.yahoo.searchlib.rankingexpression.rule.Function, com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value asMutable()", "public java.lang.String toString()", @@ -760,16 +778,22 @@ "public abstract boolean hasDouble()", "public abstract boolean asBoolean()", "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value negate()", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value not()", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value or(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value and(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value greaterEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value greater(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value lessEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value less(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value approx(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value notEqual(com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value equal(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value add(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value subtract(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value multiply(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value divide(com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value modulo(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value and(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value or(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value not()", "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value power(com.yahoo.searchlib.rankingexpression.evaluation.Value)", - "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value compare(com.yahoo.searchlib.rankingexpression.rule.TruthOperator, com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value function(com.yahoo.searchlib.rankingexpression.rule.Function, com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public com.yahoo.searchlib.rankingexpression.evaluation.Value freeze()", "public final boolean isFrozen()", @@ -893,7 +917,6 @@ "public final com.yahoo.searchlib.rankingexpression.rule.ExpressionNode expression()", "public final com.yahoo.searchlib.rankingexpression.rule.ExpressionNode arithmeticExpression()", "public final com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator arithmetic()", - "public final com.yahoo.searchlib.rankingexpression.rule.TruthOperator comparator()", "public final com.yahoo.searchlib.rankingexpression.rule.ExpressionNode value()", "public final com.yahoo.searchlib.rankingexpression.rule.IfNode ifExpression()", "public final com.yahoo.searchlib.rankingexpression.rule.ReferenceNode feature()", @@ -1013,13 +1036,13 @@ "public static final int DOLLAR", "public static final int COMMA", "public static final int COLON", - "public static final int LE", - "public static final int LT", - "public static final int EQ", - "public static final int NQ", - "public static final int AQ", - "public static final int GE", - "public static final int GT", + "public static final int GREATEREQUAL", + "public static final int GREATER", + "public static final int LESSEQUAL", + "public static final int LESS", + "public static final int APPROX", + "public static final int NOTEQUAL", + "public static final int EQUAL", "public static final int STRING", "public static final int IF", "public static final int IN", @@ -1246,19 +1269,26 @@ "interfaces": [], "attributes": [ "public", - "abstract", + "final", "enum" ], "methods": [ "public static com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator[] values()", "public static com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator valueOf(java.lang.String)", "public boolean hasPrecedenceOver(com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator)", - "public abstract com.yahoo.searchlib.rankingexpression.evaluation.Value evaluate(com.yahoo.searchlib.rankingexpression.evaluation.Value, com.yahoo.searchlib.rankingexpression.evaluation.Value)", + "public final com.yahoo.searchlib.rankingexpression.evaluation.Value evaluate(com.yahoo.searchlib.rankingexpression.evaluation.Value, com.yahoo.searchlib.rankingexpression.evaluation.Value)", "public java.lang.String toString()" ], "fields": [ "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator OR", "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator AND", + "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator GREATEREQUAL", + "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator GREATER", + "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator LESSEQUAL", + "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator LESS", + "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator APPROX", + "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator NOTEQUAL", + "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator EQUAL", "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator PLUS", "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator MINUS", "public static final enum com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator MULTIPLY", @@ -1280,27 +1310,6 @@ ], "fields": [] }, - "com.yahoo.searchlib.rankingexpression.rule.ComparisonNode": { - "superClass": "com.yahoo.searchlib.rankingexpression.rule.BooleanNode", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>(com.yahoo.searchlib.rankingexpression.rule.ExpressionNode, com.yahoo.searchlib.rankingexpression.rule.TruthOperator, com.yahoo.searchlib.rankingexpression.rule.ExpressionNode)", - "public java.util.List children()", - "public com.yahoo.searchlib.rankingexpression.rule.TruthOperator getOperator()", - "public com.yahoo.searchlib.rankingexpression.rule.ExpressionNode getLeftCondition()", - "public com.yahoo.searchlib.rankingexpression.rule.ExpressionNode getRightCondition()", - "public java.lang.StringBuilder toString(java.lang.StringBuilder, com.yahoo.searchlib.rankingexpression.rule.SerializationContext, java.util.Deque, com.yahoo.searchlib.rankingexpression.rule.CompositeNode)", - "public com.yahoo.tensor.TensorType type(com.yahoo.tensor.evaluation.TypeContext)", - "public com.yahoo.searchlib.rankingexpression.evaluation.Value evaluate(com.yahoo.searchlib.rankingexpression.evaluation.Context)", - "public com.yahoo.searchlib.rankingexpression.rule.ComparisonNode setChildren(java.util.List)", - "public int hashCode()", - "public bridge synthetic com.yahoo.searchlib.rankingexpression.rule.CompositeNode setChildren(java.util.List)" - ], - "fields": [] - }, "com.yahoo.searchlib.rankingexpression.rule.CompositeNode": { "superClass": "com.yahoo.searchlib.rankingexpression.rule.ExpressionNode", "interfaces": [], @@ -1693,32 +1702,5 @@ "public int hashCode()" ], "fields": [] - }, - "com.yahoo.searchlib.rankingexpression.rule.TruthOperator": { - "superClass": "java.lang.Enum", - "interfaces": [ - "java.io.Serializable" - ], - "attributes": [ - "public", - "abstract", - "enum" - ], - "methods": [ - "public static com.yahoo.searchlib.rankingexpression.rule.TruthOperator[] values()", - "public static com.yahoo.searchlib.rankingexpression.rule.TruthOperator valueOf(java.lang.String)", - "public abstract boolean evaluate(double, double)", - "public java.lang.String toString()", - "public static com.yahoo.searchlib.rankingexpression.rule.TruthOperator fromString(java.lang.String)" - ], - "fields": [ - "public static final enum com.yahoo.searchlib.rankingexpression.rule.TruthOperator SMALLER", - "public static final enum com.yahoo.searchlib.rankingexpression.rule.TruthOperator SMALLEREQUAL", - "public static final enum com.yahoo.searchlib.rankingexpression.rule.TruthOperator EQUAL", - "public static final enum com.yahoo.searchlib.rankingexpression.rule.TruthOperator APPROX_EQUAL", - "public static final enum com.yahoo.searchlib.rankingexpression.rule.TruthOperator LARGER", - "public static final enum com.yahoo.searchlib.rankingexpression.rule.TruthOperator LARGEREQUAL", - "public static final enum com.yahoo.searchlib.rankingexpression.rule.TruthOperator NOTEQUAL" - ] } }
\ No newline at end of file |