godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10748 from Cradmon/fixCoreSet

Browse Source 
Refactor core/set.h
This commit is contained in:
Rémi Verschelde 2017-09-19 23:47:39 +02:00 committed by GitHub
commit 593511b2b8
1 changed files with 126 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

225
core/set.h
View File

@ -135,7 +135,6 @@ private:
#ifdef GLOBALNIL_DISABLED #ifdef GLOBALNIL_DISABLED
memdelete_allocator<Element, A>(_nil); memdelete_allocator<Element, A>(_nil);
#endif #endif
//memdelete_allocator<Element,A>(_root);
} }
}; };
@ -146,6 +145,7 @@ private:
ERR_FAIL_COND(p_node == _data._nil && p_color == RED); ERR_FAIL_COND(p_node == _data._nil && p_color == RED);
p_node->color = p_color; p_node->color = p_color;
} }
inline void _rotate_left(Element *p_node) { inline void _rotate_left(Element *p_node) {
Element *r = p_node->right; Element *r = p_node->right;
@ -194,8 +194,9 @@ private:
while (node == node->parent->right) { while (node == node->parent->right) {
node = node->parent; node = node->parent;
} }
if (node->parent == _data._root) if (node->parent == _data._root)
return NULL; return NULL; // No successor, as p_node is the last node.
return node->parent; return node->parent;
} }
} }
@ -213,11 +214,11 @@ private:
} else { } else {
while (node == node->parent->left) { while (node == node->parent->left) {
if (node->parent == _data._root)
return NULL;
node = node->parent; node = node->parent;
} }
if (node == _data._root)
return NULL; // No predecessor, as p_node is the first node.
return node->parent; return node->parent;
} }
} }
@ -228,16 +229,15 @@ private:
C less; C less;
while (node != _data._nil) { while (node != _data._nil) {
if (less(p_value, node->value)) if (less(p_value, node->value))
node = node->left; node = node->left;
else if (less(node->value, p_value)) else if (less(node->value, p_value))
node = node->right; node = node->right;
else else
break; // found return node; // found
} }
return (node != _data._nil) ? node : NULL; return NULL;
} }
Element *_lower_bound(const T &p_value) const { Element *_lower_bound(const T &p_value) const {
@ -254,21 +254,16 @@ private:
else if (less(node->value, p_value)) else if (less(node->value, p_value))
node = node->right; node = node->right;
else else
break; // found return node; // found
} }
if (node == _data._nil) {
if (prev == NULL) if (prev == NULL)
return NULL; return NULL; // tree empty
if (less(prev->value, p_value)) {
if (less(prev->value, p_value))
prev = prev->_next; prev = prev->_next;
}
return prev; return prev;
} else
return node;
} }
Element *_insert(const T &p_value, bool &r_exists) { Element *_insert(const T &p_value, bool &r_exists) {
@ -291,22 +286,21 @@ private:
} }
} }
Element *new_node = memnew_allocator(Element, A); r_exists = false;
Element *new_node = memnew_allocator(Element, A);
new_node->parent = new_parent; new_node->parent = new_parent;
new_node->right = _data._nil; new_node->right = _data._nil;
new_node->left = _data._nil; new_node->left = _data._nil;
new_node->value = p_value; new_node->value = p_value;
//new_node->data=_data; //new_node->data=_data;
if (new_parent == _data._root || less(p_value, new_parent->value)) {
if (new_parent == _data._root || less(p_value, new_parent->value)) {
new_parent->left = new_node; new_parent->left = new_node;
} else { } else {
new_parent->right = new_node; new_parent->right = new_node;
} }
r_exists = false;
new_node->_next = _successor(new_node); new_node->_next = _successor(new_node);
new_node->_prev = _predecessor(new_node); new_node->_prev = _predecessor(new_node);
if (new_node->_next) if (new_node->_next)
@ -324,144 +318,152 @@ private:
if (exists) if (exists)
return new_node; return new_node;
Element *node = new_node;
_data.size_cache++; _data.size_cache++;
Element *node = new_node;
Element *nparent = node->parent;
Element *ngrand_parent;
while (node->parent->color == RED) { while (nparent->color == RED) {
if (node->parent == node->parent->parent->left) { ngrand_parent = nparent->parent;
Element *aux = node->parent->parent->right; if (nparent == ngrand_parent->left) {
if (ngrand_parent->right->color == RED) {
if (aux->color == RED) { _set_color(nparent, BLACK);
_set_color(node->parent, BLACK); _set_color(ngrand_parent->right, BLACK);
_set_color(aux, BLACK); _set_color(ngrand_parent, RED);
_set_color(node->parent->parent, RED); node = ngrand_parent;
node = node->parent->parent; nparent = node->parent;
} else { } else {
if (node == node->parent->right) { if (node == nparent->right) {
node = node->parent; _rotate_left(nparent);
_rotate_left(node); node = nparent;
nparent = node->parent;
} }
_set_color(node->parent, BLACK); _set_color(nparent, BLACK);
_set_color(node->parent->parent, RED); _set_color(ngrand_parent, RED);
_rotate_right(node->parent->parent); _rotate_right(ngrand_parent);
} }
} else { } else {
Element *aux = node->parent->parent->left; if (ngrand_parent->left->color == RED) {
_set_color(nparent, BLACK);
if (aux->color == RED) { _set_color(ngrand_parent->left, BLACK);
_set_color(node->parent, BLACK); _set_color(ngrand_parent, RED);
_set_color(aux, BLACK); node = ngrand_parent;
_set_color(node->parent->parent, RED); nparent = node->parent;
node = node->parent->parent;
} else { } else {
if (node == node->parent->left) { if (node == nparent->left) {
node = node->parent; _rotate_right(nparent);
_rotate_right(node); node = nparent;
nparent = node->parent;
} }
_set_color(node->parent, BLACK); _set_color(nparent, BLACK);
_set_color(node->parent->parent, RED); _set_color(ngrand_parent, RED);
_rotate_left(node->parent->parent); _rotate_left(ngrand_parent);
} }
} }
} }
_set_color(_data._root->left, BLACK); _set_color(_data._root->left, BLACK);
return new_node; return new_node;
} }
void _erase_fix(Element *p_node) { void _erase_fix(Element *p_node) {
Element *root = _data._root->left; Element *root = _data._root->left;
Element *node = p_node; Element *node = _data._nil;
Element *sibling = p_node;
Element *parent = sibling->parent;
while ((node->color == BLACK) && (root != node)) { while (node != root) { // If red node found, will exit at a break
if (node == node->parent->left) { if (sibling->color == RED) {
Element *aux = node->parent->right; _set_color(sibling, BLACK);
if (aux->color == RED) { _set_color(parent, RED);
_set_color(aux, BLACK); if (sibling == parent->right) {
_set_color(node->parent, RED); sibling = sibling->left;
_rotate_left(node->parent); _rotate_left(parent);
aux = node->parent->right;
}
if ((aux->right->color == BLACK) && (aux->left->color == BLACK)) {
_set_color(aux, RED);
node = node->parent;
} else { } else {
if (aux->right->color == BLACK) { sibling = sibling->right;
_set_color(aux->left, BLACK); _rotate_right(parent);
_set_color(aux, RED);
_rotate_right(aux);
aux = node->parent->right;
} }
_set_color(aux, node->parent->color);
_set_color(node->parent, BLACK);
_set_color(aux->right, BLACK);
_rotate_left(node->parent);
node = root; /* this is to exit while loop */
} }
} else { /* the code below is has left and right switched from above */ if ((sibling->left->color == BLACK) && (sibling->right->color == BLACK)) {
Element *aux = node->parent->left; _set_color(sibling, RED);
if (aux->color == RED) { if (parent->color == RED) {
_set_color(aux, BLACK); _set_color(parent, BLACK);
_set_color(node->parent, RED); break;
_rotate_right(node->parent); } else { // loop: haven't found any red nodes yet
aux = node->parent->left; node = parent;
parent = node->parent;
sibling = (node == parent->left) ? parent->right : parent->left;
} }
if ((aux->right->color == BLACK) && (aux->left->color == BLACK)) {
_set_color(aux, RED);
node = node->parent;
} else { } else {
if (aux->left->color == BLACK) { if (sibling == parent->right) {
_set_color(aux->right, BLACK); if (sibling->right->color == BLACK) {
_set_color(aux, RED); _set_color(sibling->left, BLACK);
_rotate_left(aux); _set_color(sibling, RED);
aux = node->parent->left; _rotate_right(sibling);
} sibling = sibling->parent;
_set_color(aux, node->parent->color);
_set_color(node->parent, BLACK);
_set_color(aux->left, BLACK);
_rotate_right(node->parent);
node = root;
}
} }
_set_color(sibling, parent->color);
_set_color(parent, BLACK);
_set_color(sibling->right, BLACK);
_rotate_left(parent);
break;
} else {
if (sibling->left->color == BLACK) {
_set_color(sibling->right, BLACK);
_set_color(sibling, RED);
_rotate_left(sibling);
sibling = sibling->parent;
} }
_set_color(node, BLACK); _set_color(sibling, parent->color);
_set_color(parent, BLACK);
_set_color(sibling->left, BLACK);
_rotate_right(parent);
break;
}
}
}
ERR_FAIL_COND(_data._nil->color != BLACK); ERR_FAIL_COND(_data._nil->color != BLACK);
} }
void _erase(Element *p_node) { void _erase(Element *p_node) {
Element *rp = ((p_node->left == _data._nil) || (p_node->right == _data._nil)) ? p_node : _successor(p_node); Element *rp = ((p_node->left == _data._nil) || (p_node->right == _data._nil)) ? p_node : p_node->_next;
if (!rp)
rp = _data._nil;
Element *node = (rp->left == _data._nil) ? rp->right : rp->left; Element *node = (rp->left == _data._nil) ? rp->right : rp->left;
node->parent = rp->parent; node->parent = rp->parent;
if (_data._root == node->parent) { Element *sibling;
_data._root->left = node;
} else {
if (rp == rp->parent->left) { if (rp == rp->parent->left) {
rp->parent->left = node; rp->parent->left = node;
sibling = rp->parent->right;
} else { } else {
rp->parent->right = node; rp->parent->right = node;
sibling = rp->parent->left;
} }
if (node->color == RED) {
node->parent = rp->parent;
_set_color(node, BLACK);
} else if (rp->color == BLACK && rp->parent != _data._root) {
_erase_fix(sibling);
} }
if (rp != p_node) { if (rp != p_node) {
ERR_FAIL_COND(rp == _data._nil); ERR_FAIL_COND(rp == _data._nil);
if (rp->color == BLACK)
_erase_fix(node);
rp->left = p_node->left; rp->left = p_node->left;
rp->right = p_node->right; rp->right = p_node->right;
rp->parent = p_node->parent; rp->parent = p_node->parent;
rp->color = p_node->color; rp->color = p_node->color;
if (p_node->left != _data._nil)
p_node->left->parent = rp; p_node->left->parent = rp;
if (p_node->right != _data._nil)
p_node->right->parent = rp; p_node->right->parent = rp;
if (p_node == p_node->parent->left) { if (p_node == p_node->parent->left) {
@ -469,9 +471,6 @@ private:
} else { } else {
p_node->parent->right = rp; p_node->parent->right = rp;
} }
} else {
if (p_node->color == BLACK)
_erase_fix(node);
} }
if (p_node->_next) if (p_node->_next)
@ -529,6 +528,7 @@ public:
if (!_data._root) if (!_data._root)
return NULL; return NULL;
Element *res = _find(p_value); Element *res = _find(p_value);
return res; return res;
} }
@ -549,8 +549,9 @@ public:
void erase(Element *p_element) { void erase(Element *p_element) {
if (!_data._root) if (!_data._root || !p_element)
return; return;
_erase(p_element); _erase(p_element);
if (_data.size_cache == 0 && _data._root) if (_data.size_cache == 0 && _data._root)
_data._free_root(); _data._free_root();
@ -560,9 +561,11 @@ public:
if (!_data._root) if (!_data._root)
return false; return false;
Element *e = find(p_value); Element *e = find(p_value);
if (!e) if (!e)
return false; return false;
_erase(e); _erase(e);
if (_data.size_cache == 0 && _data._root) if (_data.size_cache == 0 && _data._root)
_data._free_root(); _data._free_root();
@ -573,6 +576,7 @@ public:
if (!_data._root) if (!_data._root)
return NULL; return NULL;
Element *e = _data._root->left; Element *e = _data._root->left;
if (e == _data._nil) if (e == _data._nil)
return NULL; return NULL;
@ -587,6 +591,7 @@ public:
if (!_data._root) if (!_data._root)
return NULL; return NULL;
Element *e = _data._root->left; Element *e = _data._root->left;
if (e == _data._nil) if (e == _data._nil)
return NULL; return NULL;
@ -603,10 +608,12 @@ public:
} }
inline int size() const { return _data.size_cache; } inline int size() const { return _data.size_cache; }
int calculate_depth() const { int calculate_depth() const {
// used for debug mostly // used for debug mostly
if (!_data._root) if (!_data._root)
return 0; return 0;
int max_d = 0; int max_d = 0;
_calculate_depth(_data._root->left, max_d, 0); _calculate_depth(_data._root->left, max_d, 0);
return max_d; return max_d;
@ -620,7 +627,6 @@ public:
_cleanup_tree(_data._root->left); _cleanup_tree(_data._root->left);
_data._root->left = _data._nil; _data._root->left = _data._nil;
_data.size_cache = 0; _data.size_cache = 0;
_data._nil->parent = _data._nil;
_data._free_root(); _data._free_root();
} }
@ -633,6 +639,7 @@ public:
_copy_from(p_set); _copy_from(p_set);
} }
_FORCE_INLINE_ Set() { _FORCE_INLINE_ Set() {
} }