Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'within_bounding_box()' method #51

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions src/kdtree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,38 @@ impl<A: Float + Zero + One, T: std::cmp::PartialEq, U: AsRef<[A]> + std::cmp::Pa
Ok(evaluated.into_sorted_vec().into_iter().map(Into::into).collect())
}

pub fn within_bounding_box(&self, min_bounds: &[A], max_bounds: &[A]) -> Result<Vec<&T>, ErrorKind> {
self.check_point(min_bounds)?;
self.check_point(max_bounds)?;
if self.size == 0 {
return Ok(vec![]);
}
let mut pending = vec![];
let mut evaluated = vec![];
pending.push(self);
while !pending.is_empty() {
let curr = pending.pop().unwrap();
if curr.is_leaf() {
let points = curr.points.as_ref().unwrap().iter();
let bucket = curr.bucket.as_ref().unwrap().iter();
for (p, b) in points.zip(bucket) {
if util::within_bounding_box(p.as_ref(), min_bounds, max_bounds) {
evaluated.push(b);
}
}
} else {
if curr.belongs_in_left(min_bounds) {
pending.push(curr.left.as_ref().unwrap());
}
if !curr.belongs_in_left(max_bounds) {
pending.push(curr.right.as_ref().unwrap());
}
}
}

Ok(evaluated)
}

fn nearest_step<'b, F>(
&self,
point: &[A],
Expand Down Expand Up @@ -557,4 +589,27 @@ mod tests {
tree.add([max], ()).unwrap();
}
}

#[test]
fn test_within_bounding_box() {
let mut tree = KdTree::with_capacity(2, 2);
for i in 0..10 {
for j in 0..10 {
let id = i.to_string() + &j.to_string();
tree.add([i as f64, j as f64], id).unwrap();
}
}

let within: Vec<String> = tree.within_bounding_box(&[4.0, 4.0], &[6.0, 6.0]).unwrap().iter().cloned().cloned().collect();
assert_eq!(within.len(), 9);
assert!(within.contains(&String::from("44")));
assert!(within.contains(&String::from("45")));
assert!(within.contains(&String::from("46")));
assert!(within.contains(&String::from("54")));
assert!(within.contains(&String::from("55")));
assert!(within.contains(&String::from("56")));
assert!(within.contains(&String::from("64")));
assert!(within.contains(&String::from("65")));
assert!(within.contains(&String::from("66")));
}
}
22 changes: 21 additions & 1 deletion src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,21 @@ where
distance(p1, &p2[..])
}

pub fn within_bounding_box<T>(p: &[T], min_bounds: &[T], max_bounds: &[T]) -> bool
where T: Float,
{
for ((l, h), v) in min_bounds.iter().zip(max_bounds.iter()).zip(p) {
if v < l || v > h {
return false;
}
}
true
}

#[cfg(test)]
mod tests {
use super::distance_to_space;
use crate::distance::squared_euclidean;
use crate::{distance::squared_euclidean, util::within_bounding_box};
use std::f64::{INFINITY, NEG_INFINITY};

#[test]
Expand Down Expand Up @@ -63,4 +74,13 @@ mod tests {
);
assert_eq!(dis, 4.0);
}

#[test]
fn test_within_bounding_box() {
assert!(within_bounding_box(&[1.0, 1.0], &[0.0, 0.0], &[2.0, 2.0]));
assert!(within_bounding_box(&[1.0, 1.0], &[1.0, 1.0], &[2.0, 2.0]));
assert!(within_bounding_box(&[1.0, 1.0], &[0.0, 0.0], &[1.0, 1.0]));
assert!(!within_bounding_box(&[2.0, 2.0], &[0.0, 0.0], &[1.0, 1.0]));
assert!(!within_bounding_box(&[0.0, 0.0], &[1.0, 1.0], &[2.0, 2.0]));
}
}