instant-labs/instant-distance
1
0
Fork 0
mirror of https://github.com/instant-labs/instant-distance.git synced 2025-02-16 12:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify selection return value invariants

Browse Source
This commit is contained in:
Dirkjan Ochtman 2021-01-19 10:47:01 +01:00
parent 9e302d7dbe
commit 58a7162d0a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib.rs
View File

@ -370,7 +370,7 @@ fn insert<P: Point>(
) {
layer.push(ZeroNode::default());
let found = match heuristic {
None => search.select_simple(M * 2),
None => search.select_simple(),
Some(heuristic) => search.select_heuristic(&layer, M * 2, &points[new], points, *heuristic),
};
@ -380,7 +380,7 @@ fn insert<P: Point>(
found.iter().map(|c| c.pid).collect::<HashSet<_>>().len()
);
for (i, candidate) in found.iter().enumerate() {
for (i, candidate) in found.iter().take(M * 2).enumerate() {
// `candidate` here is the new node's neighbor
let &Candidate { distance, pid } = candidate;
if let Some(heuristic) = heuristic {
@ -540,9 +540,9 @@ impl Search {
}
/// Selection of neighbors for insertion (algorithm 3 from the paper)
fn select_simple(&mut self, num: usize) -> &[Candidate] {
fn select_simple(&mut self) -> &[Candidate] {
self.nearest.sort_unstable();
&self.nearest[..min(self.nearest.len(), num)]
&self.nearest
}
fn select_heuristic<P: Point>(
@ -603,7 +603,7 @@ impl Search {
}
self.nearest.sort_unstable();
&self.nearest[..min(self.nearest.len(), num)]
&self.nearest
}
/// Track node `pid` as a potential new neighbor for the given `point`