Skip to content

Commit c3ecba2

Browse files
authored
Merge branch 'master' into overlap_issue_tests
2 parents ee1ba4e + 05f9302 commit c3ecba2

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

tests/example_drawings.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void drawDocExample()
99
{
1010
using namespace lib_interval_tree;
1111

12-
interval_tree<int> tree;
12+
interval_tree_t<int> tree;
1313

1414
tree.insert({16, 21});
1515
tree.insert({8, 9});
@@ -22,17 +22,17 @@ void drawDocExample()
2222
tree.insert({6, 10});
2323
tree.insert({19, 20});
2424

25-
drawTree("drawings/doc_example.png", &tree, false, false);
25+
drawTree("drawings/doc_example.png", tree, false, false);
2626
}
2727

2828
void drawFromTests1()
2929
{
3030
using namespace lib_interval_tree;
3131
using namespace std::string_literals;
3232

33-
interval_tree<int> tree;
33+
interval_tree_t<int> tree;
3434

35-
std::vector <interval_tree<int>::interval_type> intervalCollection;
35+
std::vector <interval_tree_t<int>::interval_type> intervalCollection;
3636

3737
intervalCollection.push_back({-51, 11});
3838
intervalCollection.push_back({26, 68});
@@ -59,13 +59,13 @@ void drawFromTests1()
5959
for (auto const& i : intervalCollection)
6060
{
6161
tree.insert(i);
62-
drawTree("drawings/from_tests_1_"s + std::to_string(counter) + ".png", &tree, false, false);
62+
drawTree("drawings/from_tests_1_"s + std::to_string(counter) + ".png", tree, false, false);
6363
++counter;
6464
}
6565

6666
tree.deoverlap();
6767

68-
drawTree("drawings/from_tests_1_deoverlapped.png", &tree, false, false);
68+
drawTree("drawings/from_tests_1_deoverlapped.png", tree, false, false);
6969
}
7070

7171
void drawAll()

tests/find_tests.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,3 @@ TEST_F(FindTests, CanFindAllElementsBack)
101101
ASSERT_NE(tree.find(ival), std::end(tree));
102102
}
103103
}
104-
105-

tests/overlap_find_tests.hpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,4 @@ TEST_F(OverlapFindTests, WillFindSingleOverlapInBiggerTree)
149149
EXPECT_NE(iter, std::end(tree));
150150
EXPECT_EQ(iter->low(), 1000);
151151
EXPECT_EQ(iter->high(), 2000);
152-
}
153-
154-
152+
}

0 commit comments

Comments
 (0)