Fold comparisons into the other operators

1 files changed, 50 insertions, 21 deletions

diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyValue.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyValue.java
index 8788eda572d..e0c99706e4a 100644
--- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyValue.java
+++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyValue.java
@@ -4,7 +4,6 @@ package ai.vespa.models.evaluation;
 import com.yahoo.searchlib.rankingexpression.evaluation.Context;
 import com.yahoo.searchlib.rankingexpression.evaluation.Value;
 import com.yahoo.searchlib.rankingexpression.rule.Function;
-import com.yahoo.searchlib.rankingexpression.rule.TruthOperator;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorType;
 
@@ -70,53 +69,83 @@ class LazyValue extends Value {
     }
 
     @Override
-    public Value add(Value value) {
-        return computedValue().add(value);
+    public Value not() {
+        return computedValue().not();
     }
 
     @Override
-    public Value subtract(Value value) {
-        return computedValue().subtract(value);
+    public Value or(Value value) {
+        return computedValue().or(value);
     }
 
     @Override
-    public Value multiply(Value value) {
-        return computedValue().multiply(value);
+    public Value and(Value value) {
+        return computedValue().and(value);
     }
 
     @Override
-    public Value divide(Value value) {
-        return computedValue().divide(value);
+    public Value greaterEqual(Value value) {
+        return computedValue().greaterEqual(value);
     }
 
     @Override
-    public Value modulo(Value value) {
-        return computedValue().modulo(value);
+    public Value greater(Value value) {
+        return computedValue().greater(value);
     }
 
     @Override
-    public Value and(Value value) {
-        return computedValue().and(value);
+    public Value lessEqual(Value value) {
+        return computedValue().lessEqual(value);
     }
 
     @Override
-    public Value or(Value value) {
-        return computedValue().or(value);
+    public Value less(Value value) {
+        return computedValue().less(value);
     }
 
     @Override
-    public Value not() {
-        return computedValue().not();
+    public Value approx(Value value) {
+        return computedValue().approx(value);
     }
 
     @Override
-    public Value power(Value value) {
-        return computedValue().power(value);
+    public Value notEqual(Value value) {
+        return computedValue().notEqual(value);
+    }
+
+    @Override
+    public Value equal(Value value) {
+        return computedValue().equal(value);
     }
 
     @Override
-    public Value compare(TruthOperator operator, Value value) {
-        return computedValue().compare(operator, value);
+    public Value add(Value value) {
+        return computedValue().add(value);
+    }
+
+    @Override
+    public Value subtract(Value value) {
+        return computedValue().subtract(value);
+    }
+
+    @Override
+    public Value multiply(Value value) {
+        return computedValue().multiply(value);
+    }
+
+    @Override
+    public Value divide(Value value) {
+        return computedValue().divide(value);
+    }
+
+    @Override
+    public Value modulo(Value value) {
+        return computedValue().modulo(value);
+    }
+
+    @Override
+    public Value power(Value value) {
+        return computedValue().power(value);
     }
 
     @Override