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

BUG: spatial.cKDTree: do not slide the median #20606

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

BUG: spatial.cKDTree: do not slide the median #20606

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6ea6a4f
fix sliding midpoint problem in build.cxx
sturlamolden Apr 29, 2024
b16f6ed
full partial sort following calculation of median
sturlamolden May 8, 2024
ea4f65e
add test for gh-20605
sturlamolden May 8, 2024
c0f38eb
fix Lint error
sturlamolden May 8, 2024
6ff4cc7
temporarily disable test
sturlamolden May 8, 2024
5b30afe
remove bounds meddling hack, logic error
sturlamolden May 8, 2024
7bc7253
use taboo list for ill-behaved dimensions
sturlamolden May 8, 2024
b2d2ef7
fix missing variable declaration
sturlamolden May 8, 2024
45dc44d
turn test for gh-20605 back on
sturlamolden May 8, 2024
2304fe7
Use sliding rule also on median pivot for stability
sturlamolden May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 16 additions & 16 deletions scipy/spatial/ckdtree/src/build.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,24 +121,24 @@ build(ckdtree *self, ckdtree_intp_t start_idx, intptr_t end_idx,
split = (maxval + minval) / 2;

p = partition_pivot(indices + start_idx, indices + end_idx, split);
}

/* slide midpoint if necessary */
if (p == start_idx) {
/* no points less than split */
auto min_idx = *std::min_element(
indices + start_idx, indices + end_idx, index_compare);
split = std::nextafter(data[min_idx * m + d], HUGE_VAL);
p = partition_pivot(indices + start_idx, indices + end_idx, split);
}
else if (p == end_idx) {
/* no points greater than split */
auto max_idx = *std::max_element(
indices + start_idx, indices + end_idx, index_compare);
split = data[max_idx * m + d];
p = partition_pivot(indices + start_idx, indices + end_idx, split);
/* slide midpoint if necessary */
if (p == start_idx) {
/* no points less than split */
auto min_idx = *std::min_element(
indices + start_idx, indices + end_idx, index_compare);
split = std::nextafter(data[min_idx * m + d], HUGE_VAL);
p = partition_pivot(indices + start_idx, indices + end_idx, split);
}
else if (p == end_idx) {
/* no points greater than split */
auto max_idx = *std::max_element(
indices + start_idx, indices + end_idx, index_compare);
split = data[max_idx * m + d];
p = partition_pivot(indices + start_idx, indices + end_idx, split);
}
}

if (CKDTREE_UNLIKELY(p == start_idx || p == end_idx)) {
// All children are equal in this dimension, try again with new bounds
assert(!_compact);
Expand Down