diff options
Diffstat (limited to 'eval/src/tests/ann/extended-hnsw.cpp')
| -rw-r--r-- | eval/src/tests/ann/extended-hnsw.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eval/src/tests/ann/extended-hnsw.cpp b/eval/src/tests/ann/extended-hnsw.cpp index fbc4bedec05..95cd674a815 100644 --- a/eval/src/tests/ann/extended-hnsw.cpp +++ b/eval/src/tests/ann/extended-hnsw.cpp @@ -319,7 +319,7 @@ HnswLikeNns::distance(Vector v, uint32_t b) const } std::vector<NnsHit> -HnswLikeNns::topKfilter(uint32_t k, Vector vector, uint32_t search_k, const BitVector &blacklist) +HnswLikeNns::topKfilter(uint32_t k, Vector vector, uint32_t search_k, const BitVector &skipDocIds) { std::vector<NnsHit> result; if (_entryLevel < 0) return result; @@ -343,12 +343,12 @@ HnswLikeNns::topKfilter(uint32_t k, Vector vector, uint32_t search_k, const BitV FurthestPriQ w; w.push(entryPoint); #endif - search_layer_with_filter(vector, w, visited, std::max(k, search_k), 0, blacklist); + search_layer_with_filter(vector, w, visited, std::max(k, search_k), 0, skipDocIds); NearestList tmp = w.steal(); std::sort(tmp.begin(), tmp.end(), LesserDist()); result.reserve(std::min((size_t)k, tmp.size())); for (const auto & hit : tmp) { - if (blacklist.isSet(hit.docid)) continue; + if (skipDocIds.isSet(hit.docid)) continue; result.emplace_back(hit.docid, SqDist(hit.dist)); if (result.size() == k) break; } @@ -407,14 +407,14 @@ void HnswLikeNns::search_layer_with_filter(Vector vector, FurthestPriQ &w, VisitedSet &visited, uint32_t ef, uint32_t searchLevel, - const BitVector &blacklist) + const BitVector &skipDocIds) { NearestPriQ candidates; for (const HnswHit & entry : w.peek()) { candidates.push(entry); visited.mark(entry.docid); - if (blacklist.isSet(entry.docid)) ++ef; + if (skipDocIds.isSet(entry.docid)) ++ef; } double limd = std::numeric_limits<double>::max(); while (! candidates.empty()) { @@ -430,7 +430,7 @@ HnswLikeNns::search_layer_with_filter(Vector vector, FurthestPriQ &w, ++distcalls_search_layer; if (e_dist < limd) { candidates.emplace(e_id, SqDist(e_dist)); - if (blacklist.isSet(e_id)) continue; + if (skipDocIds.isSet(e_id)) continue; w.emplace(e_id, SqDist(e_dist)); if (w.size() > ef) { w.pop(); |