1 files changed, 14 insertions, 14 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java
index c3980b8fe93..9c9fed89585 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java
@@ -102,12 +102,12 @@ public abstract class IntermediateOperation {
     /** Add dimension name constraints for this operation */
     public void addDimensionNameConstraints(DimensionRenamer renamer) { }
 
-    /** Conveinence method to adds dimensions and constraints of the given tensor type */
+    /** Convenience method to adds dimensions and constraints of the given tensor type */
     protected void addConstraintsFrom(OrderedTensorType type, DimensionRenamer renamer) {
         for (int i = 0; i < type.dimensions().size(); i++) {
             renamer.addDimension(type.dimensions().get(i).name());
 
-            // Each dimension is distinct:
+            // Each dimension is distinct and ordered correctly:
             for (int j = i + 1; j < type.dimensions().size(); j++) {
                 renamer.addConstraint(type.dimensions().get(i).name(), type.dimensions().get(j).name(),
                                       DimensionRenamer.Constraint.notEqual(false),
@@ -216,29 +216,29 @@ public abstract class IntermediateOperation {
         return i < 0 ? 0 : Integer.parseInt(name.substring(i + 1));
     }
 
-    /**
-     * An interface mapping operation attributes to Vespa Values.
-     * Adapter for differences in different model types.
-     */
-    public interface AttributeMap {
-        Optional<Value> get(String key);
-        Optional<Value> get(String key, OrderedTensorType type);
-        Optional<List<Value>> getList(String key);
-    }
-
     public abstract String operationName();
 
     @Override
     public String toString() {
-        return operationName() +
+        return operationName() + "(" +
                inputs().stream().map(input -> asString(input.type())).collect(Collectors.joining(", ")) +
                ")";
     }
 
     public String toFullString() {
-        return "\t" + lazyGetType() + ":\t" + operationName() +
+        return "\t" + lazyGetType() + ":\t" + operationName() + "(" +
                inputs().stream().map(input -> input.toFullString()).collect(Collectors.joining(", ")) +
                ")";
     }
 
+    /**
+     * An interface mapping operation attributes to Vespa Values.
+     * Adapter for differences in different model types.
+     */
+    public interface AttributeMap {
+        Optional<Value> get(String key);
+        Optional<Value> get(String key, OrderedTensorType type);
+        Optional<List<Value>> getList(String key);
+    }
+
 }