mirror of
https://gitee.com/apaki/unicstl.git
synced 2025-07-03 23:56:54 +08:00
迭代器:层级遍历测试通过
This commit is contained in:
parent
feffd2b3c7
commit
8044d3b7b4
43
src/tree.c
43
src/tree.c
@ -1570,7 +1570,30 @@ void* tree_begin(struct _tree* self)
|
|||||||
}break;
|
}break;
|
||||||
case ORDER_LEFT_BREADTH:
|
case ORDER_LEFT_BREADTH:
|
||||||
{
|
{
|
||||||
|
struct _tree_node* node = self->_root;
|
||||||
|
self->queue->clear(self->queue);
|
||||||
|
|
||||||
|
queue_t queue = self->queue;
|
||||||
|
if(node != NULL)
|
||||||
|
{
|
||||||
|
queue->push(queue, &node);
|
||||||
|
while(!queue->empty(queue))
|
||||||
|
{
|
||||||
|
queue->pop(queue, &node);
|
||||||
|
if(node->left != NULL)
|
||||||
|
{
|
||||||
|
queue->push(queue, &node->left);
|
||||||
|
}
|
||||||
|
if(node->right != NULL)
|
||||||
|
{
|
||||||
|
queue->push(queue, &node->right);
|
||||||
|
}
|
||||||
|
// self->print_obj(node->obj);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self->cur_node = node;
|
||||||
|
return self->cur_node == NULL ? NULL : self->cur_node->obj;
|
||||||
}break;
|
}break;
|
||||||
case ORDER_RIGHT_PRE:
|
case ORDER_RIGHT_PRE:
|
||||||
{
|
{
|
||||||
@ -1664,7 +1687,27 @@ void* tree_next(struct _tree* self)
|
|||||||
}break;
|
}break;
|
||||||
case ORDER_LEFT_BREADTH:
|
case ORDER_LEFT_BREADTH:
|
||||||
{
|
{
|
||||||
|
struct _tree_node* node = self->cur_node;
|
||||||
|
queue_t queue = self->queue;
|
||||||
|
if(!queue->empty(queue) && node != NULL)
|
||||||
|
{
|
||||||
|
queue->pop(queue, &node);
|
||||||
|
if(node->left != NULL)
|
||||||
|
{
|
||||||
|
queue->push(queue, &node->left);
|
||||||
|
}
|
||||||
|
if(node->right != NULL)
|
||||||
|
{
|
||||||
|
queue->push(queue, &node->right);
|
||||||
|
}
|
||||||
|
|
||||||
|
self->cur_node = node;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
self->cur_node = NULL;
|
||||||
|
}
|
||||||
|
return self->cur_node == NULL ? NULL : self->cur_node->obj;
|
||||||
}break;
|
}break;
|
||||||
case ORDER_RIGHT_PRE:
|
case ORDER_RIGHT_PRE:
|
||||||
{
|
{
|
||||||
|
@ -559,13 +559,14 @@ static void test_tree_iter(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
printf("\n\nactual data = \n");
|
printf("\n\nactual data = \n");
|
||||||
tree->postorder(tree, tree->_root);
|
tree->breadth(tree, tree->_root);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
|
||||||
// set order
|
// set order
|
||||||
// tree->set_order(tree, ORDER_LEFT_PRE);
|
// tree->set_order(tree, ORDER_LEFT_PRE);
|
||||||
// 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);
|
||||||
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))
|
||||||
{
|
{
|
||||||
@ -573,7 +574,7 @@ static void test_tree_iter(void)
|
|||||||
buff[count++] = *iter;
|
buff[count++] = *iter;
|
||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[3], buff, count);
|
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[4], buff, count);
|
||||||
|
|
||||||
TEST_ASSERT_FALSE(tree->empty(tree));
|
TEST_ASSERT_FALSE(tree->empty(tree));
|
||||||
TEST_ASSERT_TRUE(tree->clear(tree));
|
TEST_ASSERT_TRUE(tree->clear(tree));
|
||||||
|
Loading…
Reference in New Issue
Block a user