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.

Sign up for GitHub

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

Jump to bottom

Fix overlap algorithm #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix overlap algorithm #7

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f24868b
Fix test implementation and add tests
jmlMetaswitch Jan 10, 2018
5854fe8
Fix slice coercion warnings
jmlMetaswitch Jan 10, 2018
41d8cc9
Expand tests to pick up previous bug
jmlMetaswitch Jan 10, 2018
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
46 changes: 32 additions & 14 deletions src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use self::test::Bencher;
use self::rand::{random, XorShiftRng, Rng};

use self::fixtures::{QuadTreeRegion, Vec2};
use {NTree, Region};
use NTree;

#[test]
fn test_contains() {
Expand All @@ -23,7 +23,8 @@ fn test_contains() {
fn test_insert() {
let mut ntree = NTree::new(QuadTreeRegion::square(0.0, 0.0, 100.0), 4);
assert!(ntree.insert(Vec2 { x: 50.0, y: 50.0 }));
assert_eq!(ntree.nearby(&Vec2 { x: 40.0, y: 40.0 }), Some(&[Vec2 { x: 50.0, y: 50.0 }] as &[_]));
let points = [Vec2 { x: 50.0, y: 50.0 }];
assert_eq!(ntree.nearby(&Vec2 { x: 40.0, y: 40.0 }), Some(&points[..]));
}

#[test]
Expand All @@ -45,19 +46,23 @@ fn test_nearby() {
ntree.insert(Vec2 { x: 80.0, y: 20.0 });

// Bottom left corner
let points = [Vec2 { x: 30.0, y: 30.0 },
Vec2 { x: 20.0, y: 20.0 },
Vec2 { x: 10.0, y: 10.0 }];
assert_eq!(ntree.nearby(&Vec2 { x: 40.0, y: 40.0 }),
Some(&[Vec2 { x: 30.0, y: 30.0 },
Vec2 { x: 20.0, y: 20.0 },
Vec2 { x: 10.0, y: 10.0 }] as &[_]));
Some(&points[..]));

// Top right corner
assert_eq!(ntree.nearby(&Vec2 { x: 90.0, y: 90.0 }), Some(&[Vec2 { x: 75.0, y: 75.0 }] as &[_]));
let points = [Vec2 { x: 75.0, y: 75.0 }];
assert_eq!(ntree.nearby(&Vec2 { x: 90.0, y: 90.0 }), Some(&points[..]));

// Top left corner
assert_eq!(ntree.nearby(&Vec2 { x: 20.0, y: 80.0 }), Some(&[Vec2 { x: 40.0, y: 70.0 }] as &[_]));
let points = [Vec2 { x: 40.0, y: 70.0 }];
assert_eq!(ntree.nearby(&Vec2 { x: 20.0, y: 80.0 }), Some(&points[..]));

// Bottom right corner
assert_eq!(ntree.nearby(&Vec2 { x: 94.0, y: 12.0 }), Some(&[Vec2 { x: 80.0, y: 20.0 }] as &[_]));
let points = [Vec2 { x: 80.0, y: 20.0 }];
assert_eq!(ntree.nearby(&Vec2 { x: 94.0, y: 12.0 }), Some(&points[..]));
}

#[test]
Expand Down Expand Up @@ -122,7 +127,7 @@ fn bench_range_query_large(b: &mut Bencher) {
}

mod fixtures {
use {Region};
use Region;

#[derive(Clone, Debug, PartialEq)]
pub struct QuadTreeRegion {
Expand Down Expand Up @@ -183,11 +188,11 @@ mod fixtures {
}

fn overlaps(&self, other: &QuadTreeRegion) -> bool {
other.contains(&Vec2 { x: self.x, y: self.y })
|| other.contains(&Vec2 { x: self.x + self.width, y: self.y })
|| other.contains(&Vec2 { x: self.x, y: self.y + self.height })
|| other.contains(&Vec2 { x: self.x + self.width, y: self.y + self.height })
}
self.x < other.x + other.width &&
self.x + self.width > other.x &&
self.y < other.y + other.height &&
self.y + self.height > other.y
}
}

#[test]
Expand All @@ -197,7 +202,20 @@ mod fixtures {

#[test]
fn test_overlaps() {
// Simple overlaps with corners in the other region
assert!(QuadTreeRegion::square(0.0, 0.0, 100.0).overlaps(&QuadTreeRegion::square(50.0, 50.0, 100.0)));
assert!(QuadTreeRegion::square(0.0, 0.0, 100.0).overlaps(&QuadTreeRegion::square(50.0, -50.0, 100.0)));
// Overlaps with no corners of one in the other region
assert!(QuadTreeRegion::square(0.0, 0.0, 100.0).overlaps(&QuadTreeRegion::square(50.0, -50.0, 200.0)));
assert!(QuadTreeRegion::square(50.0, -50.0, 200.0).overlaps(&QuadTreeRegion::square(0.0, 0.0, 100.0)));
// Overlap with no corner in the other region
assert!(QuadTreeRegion { x:0.0, y: 50.0, width: 200.0, height: 10.0 }
.overlaps(&QuadTreeRegion { x: 50.0, y: 0.0, width: 10.0, height: 200.0 }));
// No overlap
assert!(!QuadTreeRegion::square(0.0, 0.0, 100.0).overlaps(&QuadTreeRegion::square(300.0, -200.0, 100.0)));
assert!(!QuadTreeRegion::square(0.0, 0.0, 100.0).overlaps(&QuadTreeRegion::square(0.0, -200.0, 100.0)));
// Abutting counts as no overlap
assert!(!QuadTreeRegion::square(0.0, 0.0, 100.0).overlaps(&QuadTreeRegion::square(0.0, 100.0, 100.0)));
}

#[test]
Expand Down