Add a class for assist efficient traversal of dimensions in an IndexedTensor.

1 files changed, 33 insertions, 0 deletions

diff --git a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
index 0a6c821e64e..d145ad7a316 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java
@@ -9,6 +9,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -96,6 +97,38 @@ public class IndexedTensorTestCase {
     }
 
     @Test
+    public void testDirectIndexedAddress() {
+        TensorType type = new TensorType.Builder().indexed("v", 3)
+                .indexed("w", wSize)
+                .indexed("x", xSize)
+                .indexed("y", ySize)
+                .indexed("z", zSize)
+                .build();
+        var directAddress = DirectIndexedAddress.of(DimensionSizes.of(type));
+        assertThrows(ArrayIndexOutOfBoundsException.class, () -> directAddress.getStride(5));
+        assertThrows(IndexOutOfBoundsException.class, () -> directAddress.setIndex(4, 7));
+        assertEquals(wSize*xSize*ySize*zSize, directAddress.getStride(0));
+        assertEquals(xSize*ySize*zSize, directAddress.getStride(1));
+        assertEquals(ySize*zSize, directAddress.getStride(2));
+        assertEquals(zSize, directAddress.getStride(3));
+        assertEquals(1, directAddress.getStride(4));
+        assertEquals(0, directAddress.getIndex());
+        directAddress.setIndex(0,1);
+        assertEquals(1 * directAddress.getStride(0), directAddress.getIndex());
+        directAddress.setIndex(1,1);
+        assertEquals(1 * directAddress.getStride(0) + 1 * directAddress.getStride(1), directAddress.getIndex());
+        directAddress.setIndex(2,2);
+        directAddress.setIndex(3,2);
+        directAddress.setIndex(4,2);
+        long expected = 1 * directAddress.getStride(0) +
+                1 * directAddress.getStride(1) +
+                2 * directAddress.getStride(2) +
+                2 * directAddress.getStride(3) +
+                2 * directAddress.getStride(4);
+        assertEquals(expected, directAddress.getIndex());
+    }
+
+    @Test
     public void testUnboundBuilding() {
         TensorType type = new TensorType.Builder().indexed("w")
                                                   .indexed("v")