ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding more tests for interval tree

Browse source
This commit is contained in:
IlyaShurupov 2024-02-14 10:50:01 +03:00
parent a3399fdc56
commit 7d8cf66b27
2 changed files with 68 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Containers/public/IntervalTree.hpp
View file

@ -65,8 +65,8 @@ namespace tp {
forEachIntersectionUtil(node->mLeft, start, end, functor, debug); forEachIntersectionUtil(node->mLeft, start, end, functor, debug);
// Check this node // Check this node
if (start < node->key.mEnd && end > node->key.mStart) { if (start <= node->key.mEnd && end >= node->key.mStart) {
functor(node->data); functor(node->key.mStart, node->key.mEnd, node->data);
} }
// If end is to the left of the start of this interval, // If end is to the left of the start of this interval,

74
Containers/tests/IntervalTreeTests.cpp
View file

@ -42,7 +42,7 @@ TEST_DEF_STATIC(FunctionalitySimple) {
intervalTree.insert({ 3, 6 }, 2); intervalTree.insert({ 3, 6 }, 2);
intervalTree.insert({ 8, 12 }, 3); intervalTree.insert({ 8, 12 }, 3);
intervalTree.forEachIntersection(4, 5, [](ualni data) { intervalTree.forEachIntersection(4, 5, [](alni start, ualni end, ualni data) {
printf("%i", int(data)); printf("%i", int(data));
printf("\n"); printf("\n");
}); });
@ -72,7 +72,7 @@ TEST_DEF_STATIC(FunctionalityScale) {
idx++; idx++;
} }
intervalTree.forEachIntersection(testInterval->start, testInterval->end, [&](ualni data) { intervalTree.forEachIntersection(testInterval->start, testInterval->end, [&](alni start, ualni end, ualni data) {
result.append(data); result.append(data);
}); });
@ -129,7 +129,7 @@ TEST_DEF_STATIC(Efficency) {
}; };
auto test = [&](ualni NUM_TEST_INTERVALS, ualni NUM_CHECKS) { auto test = [&](ualni NUM_TEST_INTERVALS, ualni NUM_CHECKS) {
const auto SPAN = (halnf) (halnf(NUM_TEST_INTERVALS)) * 0 + 1000; const auto SPAN = (halnf) (halnf(NUM_TEST_INTERVALS));
const auto SCALE = (halnf) (2.f); const auto SCALE = (halnf) (2.f);
IntervalTree<halnf, ualni> intervalTree; IntervalTree<halnf, ualni> intervalTree;
@ -160,10 +160,14 @@ TEST_DEF_STATIC(Efficency) {
for (auto testInterval : testIntervals) { for (auto testInterval : testIntervals) {
ualni debugFound = 0; ualni debugFound = 0;
ualni debug = intervalTree.forEachIntersection(testInterval->start, testInterval->end, [&](ualni data) { ualni debug = intervalTree.forEachIntersection(
debugFound++; testInterval->start,
// testInterval->end,
}); [&](ualni start, ualni end, ualni data) {
debugFound++;
//
}
);
if (debug > debugMaxChecks) { if (debug > debugMaxChecks) {
debugMaxChecks = debug; debugMaxChecks = debug;
@ -213,11 +217,63 @@ TEST_DEF_STATIC(Efficency) {
printf("\n\n"); printf("\n\n");
} }
TEST_DEF_STATIC(Benchmarks) {} TEST_DEF_STATIC(FunctionalityComplex) {
IntervalTree<ualni, ualni> intervals;
struct QueryResult {
ualni numFound = 0;
ualni lastDataFound = 0;
[[nodiscard]] bool isSingleData(ualni aData) const { return numFound == 1 & lastDataFound == aData; }
[[nodiscard]] bool notFound() const { return numFound == 0; }
[[nodiscard]] bool found(ualni num) const { return numFound == num; }
};
auto makeQuery = [&](ualni aStart, ualni aEnd) {
QueryResult out;
intervals.forEachIntersection(aStart, aEnd, [&](alni start, ualni end, ualni data) {
out.numFound++;
out.lastDataFound = data;
});
return out;
};
intervals.insert({ 2, 5 }, 1);
intervals.insert({ 12, 15 }, 2);
intervals.insert({ 22, 25 }, 3);
TEST(makeQuery(1, 6).isSingleData(1));
TEST(makeQuery(1, 3).isSingleData(1));
TEST(makeQuery(3, 6).isSingleData(1));
TEST(makeQuery(0, 1).notFound());
TEST(makeQuery(7, 8).notFound());
TEST(makeQuery(3, 4).isSingleData(1));
TEST(makeQuery(13, 14).isSingleData(2));
TEST(makeQuery(1, 35).found(3));
TEST(makeQuery(11, 35).found(2));
// check opened
TEST(makeQuery(5, 12).found(2));
TEST(makeQuery(15, 22).found(2));
TEST(makeQuery(1, 2).isSingleData(1));
TEST(makeQuery(25, 35).isSingleData(3));
intervals.removeAll();
intervals.insert({ 0, 3 }, 1);
intervals.insert({ 0, 13 }, 2);
TEST(makeQuery(0, 1).found(2));
}
TEST_DEF(IntervalTree) { TEST_DEF(IntervalTree) {
testFunctionalitySimple(); testFunctionalitySimple();
testFunctionalityScale(); testFunctionalityScale();
testEfficency(); testEfficency();
testBenchmarks(); testFunctionalityComplex();
} }