Indexed tensor implementation

2 files changed, 3 insertions, 2 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/TensorValue.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/TensorValue.java
index e162ba4b299..29393917500 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/TensorValue.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/TensorValue.java
@@ -38,7 +38,7 @@ public class TensorValue extends Value {
     @Override
     public double asDouble() {
         if (hasDouble())
-            return value.get(TensorAddress.empty);
+            return value.cells().get(TensorAddress.empty);
         throw new UnsupportedOperationException("Requires a double value, but " + this.value + " cannot be " +
                                                 "used as a double");
     }
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java
index 8ce18265231..7853d595659 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/evaluation/Value.java
@@ -5,6 +5,7 @@ import com.yahoo.javacc.UnicodeUtilities;
 import com.yahoo.searchlib.rankingexpression.rule.Function;
 import com.yahoo.searchlib.rankingexpression.rule.TruthOperator;
 import com.yahoo.tensor.MapTensor;
+import com.yahoo.tensor.Tensor;
 
 /**
  * The result of a ranking expression evaluation.
@@ -87,7 +88,7 @@ public abstract class Value {
         else if (value.startsWith("\"") || value.startsWith("'"))
             return new StringValue(UnicodeUtilities.unquote(value));
         else if (value.startsWith("{"))
-            return new TensorValue(MapTensor.from(value));
+            return new TensorValue(Tensor.from(value));
         else
             return new DoubleValue(Double.parseDouble(value));
     }