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

Allow non-default constructor objects?

v1
Brett 2023-01-10 22:48:02 -05:00
parent e5613c8007
commit 21aa7ed6ac
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,10 @@ namespace blt {
BST_node* right = nullptr; BST_node* right = nullptr;
T payload; T payload;
explicit BST_node(const T& _payload) {
payload = _payload;
}
~BST_node() { ~BST_node() {
delete (left); delete (left);
delete (right); delete (right);
@ -52,13 +56,10 @@ namespace blt {
continue; continue;
} }
// insert into the lowest node consistent with a BST // insert into the lowest node consistent with a BST
if (element < searchNode->payload) { if (element < searchNode->payload)
searchNode->left = new BST_node(); searchNode->left = new BST_node(element);
searchNode->left->payload = element; else
} else { searchNode->right = new BST_node(element);
searchNode->right = new BST_node();
searchNode->right->payload = element;
}
return; return;
} }
} }
@ -94,7 +95,7 @@ namespace blt {
BST_node* current = root; BST_node* current = root;
while (current != nullptr || !nodeStack.isEmpty()) { while (current != nullptr || !nodeStack.isEmpty()) {
// go all the way to the left subtree // go all the way to the left subtree
while (current != nullptr){ while (current != nullptr) {
nodeStack.push(current); nodeStack.push(current);
current = current->left; current = current->left;
} }
@ -114,8 +115,7 @@ namespace blt {
inline void insert(const T& element) { inline void insert(const T& element) {
if (m_root == nullptr) { if (m_root == nullptr) {
m_root = new BST_node(); m_root = new BST_node(element);
m_root->payload = element;
return; return;
} }
insert(m_root, element); insert(m_root, element);
@ -126,35 +126,35 @@ namespace blt {
} }
void remove(const T& element) { void remove(const T& element) {
BST_node* parent {}; BST_node* parent{};
BST_node* elementNode = search(&parent, element); BST_node* elementNode = search(&parent, element);
BST_node*& parentChildSide = parent->left; BST_node*& parentChildSide = parent->left;
if (parent->right == elementNode) if (parent->right == elementNode)
parentChildSide = parent->right; parentChildSide = parent->right;
if (elementNode->left != nullptr && elementNode->right != nullptr){ if (elementNode->left != nullptr && elementNode->right != nullptr) {
parentChildSide = nullptr; parentChildSide = nullptr;
// reconstruct subtree. More efficient way of doing this... TODO // reconstruct subtree. More efficient way of doing this... TODO
std::vector<BST_node*> subNodes = inOrderTraverse(elementNode); std::vector<BST_node*> subNodes = inOrderTraverse(elementNode);
for (auto* node : subNodes){ for (auto* node : subNodes) {
// insert will create a new node, we must delete old one to prevent memory leaks // insert will create a new node, we must delete old one to prevent memory leaks
if (node != elementNode) { if (node != elementNode) {
insert(parent, node->payload); insert(parent, node->payload);
delete(node); delete (node);
} }
} }
} else { } else {
parentChildSide = elementNode->left != nullptr ? elementNode->left : elementNode->right; parentChildSide = elementNode->left != nullptr ? elementNode->left : elementNode->right;
} }
delete(elementNode); delete (elementNode);
} }
inline std::vector<BST_node*> inOrderTraverse(){ inline std::vector<BST_node*> inOrderTraverse() {
return inOrderTraverse(m_root); return inOrderTraverse(m_root);
} }
inline BST_node* debug(){ inline BST_node* debug() {
return m_root; return m_root;
} }