- Extract dimension names in a set to avoid recomputing it in dimensionNames() mathod.

- Also extract some information about what kind of dimensions a tensor has construcion time.
  This avoids streamin through all diemsion later on, and keeps this local in the TensorType.

1 files changed, 8 insertions, 7 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
index 93cdc3f630f..5d384e0329b 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
@@ -164,9 +164,10 @@ public abstract class IndexedTensor implements Tensor {
 
         long valueIndex = 0;
         for (int i = 0; i < address.size(); i++) {
-            if (address.numericLabel(i) >= sizes.size(i))
+            long label = address.numericLabel(i);
+            if (label >= sizes.size(i))
                 throw new IllegalArgumentException(address + " is not within the bounds of " + type);
-            valueIndex += sizes.productOfDimensionsAfter(i) * address.numericLabel(i);
+            valueIndex += sizes.productOfDimensionsAfter(i) * label;
         }
         return valueIndex;
     }
@@ -281,7 +282,7 @@ public abstract class IndexedTensor implements Tensor {
         }
 
         public static Builder of(TensorType type) {
-            if (type.dimensions().stream().allMatch(d -> d instanceof TensorType.IndexedBoundDimension))
+            if (type.hasOnlyIndexedBoundDimensions())
                 return of(type, BoundBuilder.dimensionSizesOf(type));
             else
                 return new UnboundBuilder(type);
@@ -295,7 +296,7 @@ public abstract class IndexedTensor implements Tensor {
          *               must not be further mutated by the caller
          */
         public static Builder of(TensorType type, float[] values) {
-            if (type.dimensions().stream().allMatch(d -> d instanceof TensorType.IndexedBoundDimension))
+            if (type.hasOnlyIndexedBoundDimensions())
                 return of(type, BoundBuilder.dimensionSizesOf(type), values);
             else
                 return new UnboundBuilder(type);
@@ -309,7 +310,7 @@ public abstract class IndexedTensor implements Tensor {
          *               must not be further mutated by the caller
          */
         public static Builder of(TensorType type, double[] values) {
-            if (type.dimensions().stream().allMatch(d -> d instanceof TensorType.IndexedBoundDimension))
+            if (type.hasOnlyIndexedBoundDimensions())
                 return of(type, BoundBuilder.dimensionSizesOf(type), values);
             else
                 return new UnboundBuilder(type);
@@ -615,11 +616,11 @@ public abstract class IndexedTensor implements Tensor {
 
     private final class ValueIterator implements Iterator<Double> {
 
-        private long count = 0;
+        private int count = 0;
 
         @Override
         public boolean hasNext() {
-            return count < size();
+            return count < sizeAsInt();
         }
 
         @Override