Merge pull request #344 from dorosy-yeong/markeddeleted-sufficient-result

yurymalkov · web-flow · commit 67a7a1bc3b87 · 2021-11-07T20:11:50.000-08:00
Insufficient results may occur(has marked_deleted node)
diff --git a/hnswlib/hnswalg.h b/hnswlib/hnswalg.h
@@ -182,7 +182,7 @@ namespace hnswlib {
 
             while (!candidateSet.empty()) {
                 std::pair<dist_t, tableint> curr_el_pair = candidateSet.top();
-                if ((-curr_el_pair.first) > lowerBound) {
+                if ((-curr_el_pair.first) > lowerBound && top_candidates.size() == ef_construction_) {
                     break;
                 }
                 candidateSet.pop();
@@ -271,7 +271,7 @@ namespace hnswlib {
 
                 std::pair<dist_t, tableint> current_node_pair = candidate_set.top();
 
-                if ((-current_node_pair.first) > lowerBound) {
+                if ((-current_node_pair.first) > lowerBound && (top_candidates.size() == ef || has_deletions == false)) {
                     break;
                 }
                 candidate_set.pop();

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ namespace hnswlib {`
`182`	`182`
`183`	`183`	`while (!candidateSet.empty()) {`
`184`	`184`	`std::pair<dist_t, tableint> curr_el_pair = candidateSet.top();`
`185`		`- if ((-curr_el_pair.first) > lowerBound) {`
	`185`	`+ if ((-curr_el_pair.first) > lowerBound && top_candidates.size() == ef_construction_) {`
`186`	`186`	`break;`
`187`	`187`	`}`
`188`	`188`	`candidateSet.pop();`
`@@ -271,7 +271,7 @@ namespace hnswlib {`
`271`	`271`
`272`	`272`	`std::pair<dist_t, tableint> current_node_pair = candidate_set.top();`
`273`	`273`
`274`		`- if ((-current_node_pair.first) > lowerBound) {`
	`274`	`+ if ((-current_node_pair.first) > lowerBound && (top_candidates.size() == ef \|\| has_deletions == false)) {`
`275`	`275`	`break;`
`276`	`276`	`}`
`277`	`277`	`candidate_set.pop();`