From 1bf0225d6c0ddd1b39f1aa3550dc3e1bcbe9b5b8 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 8 May 2020 10:18:01 +0200 Subject: Output short form of mixed tensors --- vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java | 2 +- vespajlib/src/test/java/com/yahoo/tensor/MixedTensorTestCase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vespajlib') diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java index 2b393d8a637..1ec4993bf57 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java @@ -134,7 +134,7 @@ public class MixedTensor implements Tensor { @Override public String toString() { if (type.rank() == 0) return Tensor.toStandardString(this); - if (type.rank() > 1 && type.dimensions().stream().anyMatch(d -> d.size().isEmpty())) + if (type.rank() > 1 && type.dimensions().stream().filter(d -> d.isIndexed()).anyMatch(d -> d.size().isEmpty())) return Tensor.toStandardString(this); if (type.dimensions().stream().filter(d -> d.isMapped()).count() > 1) return Tensor.toStandardString(this); diff --git a/vespajlib/src/test/java/com/yahoo/tensor/MixedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/MixedTensorTestCase.java index 5d4417ec928..29dc1544abe 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/MixedTensorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/MixedTensorTestCase.java @@ -100,7 +100,7 @@ public class MixedTensorTestCase { cell().label("x", "2").label("y", 2).value(6). build(); assertEquals(Sets.newHashSet("x", "y"), tensor.type().dimensionNames()); - assertEquals("tensor(x{},y[3]):{{x:1,y:0}:1.0,{x:1,y:1}:2.0,{x:1,y:2}:0.0,{x:2,y:0}:4.0,{x:2,y:1}:5.0,{x:2,y:2}:6.0}", + assertEquals("tensor(x{},y[3]):{1:[1.0, 2.0, 0.0],2:[4.0, 5.0, 6.0]}", tensor.toString()); } -- cgit v1.2.3