diff options
6 files changed, 8 insertions, 12 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java index 043c36faf93..e1444c5145f 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java +++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java @@ -99,7 +99,7 @@ public class JsonSerializationHelper { private static void serializeTensorAddress(JsonGenerator generator, TensorAddress address, TensorType type) throws IOException { generator.writeObjectFieldStart(JsonReader.TENSOR_ADDRESS); for (int i = 0; i < type.dimensions().size(); i++) - generator.writeStringField(type.dimensions().get(i).name(), address.elements().get(i)); + generator.writeStringField(type.dimensions().get(i).name(), address.labels().get(i)); generator.writeEndObject(); } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java index b1e845b4506..05cf2ac625a 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java @@ -30,7 +30,7 @@ public final class TensorAddress implements Comparable<TensorAddress> { } /** Returns the labels of this as an immutable list in the order of the tensor this is the type of */ - public List<String> elements() { return labels; } + public List<String> labels() { return labels; } @Override public int compareTo(TensorAddress other) { diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java index d424b3f0f18..8b1f2fb806f 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Join.java @@ -7,11 +7,9 @@ import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorAddress; import com.yahoo.tensor.TensorType; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Optional; import java.util.function.DoubleBinaryOperator; /** @@ -119,8 +117,8 @@ public class Join extends PrimitiveTensorFunction { private TensorAddress combineAddresses(TensorAddress a, int[] aToIndexes, TensorAddress b, int[] bToIndexes, TensorType joinedType) { String[] joinedLabels = new String[joinedType.dimensions().size()]; - mapContent(a.elements(), joinedLabels, aToIndexes); - boolean compatible = mapContent(b.elements(), joinedLabels, bToIndexes); + mapContent(a.labels(), joinedLabels, aToIndexes); + boolean compatible = mapContent(b.labels(), joinedLabels, bToIndexes); if ( ! compatible) return null; return new TensorAddress(joinedLabels); } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java index 9251521f6bf..0a94a1e7b5e 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Reduce.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.stream.Collectors; /** * The <i>reduce</i> tensor operation returns a tensor produced from the argument tensor where some dimensions @@ -125,9 +124,9 @@ public class Reduce extends PrimitiveTensorFunction { String[] reducedLabels = new String[reducedType.dimensions().size()]; int reducedLabelIndex = 0; - for (int i = 0; i < address.elements().size(); i++) + for (int i = 0; i < address.labels().size(); i++) if ( ! indexesToRemove.contains(i)) - reducedLabels[reducedLabelIndex++] = address.elements().get(i); + reducedLabels[reducedLabelIndex++] = address.labels().get(i); return new TensorAddress(reducedLabels); } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java index 81582fd64ac..4b3a2f4142f 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Rename.java @@ -84,7 +84,7 @@ public class Rename extends PrimitiveTensorFunction { private TensorAddress rename(TensorAddress address, int[] toIndexes) { String[] reorderedLabels = new String[toIndexes.length]; for (int i = 0; i < toIndexes.length; i++) - reorderedLabels[toIndexes[i]] = address.elements().get(i); + reorderedLabels[toIndexes[i]] = address.labels().get(i); return new TensorAddress(reorderedLabels); } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java index 967c05f0878..b707802c55f 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/SparseBinaryFormat.java @@ -2,7 +2,6 @@ package com.yahoo.tensor.serialization; import com.google.common.annotations.Beta; -import com.google.common.collect.Sets; import com.yahoo.io.GrowableByteBuffer; import com.yahoo.tensor.MapTensorBuilder; import com.yahoo.tensor.Tensor; @@ -50,7 +49,7 @@ class SparseBinaryFormat implements BinaryFormat { } private static void encodeAddress(GrowableByteBuffer buffer, TensorAddress address) { - for (String label : address.elements()) + for (String label : address.labels()) encodeString(buffer, label); } |