Skip to content

Allow user-defined structs as keys to the interval tree #31

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

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

Allow user-defined structs as keys to the interval tree #31

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ae2ed5
allow user defined structs
PankajBhojwani Oct 1, 2020
cc610c9
small fix
PankajBhojwani Oct 1, 2020
0f97e94
qol
PankajBhojwani Oct 5, 2020
9f4d488
equality redundancy
PankajBhojwani Oct 5, 2020
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
32 changes: 25 additions & 7 deletions IntervalTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,24 @@ class Interval {
, stop(std::max(s, e))
, value(v)
{}

Interval()
{
}

constexpr bool operator==(const Interval& other) const noexcept
{
return start == other.start &&
stop == other.stop &&
value == other.value;
}

constexpr bool operator!=(const Interval& other) const noexcept
{
return start != other.start ||
stop != other.stop ||
value != other.value;
}
};

template <class Scalar, typename Value>
Expand Down Expand Up @@ -61,7 +79,7 @@ class IntervalTree {
IntervalTree()
: left(nullptr)
, right(nullptr)
, center(0)
, center()
{}

~IntervalTree() = default;
Expand Down Expand Up @@ -93,8 +111,8 @@ class IntervalTree {
std::size_t depth = 16,
std::size_t minbucket = 64,
std::size_t maxbucket = 512,
Scalar leftextent = 0,
Scalar rightextent = 0)
Scalar leftextent = {},
Scalar rightextent = {})
: left(nullptr)
, right(nullptr)
{
Expand All @@ -106,7 +124,7 @@ class IntervalTree {
if (!ivals.empty()) {
center = (minmaxStart.first->start + minmaxStop.second->stop) / 2;
}
if (leftextent == 0 && rightextent == 0) {
if (leftextent == Scalar{} && rightextent == Scalar{}) {
// sort intervals by start
std::sort(ivals.begin(), ivals.end(), IntervalStartCmp());
} else {
Expand All @@ -118,10 +136,10 @@ class IntervalTree {
assert(is_valid().first);
return;
} else {
Scalar leftp = 0;
Scalar rightp = 0;
Scalar leftp = Scalar{};
Scalar rightp = Scalar{};

if (leftextent || rightextent) {
if (leftextent != Scalar{} || rightextent != Scalar{}) {
leftp = leftextent;
rightp = rightextent;
} else {
Expand Down