jimczi commented on code in PR #12529:
URL: https://github.com/apache/lucene/pull/12529#discussion_r1310869676
##########
lucene/core/src/java/org/apache/lucene/util/hnsw/HnswGraphBuilder.java:
##########
@@ -366,38 +324,11 @@ private void popToScratch(GraphBuilderKnnCollector
candidates) {
* @param neighbors the neighbors selected so far
* @return whether the candidate is diverse given the existing neighbors
*/
- private boolean diversityCheck(int candidate, float score, NeighborArray
neighbors)
- throws IOException {
- return isDiverse(candidate, neighbors, score);
- }
-
- private boolean isDiverse(int candidate, NeighborArray neighbors, float
score)
- throws IOException {
- return switch (vectorEncoding) {
- case BYTE -> isDiverse((byte[]) vectors.vectorValue(candidate),
neighbors, score);
- case FLOAT32 -> isDiverse((float[]) vectors.vectorValue(candidate),
neighbors, score);
- };
- }
-
- private boolean isDiverse(float[] candidate, NeighborArray neighbors, float
score)
- throws IOException {
- for (int i = 0; i < neighbors.size(); i++) {
- float neighborSimilarity =
- similarityFunction.compare(
- candidate, (float[]) vectorsCopy.vectorValue(neighbors.node[i]));
- if (neighborSimilarity >= score) {
- return false;
- }
- }
- return true;
- }
-
- private boolean isDiverse(byte[] candidate, NeighborArray neighbors, float
score)
+ private boolean diversityCheck(
+ RandomVectorScorer scorer, int candidate, float score, NeighborArray
neighbors)
throws IOException {
for (int i = 0; i < neighbors.size(); i++) {
- float neighborSimilarity =
- similarityFunction.compare(
- candidate, (byte[]) vectorsCopy.vectorValue(neighbors.node[i]));
+ float neighborSimilarity = scorer.symmetricScore(candidate,
neighbors.node[i]);
Review Comment:
That's a lot cleaner, I pushed a change to reflect your idea.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
