instant-labs
/
instant-distance
mirror of https://github.com/instant-labs/instant-distance.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Search::num to ef

This commit is contained in:
Dirkjan Ochtman 2020-12-17 13:02:25 +01:00
parent 5ceebde417
commit 3241070758
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib.rs
View File

@ -125,7 +125,7 @@ where
let point = &points[*pid]; let point = &points[*pid];
search.push(PointId(0), point, &points); search.push(PointId(0), point, &points);
for cur in top.descend() { for cur in top.descend() {
search.num = if cur <= layer { ef_construction } else { 1 }; search.ef = if cur <= layer { ef_construction } else { 1 };
zero.search(point, search, &points, num); zero.search(point, search, &points, num);
match cur > layer { match cur > layer {
true => search.cull(), true => search.cull(),
@ -199,7 +199,7 @@ where
false => (1, M), false => (1, M),
}; };
search.num = ef; search.ef = ef;
match cur.0 { match cur.0 {
0 => self.zero.search(point, search, &self.points, num), 0 => self.zero.search(point, search, &self.points, num),
l => self.layers[l - 1].search(point, search, &self.points, num), l => self.layers[l - 1].search(point, search, &self.points, num),
@ -259,7 +259,7 @@ pub struct Search {
/// Nearest neighbors found so far (`W` in the paper) /// Nearest neighbors found so far (`W` in the paper)
nearest: Vec<Candidate>, nearest: Vec<Candidate>,
/// Maximum number of nearest neighbors to retain (`ef` in the paper) /// Maximum number of nearest neighbors to retain (`ef` in the paper)
num: usize, ef: usize,
/// Current furthest node in `nearest` /// Current furthest node in `nearest`
furthest: OrderedFloat<f32>, furthest: OrderedFloat<f32>,
} }
@ -271,7 +271,7 @@ impl Search {
visited, visited,
candidates, candidates,
nearest, nearest,
num: _, ef: _,
furthest, furthest,
} = self; } = self;
@ -292,13 +292,13 @@ impl Search {
let other = &points[pid]; let other = &points[pid];
let distance = OrderedFloat::from(point.distance(other)); let distance = OrderedFloat::from(point.distance(other));
if self.nearest.len() >= self.num && distance > self.furthest { if self.nearest.len() >= self.ef && distance > self.furthest {
return; return;
} }
if self.nearest.len() > self.num * 2 { if self.nearest.len() > self.ef * 2 {
self.nearest.sort_unstable(); self.nearest.sort_unstable();
self.nearest.truncate(self.num); self.nearest.truncate(self.ef);
self.furthest = self.nearest.last().unwrap().distance; self.furthest = self.nearest.last().unwrap().distance;
} }
@ -316,7 +316,7 @@ impl Search {
/// Invariant: `nearest` should be sorted before this is called. This is generally the case /// Invariant: `nearest` should be sorted before this is called. This is generally the case
/// because `Layer::search()` is always called right before calling `cull()`. /// because `Layer::search()` is always called right before calling `cull()`.
fn cull(&mut self) { fn cull(&mut self) {
self.nearest.truncate(self.num); // Limit size of the set of nearest neighbors self.nearest.truncate(self.ef); // Limit size of the set of nearest neighbors
self.furthest = self.nearest.last().unwrap().distance; self.furthest = self.nearest.last().unwrap().distance;
self.candidates.clear(); self.candidates.clear();
self.candidates.extend(&self.nearest); self.candidates.extend(&self.nearest);
@ -331,7 +331,7 @@ impl Default for Search {
visited: HashSet::new(), visited: HashSet::new(),
candidates: Vec::new(), candidates: Vec::new(),
nearest: Vec::new(), nearest: Vec::new(),
num: 1, ef: 1,
furthest: OrderedFloat::from(f32::INFINITY), furthest: OrderedFloat::from(f32::INFINITY),
} }
} }
@ -436,7 +436,7 @@ trait Layer {
} }
search.nearest.sort_unstable(); search.nearest.sort_unstable();
search.nearest.truncate(search.num); search.nearest.truncate(search.ef);
} }
/// Insert new node in this layer /// Insert new node in this layer