diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-26 12:45:20 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-26 12:45:20 +0200 |
commit | 2b59a443c1c37dcdcc5d77fe13b93b5ce383fee2 (patch) | |
tree | 8e0c3e037cbc96f83bc975c0d152b10ab44e6c41 /vespajlib | |
parent | f9da8909ad49e2bb494dd445344f429dc82fabce (diff) |
Parse@ tensor value expressions
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java | 2 | ||||
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java index 30f7185959c..3812dd26370 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java @@ -110,7 +110,7 @@ public abstract class TensorAddress implements Comparable<TensorAddress> { return Long.parseLong(labels[i]); } catch (NumberFormatException e) { - throw new IllegalArgumentException("Expected a long label in " + this + " at position " + i); + throw new IllegalArgumentException("Expected an integer label in " + this + " at position " + i + " but got '" + labels[i] + "'"); } } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java index 3113d48335a..0a881c0a290 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Value.java @@ -82,7 +82,7 @@ public class Value extends PrimitiveTensorFunction { if (cellAddress.get(0).index().isPresent()) return "[" + cellAddress.get(0).index().get() + "]"; else - return "{" + cellAddress.get(0).index().get() + "}"; + return "{" + cellAddress.get(0).label() + "}"; } else { return "{" + cellAddress.stream().map(i -> i.toString()).collect(Collectors.joining(", ")) + "}"; |