benwtrent commented on code in PR #15958:
URL: https://github.com/apache/lucene/pull/15958#discussion_r3305873351
##########
lucene/core/src/java/org/apache/lucene/util/hnsw/NeighborArray.java:
##########
@@ -309,31 +312,26 @@ private int
findWorstNonDiverse(UpdateableRandomVectorScorer scorer) throws IOEx
}
private boolean isWorstNonDiverse(
- int candidateIndex, int[] uncheckedIndexes, int uncheckedCursor,
RandomVectorScorer scorer)
+ int candidateIndex,
+ int[] uncheckedIndexes,
+ int uncheckedCursor,
+ RandomVectorScorer scorer,
+ int[] bulkScoreNodes,
+ float[] bulkScores)
throws IOException {
float minAcceptedSimilarity = scores[candidateIndex];
if (candidateIndex == uncheckedIndexes[uncheckedCursor]) {
// the candidate itself is unchecked
- for (int i = candidateIndex - 1; i >= 0; i--) {
- float neighborSimilarity = scorer.score(nodes[i]);
- // candidate node is too similar to node i given its score relative to
the base node
- if (neighborSimilarity >= minAcceptedSimilarity) {
- return true;
- }
- }
- } else {
- // else we just need to make sure candidate does not violate diversity
with the (newly
- // inserted) unchecked nodes
- assert candidateIndex > uncheckedIndexes[uncheckedCursor];
- for (int i = uncheckedCursor; i >= 0; i--) {
- float neighborSimilarity = scorer.score(nodes[uncheckedIndexes[i]]);
- // candidate node is too similar to node i given its score relative to
the base node
- if (neighborSimilarity >= minAcceptedSimilarity) {
- return true;
- }
- }
+ return scorer.bulkScore(nodes, bulkScores, candidateIndex) >=
minAcceptedSimilarity;
Review Comment:
It seems like we only want to score uncheckedIndexes right?
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
