diff options
Diffstat (limited to 'vespajlib/src/main')
3 files changed, 14 insertions, 14 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java index 8b8ad5c2dcf..5d5a5f74063 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java @@ -33,18 +33,18 @@ public class MixedTensor implements Tensor { // XXX consider using "record" instead /** only exposed for internal use; subject to change without notice */ public static final class DenseSubspace { - public final TensorAddress sparseAddr; + public final TensorAddress sparseAddress; public final double[] cells; - DenseSubspace(TensorAddress sparseAddr, double[] cells) { - this.sparseAddr = sparseAddr; + DenseSubspace(TensorAddress sparseAddress, double[] cells) { + this.sparseAddress = sparseAddress; this.cells = cells; } @Override public int hashCode() { - return Objects.hash(sparseAddr, cells[0]); + return Objects.hash(sparseAddress, cells[0]); } @Override public boolean equals(Object other) { if (other instanceof DenseSubspace o) { - return sparseAddr.equals(o.sparseAddr) && Arrays.equals(cells, o.cells); + return sparseAddress.equals(o.sparseAddress) && Arrays.equals(cells, o.cells); } return false; } @@ -69,11 +69,11 @@ public class MixedTensor implements Tensor { } long count = 0; for (var block : this.denseSubspaces) { - if (index.sparseMap.get(block.sparseAddr) != count) { + if (index.sparseMap.get(block.sparseAddress) != count) { throw new IllegalStateException("map vs list mismatch: block #" + count + " address maps to #" - + index.sparseMap.get(block.sparseAddr)); + + index.sparseMap.get(block.sparseAddress)); } if (block.cells.length != denseSubspaceSize) { throw new IllegalStateException("dense subspace size mismatch, expected " @@ -148,7 +148,7 @@ public class MixedTensor implements Tensor { currBlock = blockIterator.next(); currOffset = 0; } - TensorAddress fullAddr = index.fullAddressOf(currBlock.sparseAddr, currOffset); + TensorAddress fullAddr = index.fullAddressOf(currBlock.sparseAddress, currOffset); double value = currBlock.cells[currOffset++]; return new Cell(fullAddr, value); } @@ -205,8 +205,8 @@ public class MixedTensor implements Tensor { var indexBuilder = new Index.Builder(type); List<DenseSubspace> list = new ArrayList<>(); for (var block : denseSubspaces) { - if ( ! addresses.contains(block.sparseAddr)) { // assumption: addresses only contain the sparse part - indexBuilder.addBlock(block.sparseAddr, list.size()); + if ( ! addresses.contains(block.sparseAddress)) { // assumption: addresses only contain the sparse part + indexBuilder.addBlock(block.sparseAddress, list.size()); list.add(block); } } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java index dd433b92493..0ac9ea18029 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java @@ -155,10 +155,10 @@ public class JsonFormat { for (var subspace : tensor.getInternalDenseSubspaces()) { IndexedTensor denseSubspace = IndexedTensor.Builder.of(denseSubType, subspace.cells).build(); if (mappedDimensions.size() == 1) { - encodeValues(denseSubspace, cursor.setArray(subspace.sparseAddr.label(0)), new long[denseSubspace.dimensionSizes().dimensions()], 0); + encodeValues(denseSubspace, cursor.setArray(subspace.sparseAddress.label(0)), new long[denseSubspace.dimensionSizes().dimensions()], 0); } else { Cursor block = cursor.addObject(); - encodeAddress(mappedSubType, subspace.sparseAddr, block.setObject("address")); + encodeAddress(mappedSubType, subspace.sparseAddress, block.setObject("address")); encodeValues(denseSubspace, block.setArray("values"), new long[denseSubspace.dimensionSizes().dimensions()], 0); } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java index edebc9acdd6..bdb46e4661e 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java @@ -78,8 +78,8 @@ class MixedBinaryFormat implements BinaryFormat { buffer.putInt1_4Bytes(denseSubspaces.size()); } for (var subspace : denseSubspaces) { - for (int index = 0; index < subspace.sparseAddr.size(); index++) { - buffer.putUtf8String(subspace.sparseAddr.label(index)); + for (int index = 0; index < subspace.sparseAddress.size(); index++) { + buffer.putUtf8String(subspace.sparseAddress.label(index)); } for (double val : subspace.cells) { consumer.accept(val); |