diff options
Diffstat (limited to 'vespajlib')
4 files changed, 8 insertions, 8 deletions
diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json index 5b03c8b5661..174ce6332db 100644 --- a/vespajlib/abi-spec.json +++ b/vespajlib/abi-spec.json @@ -729,7 +729,7 @@ ], "methods" : [ "public void setIndex(int, int)", - "public long getIndex()", + "public long getDirectIndex()", "public long getStride(int)" ], "fields" : [ ] diff --git a/vespajlib/src/main/java/com/yahoo/tensor/DirectIndexedAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/DirectIndexedAddress.java index 80cb545238c..37752361876 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/DirectIndexedAddress.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/DirectIndexedAddress.java @@ -3,7 +3,7 @@ package com.yahoo.tensor; /** * Utility class for efficient access and iteration along dimensions in Indexed tensors. * Usage: Use setIndex to lock the indexes of the dimensions that don't change in this iteration. - * long base = addr.getIndex(); + * long base = addr.getDirectIndex(); * long stride = addr.getStride(dimension) * i = 0...size_of_dimension * double value = tensor.get(base + i * stride); @@ -30,7 +30,7 @@ public final class DirectIndexedAddress { indexes[dimension] = index; } /** Retrieve the index that can be used for direct lookup in an indexed tensor. */ - public long getIndex() { return directIndex; } + public long getDirectIndex() { return directIndex; } /** returns the stride to be used for the given dimension */ public long getStride(int dimension) { return sizes.productOfDimensionsAfter(dimension); diff --git a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java index d43b4a03f72..93cdc3f630f 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java @@ -94,7 +94,7 @@ public abstract class IndexedTensor implements Tensor { } public double get(DirectIndexedAddress address) { - return get(address.getIndex()); + return get(address.getDirectIndex()); } public DirectIndexedAddress directAddress() { return DirectIndexedAddress.of(dimensionSizes); } /** diff --git a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java index d145ad7a316..afc95d295f0 100644 --- a/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java +++ b/vespajlib/src/test/java/com/yahoo/tensor/IndexedTensorTestCase.java @@ -112,11 +112,11 @@ public class IndexedTensorTestCase { assertEquals(ySize*zSize, directAddress.getStride(2)); assertEquals(zSize, directAddress.getStride(3)); assertEquals(1, directAddress.getStride(4)); - assertEquals(0, directAddress.getIndex()); + assertEquals(0, directAddress.getDirectIndex()); directAddress.setIndex(0,1); - assertEquals(1 * directAddress.getStride(0), directAddress.getIndex()); + assertEquals(1 * directAddress.getStride(0), directAddress.getDirectIndex()); directAddress.setIndex(1,1); - assertEquals(1 * directAddress.getStride(0) + 1 * directAddress.getStride(1), directAddress.getIndex()); + assertEquals(1 * directAddress.getStride(0) + 1 * directAddress.getStride(1), directAddress.getDirectIndex()); directAddress.setIndex(2,2); directAddress.setIndex(3,2); directAddress.setIndex(4,2); @@ -125,7 +125,7 @@ public class IndexedTensorTestCase { 2 * directAddress.getStride(2) + 2 * directAddress.getStride(3) + 2 * directAddress.getStride(4); - assertEquals(expected, directAddress.getIndex()); + assertEquals(expected, directAddress.getDirectIndex()); } @Test |