xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

more code

This commit is contained in:
Hongze Cheng 2022-08-25 10:04:28 +08:00
parent a01ea0bed2
commit b8230d5a3e
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/util/trbtree.h
View File

@ -38,8 +38,8 @@ SRBTreeNode *tRBTreeDropByKey(SRBTree *pTree, void *pKey);
SRBTreeNode *tRBTreeGet(SRBTree *pTree, void *pKey);
// SRBTreeIter =============================================
#define tRBTreeIterCreate(tree) \
(SRBTreeIter) { .pTree = (tree), .pNode = (tree)->minNode }
#define tRBTreeIterCreate(tree, descend) \
(SRBTreeIter) { .des = (descend), .pTree = (tree), .pNode = (descend) ? (tree)->maxNode : (tree)->minNode }
SRBTreeNode *tRBTreeIterNext(SRBTreeIter *pIter);
@ -60,6 +60,7 @@ struct SRBTree {
};
struct SRBTreeIter {
int8_t des;
SRBTree *pTree;
SRBTreeNode *pNode;
};

49
source/util/src/trbtree.c
View File

@ -253,23 +253,48 @@ SRBTreeNode *tRBTreeIterNext(SRBTreeIter *pIter) {
SRBTree *pTree = pIter->pTree;
if (pIter->pNode) {
if (pIter->pNode->right) {
pIter->pNode = pIter->pNode->right;
while (pIter->pNode->left) {
if (pIter->des) {
// descend
if (pIter->pNode->left) {
pIter->pNode = pIter->pNode->left;
while (pIter->pNode->right) {
pIter->pNode = pIter->pNode->right;
}
} else {
while (true) {
if (pIter->pNode->parent) {
if (pIter->pNode == pIter->pNode->parent->right) {
pIter->pNode = pIter->pNode->parent;
break;
} else {
pIter->pNode = pIter->pNode->parent;
}
} else {
pIter->pNode = NULL;
break;
}
}
}
} else {
while (true) {
if (pIter->pNode->parent) {
if (pIter->pNode == pIter->pNode->parent->left) {
pIter->pNode = pIter->pNode->parent;
break;
// ascend
if (pIter->pNode->right) {
pIter->pNode = pIter->pNode->right;
while (pIter->pNode->left) {
pIter->pNode = pIter->pNode->left;
}
} else {
while (true) {
if (pIter->pNode->parent) {
if (pIter->pNode == pIter->pNode->parent->left) {
pIter->pNode = pIter->pNode->parent;
break;
} else {
pIter->pNode = pIter->pNode->parent;
}
} else {
pIter->pNode = pIter->pNode->parent;
pIter->pNode = NULL;
break;
}
} else {
pIter->pNode = NULL;
break;
}
}
}

2
source/util/test/trbtreeTest.cpp
View File

@ -25,7 +25,7 @@ TEST(trbtreeTest, rbtree_test1) {
tRBTreePut(&rt, pNode);
}
SRBTreeIter rti = tRBTreeIterCreate(&rt);
SRBTreeIter rti = tRBTreeIterCreate(&rt, 0);
SRBTreeNode *pNode = tRBTreeIterNext(&rti);
int la = 0;
while (pNode) {