Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions include/interval-tree/interval_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -414,13 +414,15 @@ namespace lib_interval_tree
closed::overlaps(closedEquiv1.low(), closedEquiv1.high(), closedEquiv2.low(), closedEquiv2.high());
if (!closedOverlap)
{
if (closedEquiv1.high() + 1 == closedEquiv2.low() &&
if (/*closedEquiv1.high() != std::numeric_limits<interval_type::value_type>::max() && */
closedEquiv1.high() + 1 == closedEquiv2.low() &&
(ival1.right_border() == interval_border::closed_adjacent ||
ival2.left_border() == interval_border::closed_adjacent))
{
return true;
}
if (closedEquiv2.high() + 1 == closedEquiv1.low() &&
if (/*closedEquiv2.high() != std::numeric_limits<interval_type::value_type>::max() && */
closedEquiv2.high() + 1 == closedEquiv1.low() &&
(ival2.right_border() == interval_border::closed_adjacent ||
ival1.left_border() == interval_border::closed_adjacent))
{
Expand Down
56 changes: 56 additions & 0 deletions tests/interval_tests.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,62 @@ TEST_F(OverlapTests, LeftOverlapTests)
EXPECT_FALSE(i<closed_adjacent>(0, 5).overlaps({-6, -2}));
}

TEST_F(OverlapTests, LimitOverlapTests)
{
using lib_interval_tree::open;
const MIN = std::numeric_limits<int>::min();
const MAX = std::numeric_limits<int>::max();

// one min
EXPECT_TRUE(i<closed>(MIN, 5).overlaps({3, 16}));
EXPECT_TRUE(i<open>(MIN, 5).overlaps({3, 16}));
EXPECT_TRUE(i<left_open>(MIN, 5).overlaps({3, 16}));
EXPECT_TRUE(i<right_open>(MIN, 5).overlaps({3, 16}));
EXPECT_TRUE(i<closed_adjacent>(MIN, 5).overlaps({3, 16}));

// one max
EXPECT_TRUE(i<closed>(0, 5).overlaps({3, MAX}));
EXPECT_TRUE(i<open>(0, 5).overlaps({3, MAX}));
EXPECT_TRUE(i<left_open>(0, 5).overlaps({3, MAX}));
EXPECT_TRUE(i<right_open>(0, 5).overlaps({3, MAX}));
EXPECT_TRUE(i<closed_adjacent>(0, 5).overlaps({3, MAX}));

// both min
EXPECT_TRUE(i<closed>(MIN, 5).overlaps({MIN, 16}));
EXPECT_TRUE(i<open>(MIN, 5).overlaps({MIN, 16}));
EXPECT_TRUE(i<left_open>(MIN, 5).overlaps({MIN, 16}));
EXPECT_TRUE(i<right_open>(MIN, 5).overlaps({MIN, 16}));
EXPECT_TRUE(i<closed_adjacent>(MIN, 5).overlaps({MIN, 16}));

// both max
EXPECT_TRUE(i<closed>(0, MAX).overlaps({3, MAX}));
EXPECT_TRUE(i<open>(0, MAX).overlaps({3, MAX}));
EXPECT_TRUE(i<left_open>(0, MAX).overlaps({3, MAX}));
EXPECT_TRUE(i<right_open>(0, MAX).overlaps({3, MAX}));
EXPECT_TRUE(i<closed_adjacent>(0, MAX).overlaps({3, MAX}));

// min-max overlap
EXPECT_TRUE(i<closed>(0, MAX).overlaps({MIN, 3}));
EXPECT_TRUE(i<open>(0, MAX).overlaps({MIN, 3}));
EXPECT_TRUE(i<left_open>(0, MAX).overlaps({MIN, 3}));
EXPECT_TRUE(i<right_open>(0, MAX).overlaps({MIN, 3}));
EXPECT_TRUE(i<closed_adjacent>(0, MAX).overlaps({MIN, 3}));

// min-max closed overlap
EXPECT_TRUE(i<closed>(0, MAX).overlaps({MIN, 0}));
EXPECT_FALSE(i<open>(0, MAX).overlaps({MIN, 0}));
EXPECT_FALSE(i<left_open>(0, MAX).overlaps({MIN, 0}));
EXPECT_FALSE(i<right_open>(0, MAX).overlaps({MIN, 0}));
EXPECT_TRUE(i<closed_adjacent>(0, MAX).overlaps({MIN, 0}));

// min-max touching
EXPECT_FALSE(i<closed>(1, MAX).overlaps({MIN, 0}));
EXPECT_FALSE(i<open>(1, MAX).overlaps({MIN, 0}));
EXPECT_FALSE(i<left_open>(1, MAX).overlaps({MIN, 0}));
EXPECT_FALSE(i<right_open>(1, MAX).overlaps({MIN, 0}));
EXPECT_TRUE(i<closed_adjacent>(1, MAX).overlaps({MIN, 0}));
}

TEST_F(OverlapTests, ShallEncompassCompletely)
{
using lib_interval_tree::open;
Expand Down
Loading