apaki/unicstl
1
0
Fork 0
mirror of https://gitee.com/apaki/unicstl.git synced 2025-05-17 19:41:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

迭代器：中序/后序遍历right优先测试通过

Browse Source
This commit is contained in:
建峰 2024-09-02 11:44:25 +08:00
parent e6828c2cb0
commit bd2ab13be8
2 changed files with 104 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/tree.c
View File

@ -1536,25 +1536,48 @@ void* tree_begin(struct _tree* self)
return node->obj; return node->obj;
}break; }break;
case ORDER_LEFT_IN: case ORDER_LEFT_IN:
case ORDER_RIGHT_IN:
{ {
struct _tree_node* node = NULL; struct _tree_node* node = NULL;
self->cur_node = self->_root; self->cur_node = self->_root;
self->stack->clear(self->stack); self->stack->clear(self->stack);
while (!self->stack->empty(self->stack) || self->cur_node != NULL) if (self->_order == ORDER_LEFT_IN)
{ {
if (self->cur_node != NULL) while (!self->stack->empty(self->stack) || self->cur_node != NULL)
{ {
self->stack->push(self->stack, &self->cur_node); if (self->cur_node != NULL)
self->cur_node = self->cur_node->left; {
self->stack->push(self->stack, &self->cur_node);
self->cur_node = self->cur_node->left;
}
else
{
self->stack->pop(self->stack, &self->cur_node);
// self->print_obj(self->cur_node->obj);
node = self->cur_node;
self->cur_node = self->cur_node->right;
break;
}
} }
else }
else
{
while (!self->stack->empty(self->stack) || self->cur_node != NULL)
{ {
self->stack->pop(self->stack, &self->cur_node); if (self->cur_node != NULL)
// self->print_obj(self->cur_node->obj); {
node = self->cur_node; self->stack->push(self->stack, &self->cur_node);
self->cur_node = self->cur_node->right; self->cur_node = self->cur_node->right;
break; }
else
{
self->stack->pop(self->stack, &self->cur_node);
// self->print_obj(self->cur_node->obj);
node = self->cur_node;
self->cur_node = self->cur_node->left;
break;
}
} }
} }
if (node == NULL) if (node == NULL)
@ -1564,25 +1587,47 @@ void* tree_begin(struct _tree* self)
return node->obj; return node->obj;
}break; }break;
case ORDER_LEFT_POST: case ORDER_LEFT_POST:
case ORDER_RIGHT_POST:
{ {
struct _tree_node* node = self->_root; struct _tree_node* node = self->_root;
self->stack->clear(self->stack); self->stack->clear(self->stack);
stack_t stack = stack_new(); stack_t stack = stack_new();
stack_init(stack, sizeof(struct _tree_node*)); stack_init(stack, sizeof(struct _tree_node*));
while (!stack->empty(stack) || node != NULL) if (self->_order == ORDER_LEFT_POST)
{ {
if (node != NULL) while (!stack->empty(stack) || node != NULL)
{ {
self->stack->push(self->stack, &node); if (node != NULL)
{
self->stack->push(self->stack, &node);
stack->push(stack, &node); stack->push(stack, &node);
node = node->right; node = node->right;
}
else
{
stack->pop(stack, &node);
node = node->left;
}
} }
else }
else
{
while (!stack->empty(stack) || node != NULL)
{ {
stack->pop(stack, &node); if (node != NULL)
node = node->left; {
self->stack->push(self->stack, &node);
stack->push(stack, &node);
node = node->left;
}
else
{
stack->pop(stack, &node);
node = node->right;
}
} }
} }
stack_free(&stack); stack_free(&stack);
@ -1640,14 +1685,6 @@ void* tree_begin(struct _tree* self)
} }
} }
return self->cur_node == NULL ? NULL : self->cur_node->obj; return self->cur_node == NULL ? NULL : self->cur_node->obj;
}break;
case ORDER_RIGHT_IN:
{
}break;
case ORDER_RIGHT_POST:
{
}break; }break;
default: default:
{ {
@ -1712,22 +1749,45 @@ void* tree_next(struct _tree* self)
return node->obj; return node->obj;
}break; }break;
case ORDER_LEFT_IN: case ORDER_LEFT_IN:
case ORDER_RIGHT_IN:
{ {
struct _tree_node* node = NULL; struct _tree_node* node = NULL;
while (!self->stack->empty(self->stack) || self->cur_node != NULL) if (self->_order == ORDER_LEFT_IN)
{ {
if (self->cur_node != NULL) while (!self->stack->empty(self->stack) || self->cur_node != NULL)
{ {
self->stack->push(self->stack, &self->cur_node); if (self->cur_node != NULL)
self->cur_node = self->cur_node->left; {
self->stack->push(self->stack, &self->cur_node);
self->cur_node = self->cur_node->left;
}
else
{
self->stack->pop(self->stack, &self->cur_node);
node = self->cur_node;
self->cur_node = self->cur_node->right;
break;
}
} }
else }
else
{
while (!self->stack->empty(self->stack) || self->cur_node != NULL)
{ {
self->stack->pop(self->stack, &self->cur_node); if (self->cur_node != NULL)
// self->print_obj(self->cur_node->obj); {
node = self->cur_node; self->stack->push(self->stack, &self->cur_node);
self->cur_node = self->cur_node->right; self->cur_node = self->cur_node->right;
break; }
else
{
self->stack->pop(self->stack, &self->cur_node);
node = self->cur_node;
self->cur_node = self->cur_node->left;
break;
}
} }
} }
if (node == NULL) if (node == NULL)
@ -1737,6 +1797,7 @@ void* tree_next(struct _tree* self)
return node->obj; return node->obj;
}break; }break;
case ORDER_LEFT_POST: case ORDER_LEFT_POST:
case ORDER_RIGHT_POST:
{ {
if (!self->stack->empty(self->stack)) if (!self->stack->empty(self->stack))
{ {
@ -1785,14 +1846,6 @@ void* tree_next(struct _tree* self)
self->cur_node = NULL; self->cur_node = NULL;
} }
return self->cur_node == NULL ? NULL : self->cur_node->obj; return self->cur_node == NULL ? NULL : self->cur_node->obj;
}break;
case ORDER_RIGHT_IN:
{
}break;
case ORDER_RIGHT_POST:
{
}break; }break;
default: default:
{ {

10
test/test_tree.c
View File

@ -545,7 +545,7 @@ static void test_tree_iter(void)
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array_orderpre_insert[i], buff, count); TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array_orderpre_insert[i], buff, count);
} }
for(i = 1; i < 5; i++) for(i = 1; i < 9; i++)
{ {
tree->set_order(tree, i); //ORDER_LEFT_IN tree->set_order(tree, i); //ORDER_LEFT_IN
// printf("\n ----- iter test -----\n"); // printf("\n ----- iter test -----\n");
@ -558,9 +558,10 @@ static void test_tree_iter(void)
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[i], buff, count); TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[i], buff, count);
} }
#if 0
tree->order(tree, true); tree->order(tree, true);
printf("\n\nactual data = \n"); printf("\n\nactual data = \n");
tree->preorder(tree, tree->_root); tree->postorder(tree, tree->_root);
printf("\n"); printf("\n");
// set order // set order
@ -568,7 +569,9 @@ static void test_tree_iter(void)
// tree->set_order(tree, ORDER_LEFT_IN); // tree->set_order(tree, ORDER_LEFT_IN);
// tree->set_order(tree, ORDER_LEFT_POST); // tree->set_order(tree, ORDER_LEFT_POST);
// tree->set_order(tree, ORDER_LEFT_BREADTH); // tree->set_order(tree, ORDER_LEFT_BREADTH);
tree->set_order(tree, ORDER_RIGHT_PRE); // tree->set_order(tree, ORDER_RIGHT_PRE);
// tree->set_order(tree, ORDER_RIGHT_IN);
tree->set_order(tree, ORDER_RIGHT_POST);
// tree->set_order(tree, ORDER_RIGHT_BREADTH); // tree->set_order(tree, ORDER_RIGHT_BREADTH);
printf("\n ----- iter data -----\n"); printf("\n ----- iter data -----\n");
for (count = 0, iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree)) for (count = 0, iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree))
@ -578,6 +581,7 @@ static void test_tree_iter(void)
} }
printf("\n"); printf("\n");
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[tree->_order], buff, count); TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[tree->_order], buff, count);
#endif
TEST_ASSERT_FALSE(tree->empty(tree)); TEST_ASSERT_FALSE(tree->empty(tree));
TEST_ASSERT_TRUE(tree->clear(tree)); TEST_ASSERT_TRUE(tree->clear(tree));