diff options
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/slime/Type.java | 2 | ||||
-rw-r--r-- | vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/slime/Type.java b/vespajlib/src/main/java/com/yahoo/slime/Type.java index 5407b296b38..8314d5bb24e 100644 --- a/vespajlib/src/main/java/com/yahoo/slime/Type.java +++ b/vespajlib/src/main/java/com/yahoo/slime/Type.java @@ -2,7 +2,7 @@ package com.yahoo.slime; /** - * Enumeration of all possibly Slime data types. + * Enumeration of all possible Slime data types. */ public enum Type { diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java index 1c884186879..abbd1d34885 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.tensor.serialization; -import com.yahoo.tensor.IndexedTensor; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import org.junit.Test; @@ -349,8 +348,21 @@ public class JsonFormatTestCase { assertEncodeDecode(Tensor.from("tensor<int8>(x[2],y[2]):[2,3,5,8]")); } + /** All cell types are rendered as double. */ + @Test + public void testTensorCellTypeRenderingPrecision() { + assertEncodeShortForm(Tensor.Builder.of("tensor<double>(x[1])").cell(1.0/3, 0).build(), + "{\"type\":\"tensor(x[1])\",\"values\":[0.3333333333333333]}"); + assertEncodeShortForm(Tensor.Builder.of("tensor<float>(x[1])").cell((float)1.0/3, 0).build(), + "{\"type\":\"tensor<float>(x[1])\",\"values\":[0.3333333432674408]}"); + } + private void assertEncodeShortForm(String tensor, String expected) { - byte[] json = JsonFormat.encodeShortForm(Tensor.from(tensor)); + assertEncodeShortForm(Tensor.from(tensor), expected); + } + + private void assertEncodeShortForm(Tensor tensor, String expected) { + byte[] json = JsonFormat.encodeShortForm(tensor); assertEquals(expected, new String(json, StandardCharsets.UTF_8)); } |