tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix delete function for dual children nodes

v1
Brett 2023-01-12 23:11:17 -05:00
parent 4b89ec2ee1
commit 4a5c1799ce
4 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/blt/profiling/profiler.h
View File

@ -73,6 +73,15 @@ namespace blt {
cyclicPoints.push(CapturePoint{name, System::getCurrentTimeNanoseconds()});
}
};
class Profiler {
private:
public:
};
void createProfiler(Profiler* profiler);
}
#endif //BLT_PROFILER_H

48
include/blt/std/binary_tree.h
View File

@ -156,15 +156,40 @@ namespace blt {
parent = nullptr;
if (elementNode->left != nullptr && elementNode->right != nullptr) {
BST_node* inOrderSuccessor = elementNode->left != nullptr ? elementNode->left : elementNode->right;
BST_node* inOrderSuccessorParent = nullptr;
// go all the way to the left subtree
while (inOrderSuccessor->left != nullptr) {
inOrderSuccessorParent = inOrderSuccessor;
inOrderSuccessor = inOrderSuccessor->left;
auto traverseNodes = inOrderTraverse(elementNode);
if (parent == nullptr) {
m_root = nullptr;
} else {
if (parent->right == elementNode)
parent->right = nullptr;
else if (parent->left == elementNode)
parent->left = nullptr;
else
throw binary_search_tree_error("Parent node doesn't own child!\n");
}
for (auto* node : traverseNodes) {
if (node != elementNode) {
if (parent == nullptr) {
insert(node->payload);
} else
insert(parent, node->payload);
delete(node);
}
}
/*BST_node* inOrderSuccessor = elementNode->right;
BST_node* inOrderSuccessorParent = nullptr;
while (true){
// go all the way to the left subtree
while (inOrderSuccessor->left != nullptr) {
inOrderSuccessorParent = inOrderSuccessor;
inOrderSuccessor = inOrderSuccessor->left;
}
if (inOrderSuccessor->right != nullptr) {
inOrderSuccessorParent = inOrderSuccessor;
inOrderSuccessor = inOrderSuccessor->right;
} else
break;
}
// make sure we maintain the tree structure if our moving node has a subtree
BST_node* inOrderSuccessorReplacement = inOrderSuccessor->right != nullptr ? inOrderSuccessor->right : nullptr;
if (parent != nullptr) {
if (parent->right == elementNode)
@ -179,14 +204,15 @@ namespace blt {
inOrderSuccessor->left = elementNode->left;
inOrderSuccessor->right = elementNode->right;
// delete the parent's reference to the moved node
if (inOrderSuccessorParent != nullptr){
if (inOrderSuccessorParent != nullptr) {
if (inOrderSuccessorParent->left == inOrderSuccessor)
inOrderSuccessorParent->left = inOrderSuccessorReplacement;
inOrderSuccessorParent->left = nullptr;
else if (inOrderSuccessorParent->right == inOrderSuccessor)
inOrderSuccessorParent->right = inOrderSuccessorReplacement;
inOrderSuccessorParent->right = nullptr;
else
throw binary_search_tree_error("Parent does not contain child!\n");
}
rebalance(parent);*/
} else {
auto replacementNode = elementNode->left != nullptr ? elementNode->left : elementNode->right;
if (parent == nullptr)

2
src/blt/profiling/profiler.cpp
View File

@ -6,5 +6,7 @@
#include <blt/profiling/profiler.h>
namespace blt {
void createProfiler(Profiler* profiler) {
}
}

2
src/tests/binary_trees.h
View File

@ -32,7 +32,7 @@ void binaryTreeTest(){
auto searchedNode = dataTree.search(10);
std::cout << "10's children: "<< searchedNode->left->payload << ", " << searchedNode->right->payload << "\n";
dataTree.remove(10);
dataTree.remove(6);
printBinaryTree(dataTree);