Unify constant syntax across models and rank profiles

2 files changed, 40 insertions, 3 deletions

diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json
index f7be61946ba..654042372cf 100644
--- a/vespajlib/abi-spec.json
+++ b/vespajlib/abi-spec.json
@@ -1273,6 +1273,18 @@
     ],
     "fields": []
   },
+  "com.yahoo.tensor.TensorAddress$PartialBuilder": {
+    "superClass": "com.yahoo.tensor.TensorAddress$Builder",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.TensorAddress$Builder copy()"
+    ],
+    "fields": []
+  },
   "com.yahoo.tensor.TensorAddress": {
     "superClass": "java.lang.Object",
     "interfaces": [
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
index d9ab67d6c5f..bce8aa7c82b 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
@@ -171,8 +171,8 @@ public abstract class TensorAddress implements Comparable<TensorAddress> {
     /** Builder of a tensor address */
     public static class Builder {
 
-        private final TensorType type;
-        private final String[] labels;
+        final TensorType type;
+        final String[] labels;
 
         public Builder(TensorType type) {
             this(type, new String[type.dimensions().size()]);
@@ -218,14 +218,39 @@ public abstract class TensorAddress implements Comparable<TensorAddress> {
         /** Returns the type of the tensor this address is being built for. */
         public TensorType type() { return type; }
 
-        public TensorAddress build() {
+        void validate() {
             for (int i = 0; i < labels.length; i++)
                 if (labels[i] == null)
                     throw new IllegalArgumentException("Missing a label for dimension " +
                                                        type.dimensions().get(i).name() + " for " + type);
+        }
+
+        public TensorAddress build() {
+            validate();
             return TensorAddress.of(labels);
         }
 
     }
 
+    /** Builder of an address to a subset of the dimensions of a tensor type */
+    public static class PartialBuilder extends Builder {
+
+        public PartialBuilder(TensorType type) {
+            super(type);
+        }
+
+        private PartialBuilder(TensorType type, String[] labels) {
+            super(type, labels);
+        }
+
+        /** Creates a copy of this which can be modified separately */
+        public Builder copy() {
+            return new PartialBuilder(type, Arrays.copyOf(labels, labels.length));
+        }
+
+        @Override
+        void validate() { }
+
+    }
+
 }