apaki/unicstl
1
0
Fork 0
mirror of https://gitee.com/apaki/unicstl.git synced 2025-05-18 03:51:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

迭代器：后续遍历测试通过

Browse Source
This commit is contained in:
建峰 2024-09-02 11:04:11 +08:00
parent 36707a4b72
commit feffd2b3c7
2 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/tree.c
View File

@ -1538,7 +1538,35 @@ void* tree_begin(struct _tree* self)
}break;
case ORDER_LEFT_POST:
{
struct _tree_node* node = self->_root;
stack_t stack = stack_new();
stack_init(stack, sizeof(struct _tree_node*));
while(!stack->empty(stack) || node != NULL)
{
if(node != NULL)
{
self->stack->push(self->stack, &node);
stack->push(stack, &node);
node = node->right;
}
else
{
stack->pop(stack, &node);
node = node->left;
}
}
stack_free(&stack);
if(!self->stack->empty(self->stack))
{
self->stack->pop(self->stack, &self->cur_node);
}
else
{
self->cur_node = NULL;
}
return self->cur_node == NULL ? NULL : self->cur_node->obj;
}break;
case ORDER_LEFT_BREADTH:
{
@ -1624,7 +1652,15 @@ void* tree_next(struct _tree* self)
}break;
case ORDER_LEFT_POST:
{
if(!self->stack->empty(self->stack))
{
self->stack->pop(self->stack, &self->cur_node);
}
else
{
self->cur_node = NULL;
}
return self->cur_node == NULL ? NULL : self->cur_node->obj;
}break;
case ORDER_LEFT_BREADTH:
{
@ -1667,27 +1703,27 @@ void* tree_end(struct _tree* self)
}break;
case ORDER_LEFT_POST:
{
return NULL;
}break;
case ORDER_LEFT_BREADTH:
{
return NULL;
}break;
case ORDER_RIGHT_PRE:
{
return NULL;
}break;
case ORDER_RIGHT_IN:
{
return NULL;
}break;
case ORDER_RIGHT_POST:
{
return NULL;
}break;
case ORDER_RIGHT_BREADTH:
{
return NULL;
}break;
default:
{

23
test/test_tree.c
View File

@ -545,36 +545,35 @@ static void test_tree_iter(void)
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array_orderpre_insert[i], buff, count);
}
for(i = 1; i < 2; i++)
for(i = 1; i < 3; i++)
{
tree->set_order(tree, i); //ORDER_LEFT_IN
printf("\n ----- iter test -----\n");
// printf("\n ----- iter test -----\n");
for (count = 0, iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree))
{
printf("(%2d ) ", *iter);
// printf("(%2d ) ", *iter);
buff[count++] = *iter;
}
printf("\n");
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[1], buff, count);
// printf("\n");
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[i], buff, count);
}
printf("insert = ");
tree->print_obj(&temp);
printf("size = %2d : \n", tree->size(tree));
tree->inorder(tree, tree->_root);
printf("\n\nactual data = \n");
tree->postorder(tree, tree->_root);
printf("\n");
// set order
// tree->set_order(tree, ORDER_LEFT_PRE);
tree->set_order(tree, ORDER_LEFT_IN);
printf("\n ----- iter test -----\n");
// tree->set_order(tree, ORDER_LEFT_IN);
tree->set_order(tree, ORDER_LEFT_POST);
printf("\n ----- iter data -----\n");
for (count = 0, iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree))
{
printf("(%2d ) ", *iter);
buff[count++] = *iter;
}
printf("\n");
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[2], buff, count);
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[3], buff, count);
TEST_ASSERT_FALSE(tree->empty(tree));
TEST_ASSERT_TRUE(tree->clear(tree));