Use MappedTensor to represent tensor with no dimensions or values

5 files changed, 20 insertions, 16 deletions

diff --git a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
index 3f7f02c6c00..01d1e6fc602 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
@@ -21,19 +21,6 @@ public class IndexedTensorTestCase {
     private final int zSize = 5;
 
     @Test
-    public void testEmpty() {
-        Tensor empty = Tensor.Builder.of(TensorType.empty).build();
-        assertTrue(empty instanceof IndexedTensor);
-        assertTrue(empty.isEmpty());
-        assertEquals("{}", empty.toString());
-        Tensor emptyFromString = Tensor.from(TensorType.empty, "{}");
-        assertEquals("{}", Tensor.from(TensorType.empty, "{}").toString());
-        assertTrue(emptyFromString.isEmpty());
-        assertTrue(emptyFromString instanceof IndexedTensor);
-        assertEquals(empty, emptyFromString);
-    }
-    
-    @Test
     public void testSingleValue() {
         Tensor singleValue = Tensor.Builder.of(TensorType.empty).cell(TensorAddress.empty, 3.5).build();
         assertTrue(singleValue instanceof IndexedTensor);
@@ -91,7 +78,7 @@ public class IndexedTensorTestCase {
                         for (int z = 0; z < zSize; z++)
                             builder.cell(value(v, w, x, y, z), v, w, x, y, z);
 
-        IndexedTensor tensor = builder.build();
+        IndexedTensor tensor = (IndexedTensor)builder.build();
 
         // Lookup by index arguments
         for (int v = 0; v < vSize; v++)
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java
index 4c32a80dc11..a2df146c8e1 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/MappedTensorTestCase.java
@@ -2,6 +2,7 @@
 package com.yahoo.tensor;
 
 import com.google.common.collect.Sets;
+import junit.framework.TestCase;
 import org.junit.Test;
 
 import java.util.Set;
@@ -18,6 +19,19 @@ import static org.junit.Assert.fail;
 public class MappedTensorTestCase {
 
     @Test
+    public void testEmpty() {
+        Tensor empty = Tensor.Builder.of(TensorType.empty).build();
+        TestCase.assertTrue(empty instanceof MappedTensor);
+        TestCase.assertTrue(empty.isEmpty());
+        assertEquals("{}", empty.toString());
+        Tensor emptyFromString = Tensor.from(TensorType.empty, "{}");
+        assertEquals("{}", Tensor.from(TensorType.empty, "{}").toString());
+        TestCase.assertTrue(emptyFromString.isEmpty());
+        TestCase.assertTrue(emptyFromString instanceof MappedTensor);
+        assertEquals(empty, emptyFromString);
+    }
+
+    @Test
     public void testOneDimensionalBuilding() {
         TensorType type = new TensorType.Builder().mapped("x").build();
         Tensor tensor = Tensor.Builder.of(type).
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
index feeba1a7a10..e649d3cde2a 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/TensorTestCase.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
- * Tests Tensor functionality
+ * Tests tensor functionality
  * 
  * @author bratseth
  */
@@ -30,6 +30,9 @@ public class TensorTestCase {
     @Test
     public void testStringForm() {
         assertEquals("{}", Tensor.from("{}").toString());
+        assertTrue(Tensor.from("{}") instanceof MappedTensor);
+        assertEquals("{5.7}", Tensor.from("{5.7}").toString());
+        assertTrue(Tensor.from("{5.7}") instanceof IndexedTensor);
         assertEquals("{{d1:l1,d2:l1}:5.0,{d1:l1,d2:l2}:6.0}", Tensor.from("{ {d1:l1,d2:l1}: 5,   {d2:l2, d1:l1}:6.0} ").toString());
         assertEquals("{{d1:l1,d2:l1}:-5.3,{d1:l1,d2:l2}:0.0}", Tensor.from("{ {d1:l1,d2:l1}:-5.3, {d2:l2, d1:l1}:0}").toString());
     }
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java
index 697eb2a7329..d2b2044f3ed 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/DenseBinaryFormatTestCase.java
@@ -20,7 +20,6 @@ public class DenseBinaryFormatTestCase {
 
     @Test
     public void testSerialization() {
-        assertSerialization("{}");
         assertSerialization("{-5.37}");
         assertSerialization("tensor(x[]):{{x:0}:2.0}");
         assertSerialization("tensor(x[],y[]):{{x:0,y:0}:2.0}");
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java
index b314fe06f08..283aa90cf65 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SparseBinaryFormatTestCase.java
@@ -19,6 +19,7 @@ public class SparseBinaryFormatTestCase {
 
     @Test
     public void testSerialization() {
+        assertSerialization("tensor(x{}):{}");
         assertSerialization("tensor(x{}):{{x:0}:2.0}");
         assertSerialization("tensor(dimX{},dimY{}):{{dimX:labelA,dimY:labelB}:2.0,{dimY:labelC,dimX:labelD}:3.0}");
         assertSerialization("tensor(x{},y{}):{{x:0,y:1}:2.0}");