fennec-org/fennec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworked RD-Tree to behave more consistently. The construction of the tree did not allow specifying what index to insert a child at under a parent.

Browse Source 
Traverser orders were also broken, which is now fixed.
This commit is contained in:
Medusa Slockbower
2025-08-14 17:07:48 -04:00
parent f173c3e7cd
commit 2535e1ac4b
3 changed files with 171 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/tests/containers/test_rdtree.h
View File

@@ -45,7 +45,7 @@ inline void fennec_test_containers_rdtree() {
const size_t prev = rdtree<size_t>::npos;
const size_t next = test.child(parent);
size_t l;
assertf((l = test.insert(parent, i)) == i + 1, "Tree Construct Test Failed.");
assertf((l = test.insert(parent, 0, i)) == i + 1, "Tree Construct Test Failed.");
assertf(test.parent(l) == parent, "Tree Construct Test Failed.");
assertf(test.child(l) == child, "Tree Construct Test Failed.");
assertf(test.prev(l) == prev, "Tree Construct Test Failed.");
@@ -55,12 +55,12 @@ inline void fennec_test_containers_rdtree() {
test.erase(0);
size_t n1 = test.insert(npos, 1);
size_t n3 = test.insert(n1, 3);
size_t n2 = test.insert(n1, 2);
size_t n5 = test.insert(n2, 5);
size_t n4 = test.insert(n2, 4);
size_t n6 = test.insert(n3, 6);
size_t n1 = test.insert(npos, 0, 1);
size_t n2 = test.insert(n1, 0, 2);
size_t n3 = test.insert(n1, npos, 3);
size_t n4 = test.insert(n2, 0, 4);
size_t n5 = test.insert(n2, npos, 5);
size_t n6 = test.insert(n3, 0, 6);
fennec_test_run(n1 != npos, true);
fennec_test_run(n2 != npos, true);
fennec_test_run(n3 != npos, true);
@@ -73,7 +73,7 @@ inline void fennec_test_containers_rdtree() {
size_t i;
i = 0;
test.traverse<tree_t::pre_order>([&](size_t x) -> uint8_t {
test.traverse<tree_t::pre_order>([&](size_t x, size_t) -> uint8_t {
fennec_test_run(x, pre_order[i++]);
return traversal_control_continue;
});
@@ -81,7 +81,7 @@ inline void fennec_test_containers_rdtree() {
fennec_test_spacer(1);
i = 0;
test.traverse<tree_t::in_order>([&](size_t x) -> uint8_t {
test.traverse<tree_t::in_order>([&](size_t x, size_t) -> uint8_t {
fennec_test_run(x, in_order[i++]);
return traversal_control_continue;
});
@@ -89,7 +89,7 @@ inline void fennec_test_containers_rdtree() {
fennec_test_spacer(1);
i = 0;
test.traverse<tree_t::post_order>([&](size_t x) -> uint8_t {
test.traverse<tree_t::post_order>([&](size_t x, size_t) -> uint8_t {
fennec_test_run(x, post_order[i++]);
return traversal_control_continue;
});