Skip to content

Allow 1D RTrees #169

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

Closed
grovesNL wants to merge 4 commits into from
Closed

Allow 1D RTrees #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bacf6a1
Allow 1-dimensional `RTree`s to be created
grovesNL Jun 27, 2024
9d7f730
Include 1D tuples in point test
grovesNL Jun 27, 2024
9a22a93
Add changelog entry
grovesNL Jun 27, 2024
1192d68
Still assert the dimension is non-zero
grovesNL Jun 27, 2024
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
1 change: 1 addition & 0 deletions rstar/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- Switched to unstable sort for envelopes and node reinsertion ([PR](https://github.com/georust/rstar/pull/160))
- Use a more tame value for `AABB::new_empty` to avoid overflow panics applying selections on empty trees ([PR](https://github.com/georust/rstar/pull/162))
- Avoid infinite recursion due to numerical instability when computing the number of clusters ([PR](https://github.com/georust/rstar/pull/166))
- Allow 1D `RTree`s to be created ([PR](https://github.com/georust/rstar/pull/169))

# 0.12.0

Expand Down
4 changes: 2 additions & 2 deletions rstar/src/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub fn verify_parameters<T: RTreeObject, P: RTreeParams>() {

let dimension = <T::Envelope as Envelope>::Point::DIMENSIONS;
assert!(
dimension > 1,
"Point dimension too small - must be at least 2"
dimension > 0,
"Point dimension too small - must be at least 1"
);
}
3 changes: 2 additions & 1 deletion rstar/src/point.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ mod tests {

macro_rules! test_tuple_configuration {
($($index:expr),*) => {
let a = ($($index),*);
let a = ($($index),*,);
$(assert_eq!(a.nth($index), $index));*
}
}
Expand All @@ -425,6 +425,7 @@ mod tests {
assert_eq!(long_int.nth(8), 8);

// Generate the code to test every nth function for every Tuple length
test_tuple_configuration!(0);
test_tuple_configuration!(0, 1);
test_tuple_configuration!(0, 1, 2);
test_tuple_configuration!(0, 1, 2, 3);
Expand Down