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

Reduce boilerplate in trait implementations

This commit is contained in:
Dirkjan Ochtman 2020-12-16 12:03:23 +01:00
parent fbfefdba6f
commit b20f4efeae
1 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/lib.rs
View File

@ -320,12 +320,12 @@ impl Layer for Vec<ZeroNode> {
self.push(new); self.push(new);
} }
fn nodes_mut(&mut self) -> &mut [Self::Node] { fn nearest_mut(&mut self, pid: PointId) -> &mut [PointId] {
self &mut self[pid.0 as usize].nearest
} }
fn nodes(&self) -> &[Self::Node] { fn nearest(&self, pid: PointId) -> &[PointId] {
self &self[pid.0 as usize].nearest
} }
} }
@ -338,12 +338,12 @@ impl Layer for Vec<UpperNode> {
self.push(new); self.push(new);
} }
fn nodes_mut(&mut self) -> &mut [Self::Node] { fn nearest_mut(&mut self, pid: PointId) -> &mut [PointId] {
self &mut self[pid.0 as usize].nearest
} }
fn nodes(&self) -> &[Self::Node] { fn nearest(&self, pid: PointId) -> &[PointId] {
self &self[pid.0 as usize].nearest
} }
} }
@ -371,8 +371,7 @@ trait Layer {
} }
} }
let node = &self.nodes()[candidate.pid.0 as usize]; for pid in self.nearest_iter(candidate.pid).take(num) {
for pid in node.nearest_iter().take(num) {
search.push(pid, point, points); search.push(pid, point, points);
} }
} }
@ -405,7 +404,7 @@ trait Layer {
new_nearest[i] = pid; // Update the new node's `nearest` new_nearest[i] = pid; // Update the new node's `nearest`
let old = &points[pid]; let old = &points[pid];
let nearest = self.nodes()[pid.0 as usize].nearest(); let nearest = self.nearest(pid);
// Find the correct index to insert at to keep the neighbor's neighbors sorted // Find the correct index to insert at to keep the neighbor's neighbors sorted
let idx = nearest let idx = nearest
@ -427,7 +426,7 @@ trait Layer {
continue; continue;
} }
let nearest = self.nodes_mut()[pid.0 as usize].nearest_mut(); let nearest = self.nearest_mut(pid);
if !nearest[idx].is_valid() { if !nearest[idx].is_valid() {
nearest[idx] = new; nearest[idx] = new;
continue; continue;
@ -443,9 +442,15 @@ trait Layer {
fn push(&mut self, new: Self::Node); fn push(&mut self, new: Self::Node);
fn nodes_mut(&mut self) -> &mut [Self::Node]; fn nearest_mut(&mut self, pid: PointId) -> &mut [PointId];
fn nodes(&self) -> &[Self::Node]; fn nearest_iter(&self, pid: PointId) -> NearestIter<'_> {
NearestIter {
nearest: self.nearest(pid),
}
}
fn nearest(&self, pid: PointId) -> &[PointId];
} }
#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))] #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
@ -458,19 +463,9 @@ struct UpperNode {
} }
impl Node for UpperNode { impl Node for UpperNode {
fn nearest(&self) -> &[PointId] {
&self.nearest
}
fn nearest_mut(&mut self) -> &mut [PointId] { fn nearest_mut(&mut self) -> &mut [PointId] {
&mut self.nearest &mut self.nearest
} }
fn nearest_iter(&self) -> NearestIter<'_> {
NearestIter {
nearest: &self.nearest,
}
}
} }
#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))] #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
@ -483,25 +478,13 @@ struct ZeroNode {
} }
impl Node for ZeroNode { impl Node for ZeroNode {
fn nearest(&self) -> &[PointId] {
&self.nearest
}
fn nearest_mut(&mut self) -> &mut [PointId] { fn nearest_mut(&mut self) -> &mut [PointId] {
&mut self.nearest &mut self.nearest
} }
fn nearest_iter(&self) -> NearestIter<'_> {
NearestIter {
nearest: &self.nearest,
}
}
} }
trait Node: Default { trait Node: Default {
fn nearest(&self) -> &[PointId];
fn nearest_mut(&mut self) -> &mut [PointId]; fn nearest_mut(&mut self) -> &mut [PointId];
fn nearest_iter(&self) -> NearestIter<'_>;
} }
struct NearestIter<'a> { struct NearestIter<'a> {