diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-09-28 17:42:55 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-09-28 17:42:55 +0200 |
commit | bcbb2009c44380055b2670e7cdefcad232f9ece4 (patch) | |
tree | b1f1716e6dcb7cb79dcb9871af21758cf6c0a5c2 /config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java | |
parent | 3d49f155fccfa4fc08882b01e7a6e3a982c55212 (diff) |
Drop 'arithmetic' from name
Diffstat (limited to 'config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java index 2695fa79588..dd714501a41 100644 --- a/config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java +++ b/config-model/src/main/java/com/yahoo/schema/expressiontransforms/TokenTransformer.java @@ -3,8 +3,8 @@ package com.yahoo.schema.expressiontransforms; import com.yahoo.searchlib.rankingexpression.Reference; import com.yahoo.searchlib.rankingexpression.evaluation.DoubleValue; -import com.yahoo.searchlib.rankingexpression.rule.ArithmeticNode; -import com.yahoo.searchlib.rankingexpression.rule.ArithmeticOperator; +import com.yahoo.searchlib.rankingexpression.rule.OperationNode; +import com.yahoo.searchlib.rankingexpression.rule.Operator; import com.yahoo.searchlib.rankingexpression.rule.CompositeNode; import com.yahoo.searchlib.rankingexpression.rule.ConstantNode; import com.yahoo.searchlib.rankingexpression.rule.EmbracedNode; @@ -139,10 +139,10 @@ public class TokenTransformer extends ExpressionTransformer<RankProfileTransform ExpressionNode queryLengthExpr = createLengthExpr(2, tokenSequence); ExpressionNode restLengthExpr = createLengthExpr(tokenSequence.size() - 1, tokenSequence); ExpressionNode expr = new IfNode( - new ArithmeticNode(new ReferenceNode("d1"), ArithmeticOperator.LESS, queryLengthExpr), + new OperationNode(new ReferenceNode("d1"), Operator.LESS, queryLengthExpr), ZERO, new IfNode( - new ArithmeticNode(new ReferenceNode("d1"), ArithmeticOperator.LESS, restLengthExpr), + new OperationNode(new ReferenceNode("d1"), Operator.LESS, restLengthExpr), ONE, ZERO ) @@ -174,7 +174,7 @@ public class TokenTransformer extends ExpressionTransformer<RankProfileTransform List<ExpressionNode> tokenSequence = createTokenSequence(feature); ExpressionNode lengthExpr = createLengthExpr(tokenSequence.size() - 1, tokenSequence); - ArithmeticNode comparison = new ArithmeticNode(new ReferenceNode("d1"), ArithmeticOperator.LESS, lengthExpr); + OperationNode comparison = new OperationNode(new ReferenceNode("d1"), Operator.LESS, lengthExpr); ExpressionNode expr = new IfNode(comparison, ONE, ZERO); return new TensorFunctionNode(Generate.bound(type, wrapScalar(expr))); } @@ -254,7 +254,7 @@ public class TokenTransformer extends ExpressionTransformer<RankProfileTransform */ private ExpressionNode createTokenSequenceExpr(int iter, List<ExpressionNode> sequence) { ExpressionNode lengthExpr = createLengthExpr(iter, sequence); - ArithmeticNode comparison = new ArithmeticNode(new ReferenceNode("d1"), ArithmeticOperator.LESS, lengthExpr); + OperationNode comparison = new OperationNode(new ReferenceNode("d1"), Operator.LESS, lengthExpr); ExpressionNode trueExpr = sequence.get(iter); if (sequence.get(iter) instanceof ReferenceNode) { @@ -278,7 +278,7 @@ public class TokenTransformer extends ExpressionTransformer<RankProfileTransform */ private ExpressionNode createLengthExpr(int iter, List<ExpressionNode> sequence) { List<ExpressionNode> factors = new ArrayList<>(); - List<ArithmeticOperator> operators = new ArrayList<>(); + List<Operator> operators = new ArrayList<>(); for (int i = 0; i < iter + 1; ++i) { if (sequence.get(i) instanceof ConstantNode) { factors.add(ONE); @@ -286,10 +286,10 @@ public class TokenTransformer extends ExpressionTransformer<RankProfileTransform factors.add(new ReferenceNode(lengthFunctionName((ReferenceNode) sequence.get(i)))); } if (i >= 1) { - operators.add(ArithmeticOperator.PLUS); + operators.add(Operator.PLUS); } } - return new ArithmeticNode(factors, operators); + return new OperationNode(factors, operators); } /** @@ -299,7 +299,7 @@ public class TokenTransformer extends ExpressionTransformer<RankProfileTransform ExpressionNode expr; if (iter >= 1) { ExpressionNode lengthExpr = new EmbracedNode(createLengthExpr(iter - 1, sequence)); - expr = new EmbracedNode(new ArithmeticNode(new ReferenceNode("d1"), ArithmeticOperator.MINUS, lengthExpr)); + expr = new EmbracedNode(new OperationNode(new ReferenceNode("d1"), Operator.MINUS, lengthExpr)); } else { expr = new ReferenceNode("d1"); } |