Skip to content

Eliminate redundant branch checks #57

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

Merged
merged 1 commit into from
Aug 29, 2025
Merged

Eliminate redundant branch checks #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 4 additions & 40 deletions include/interval-tree/interval_tree.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,20 +1773,12 @@ namespace lib_interval_tree
}
if (ptr->left_ && ival.high() <= ptr->left_->max())
{
// no right? can only continue left
if (!ptr->right_ || ival.low() > ptr->right_->max())
return find_all_i<ThisType, IteratorT>(self, ptr->left_, ival, on_find, compare);

if (!find_all_i<ThisType, IteratorT>(self, ptr->left_, ival, on_find, compare))
return false;
}
if (ptr->right_ && ival.high() <= ptr->right_->max())
{
if (!ptr->left_ || ival.low() > ptr->left_->max())
return find_all_i<ThisType, IteratorT>(self, ptr->right_, ival, on_find, compare);

if (!find_all_i<ThisType, IteratorT>(self, ptr->right_, ival, on_find, compare))
return false;
return find_all_i<ThisType, IteratorT>(self, ptr->right_, ival, on_find, compare);
}
return true;
}
Expand All @@ -1807,22 +1799,13 @@ namespace lib_interval_tree
{
if (ptr->left_ && ival.high() <= ptr->left_->max())
{
// no right? can only continue left
if (!ptr->right_ || ival.low() > ptr->right_->max())
return find_i(ptr->left_, ival, compare);

auto* res = find_i(ptr->left_, ival, compare);
if (res != nullptr)
return res;
}
if (ptr->right_ && ival.high() <= ptr->right_->max())
{
if (!ptr->left_ || ival.low() > ptr->left_->max())
return find_i(ptr->right_, ival, compare);

auto* res = find_i(ptr->right_, ival, compare);
if (res != nullptr)
return res;
return find_i(ptr->right_, ival, compare);
}
return nullptr;
}
Expand Down Expand Up @@ -1884,21 +1867,12 @@ namespace lib_interval_tree
}
if (ptr->left_ && ptr->left_->max() >= ival.low())
{
// no right? can only continue left
// or interval low is bigger than max of right branch.
if (!ptr->right_ || ival.low() > ptr->right_->max())
return overlap_find_all_i<ThisType, Exclusive, IteratorT>(self, ptr->left_, ival, on_find);

if (!overlap_find_all_i<ThisType, Exclusive, IteratorT>(self, ptr->left_, ival, on_find))
return false;
}
if (ptr->right_ && ptr->right_->max() >= ival.low())
{
if (!ptr->left_ || ival.low() > ptr->right_->max())
return overlap_find_all_i<ThisType, Exclusive, IteratorT>(self, ptr->right_, ival, on_find);

if (!overlap_find_all_i<ThisType, Exclusive, IteratorT>(self, ptr->right_, ival, on_find))
return false;
return overlap_find_all_i<ThisType, Exclusive, IteratorT>(self, ptr->right_, ival, on_find);
}
return true;
}
Expand All @@ -1909,23 +1883,13 @@ namespace lib_interval_tree
{
if (ptr->left_ && ptr->left_->max() >= ival.low())
{
// no right? can only continue left
// or upper bounds higher than what is contained right? continue left.
if (!ptr->right_ || ival.low() > ptr->right_->max())
return overlap_find_i<Exclusive>(ptr->left_, ival);

auto* res = overlap_find_i<Exclusive>(ptr->left_, ival);
if (res != nullptr)
return res;
}
if (ptr->right_ && ptr->right_->max() >= ival.low())
{
if (!ptr->left_ || ival.low() > ptr->left_->max())
return overlap_find_i<Exclusive>(ptr->right_, ival);

auto* res = overlap_find_i<Exclusive>(ptr->right_, ival);
if (res != nullptr)
return res;
return overlap_find_i<Exclusive>(ptr->right_, ival);
}
return nullptr;
}
Expand Down
Loading