Indexed tensor implementation

4 files changed, 10 insertions, 12 deletions

diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
index fe9aa34ac3d..413d1581e58 100644
--- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
@@ -9,7 +9,7 @@ import com.yahoo.document.update.AssignValueUpdate;
 import com.yahoo.document.update.FieldUpdate;
 import com.yahoo.document.update.ValueUpdate;
 import com.yahoo.io.GrowableByteBuffer;
-import com.yahoo.tensor.MapTensor;
+import com.yahoo.tensor.Tensor;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -17,11 +17,10 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-
 /**
  * Tests applying and serializing document updates.
  *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class DocumentUpdateTestCase extends junit.framework.TestCase {
     DocumentTypeManager docMan;
@@ -620,7 +619,7 @@ public class DocumentUpdateTestCase extends junit.framework.TestCase {
     }
 
     private static TensorFieldValue createTensorFieldValue(String tensor) {
-        return new TensorFieldValue(MapTensor.from(tensor));
+        return new TensorFieldValue(Tensor.from(tensor));
     }
 
     private DocumentUpdate createTensorAssignUpdate() {
diff --git a/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java
index 3b9cac85634..80386141968 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/TensorFieldValueTestCase.java
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.document.datatypes;
 
-import com.yahoo.tensor.MapTensor;
 import com.yahoo.tensor.Tensor;
 import org.junit.Test;
 
@@ -15,7 +14,7 @@ import static org.junit.Assert.assertTrue;
 public class TensorFieldValueTestCase {
 
     private static TensorFieldValue createFieldValue(String tensor) {
-        return new TensorFieldValue(MapTensor.from(tensor));
+        return new TensorFieldValue(Tensor.from(tensor));
     }
 
     @Test
@@ -33,7 +32,7 @@ public class TensorFieldValueTestCase {
 
     @Test
     public void requireThatSameTensorValueIsEqual() {
-        Tensor tensor = MapTensor.from("{{x:0}:2.0}");
+        Tensor tensor = Tensor.from("{{x:0}:2.0}");
         TensorFieldValue lhs = new TensorFieldValue(tensor);
         TensorFieldValue rhs = new TensorFieldValue(tensor);
         assertTrue(lhs.equals(lhs));
diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
index 2c455658528..6c46f743332 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
@@ -37,7 +37,7 @@ import com.yahoo.document.update.ClearValueUpdate;
 import com.yahoo.document.update.FieldUpdate;
 import com.yahoo.document.update.MapValueUpdate;
 import com.yahoo.document.update.ValueUpdate;
-import com.yahoo.tensor.MapTensor;
+import com.yahoo.tensor.Tensor;
 import com.yahoo.text.Utf8;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.After;
@@ -1218,7 +1218,7 @@ public class JsonReaderTestCase {
         assertEquals("testtensor", doc.getId().getDocType());
         assertEquals(TENSOR_DOC_ID, doc.getId().toString());
         TensorFieldValue fieldValue = (TensorFieldValue)doc.getFieldValue(doc.getField("tensorfield"));
-        assertEquals(MapTensor.from(expectedTensor), fieldValue.getTensor().get());
+        assertEquals(Tensor.from(expectedTensor), fieldValue.getTensor().get());
     }
 
     private static void assertTensorAssignUpdate(String expectedTensor, DocumentUpdate update) {
@@ -1226,7 +1226,7 @@ public class JsonReaderTestCase {
         assertEquals(TENSOR_DOC_ID, update.getId().toString());
         AssignValueUpdate assignUpdate = (AssignValueUpdate) getTensorField(update).getValueUpdate(0);
         TensorFieldValue fieldValue = (TensorFieldValue) assignUpdate.getValue();
-        assertEquals(MapTensor.from(expectedTensor), fieldValue.getTensor().get());
+        assertEquals(Tensor.from(expectedTensor), fieldValue.getTensor().get());
     }
 
     private static FieldUpdate getTensorField(DocumentUpdate update) {
diff --git a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
index a170e388896..22cb35ae937 100644
--- a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
@@ -5,7 +5,7 @@ import com.yahoo.document.DataType;
 import com.yahoo.document.Document;
 import com.yahoo.document.DocumentType;
 import com.yahoo.document.datatypes.TensorFieldValue;
-import com.yahoo.tensor.MapTensor;
+import com.yahoo.tensor.Tensor;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -61,7 +61,7 @@ public class TensorFieldValueSerializationTestCase {
     }
 
     private static TensorFieldValue createTensor(String tensor) {
-        return new TensorFieldValue(MapTensor.from(tensor));
+        return new TensorFieldValue(Tensor.from(tensor));
     }
 
 }