diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-07-02 09:43:30 -0700 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-07-02 09:43:30 -0700 |
commit | 249adcaf5ad448ed513290231bb5ba89271820c4 (patch) | |
tree | e177d2a64e8c3cc082bb413f0a5d25d0c2d1ffee /vespajlib/src | |
parent | 0f88dd437ce1d6833c601b5d4cb80fa35d546935 (diff) |
Use value accessor in convenience accessors
Diffstat (limited to 'vespajlib/src')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/tensor/Tensor.java | 4 | ||||
-rw-r--r-- | vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java index c2aa155d6bb..806d27ce70e 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java @@ -397,10 +397,10 @@ public interface Tensor { public Double getValue() { return value.doubleValue(); } /** Returns the value as a float */ - public float getFloatValue() { return value.floatValue(); } + public float getFloatValue() { return getValue().floatValue(); } /** Returns the value as a double */ - public double getDoubleValue() { return value.doubleValue(); } + public double getDoubleValue() { return getValue(); } @Override public Double setValue(Double value) { diff --git a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java index 4bfdb53e321..1a5bae9b02c 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java @@ -146,8 +146,10 @@ public class IndexedTensorTestCase { // Lookup from iterator Map<TensorAddress, Double> cellsOfIterator = new HashMap<>(); for (Iterator<Tensor.Cell> i = tensor.cellIterator(); i.hasNext(); ) { - Map.Entry<TensorAddress, Double> cell = i.next(); + Tensor.Cell cell = i.next(); cellsOfIterator.put(cell.getKey(), cell.getValue()); + assertEquals(cell.getValue(), cell.getDoubleValue(), 0.00001); + assertEquals(cell.getValue(), cell.getFloatValue(), 0.00001); } assertEquals(tensor.size(), cellsOfIterator.size()); for (int v = 0; v < vSize; v++) |