aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLester Solbakken <lester.solbakken@gmail.com>2023-12-15 09:07:40 +0100
committerLester Solbakken <lester.solbakken@gmail.com>2023-12-15 09:07:40 +0100
commit0b137997746a2b467213b8e5fceea460813a868b (patch)
tree74746679c7a8d688f5834317e5e8f667e3ef2af0
parent29d71b65bd854881d741b41c5522b8954b9bdd2e (diff)
Add string indicators for dimensions with spaces in slice tostring
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java7
-rw-r--r--vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java9
2 files changed, 13 insertions, 3 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
index 97414d8859a..807f56b1a49 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
@@ -278,10 +278,11 @@ public class Slice<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY
}
private String valueToString(ToStringContext<NAMETYPE> context) {
- if (label != null)
- return label;
- else
+ if (label != null) {
+ return TensorAddress.labelToString(label);
+ } else {
return index.toString(context);
+ }
}
@Override
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java
index 94a06a416a5..3a21017ded4 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/functions/SliceTestCase.java
@@ -135,4 +135,13 @@ public class SliceTestCase {
.toString());
}
+ @Test
+ public void testLabelsWithSpaceToString() {
+ Tensor input = Tensor.from("tensor(key{}):{a:1, 'b c':2}");
+ assertEquals("tensor(key{}):{a:1.0, 'b c':2.0}{key:'b c'}",
+ new Slice<>(new ConstantTensor<>(input),
+ List.of(new Slice.DimensionValue<>("key", "b c")))
+ .toString());
+ }
+
}