Merge pull request #9943 from vespa-engine/bratseth/access-correct-indexed-value

Use value accessor in convenience accessors

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++)