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

把tree的迭代器调试通过了，left优先的前序遍历ok！

Browse Source
This commit is contained in:
建峰 2024-09-02 02:51:49 +08:00
parent bfc6e88bb9
commit 5954acb1a0
3 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/tree.h
View File

@ -23,15 +23,15 @@ typedef enum {
}rbt_color; }rbt_color;
enum _order{ enum _order{
ORDER_LEFT_PRE = 0x00, ORDER_LEFT_PRE = 0x01,
ORDER_LEFT_IN = 0x01, ORDER_LEFT_IN = 0x02,
ORDER_LEFT_POST = 0x02, ORDER_LEFT_POST = 0x03,
ORDER_LEFT_BREADTH = 0x03, ORDER_LEFT_BREADTH = 0x04,
ORDER_RIGHT_PRE = 0x04, ORDER_RIGHT_PRE = 0x05,
ORDER_RIGHT_IN = 0x05, ORDER_RIGHT_IN = 0x06,
ORDER_RIGHT_POST = 0x06, ORDER_RIGHT_POST = 0x07,
ORDER_RIGHT_BREADTH = 0x07, ORDER_RIGHT_BREADTH = 0x08,
ORDER_PRE = ORDER_LEFT_PRE, ORDER_PRE = ORDER_LEFT_PRE,
ORDER_IN = ORDER_LEFT_IN, ORDER_IN = ORDER_LEFT_IN,

31
src/tree.c
View File

@ -566,7 +566,8 @@ bool tree_clear(struct _tree* self)
assert(self != NULL); assert(self != NULL);
if(self->_root == NULL) if(self->_root == NULL)
{ {
return false; // return false;
return true;
} }
struct _tree_node* node = self->_root; struct _tree_node* node = self->_root;
@ -1485,9 +1486,27 @@ void* tree_begin(struct _tree* self)
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); while(!self->stack->empty(self->stack) || self->cur_node != NULL)
{
if(self->cur_node != NULL)
{
node = self->cur_node; node = self->cur_node;
self->stack->push(self->stack, &self->cur_node); self->stack->push(self->stack, &self->cur_node);
self->cur_node = self->cur_node->left;
break;
}
else
{
self->stack->pop(self->stack, &self->cur_node);
self->cur_node = self->cur_node->right;
}
}
if(node == NULL)
{
return NULL;
}
return node->obj; return node->obj;
}break; }break;
case ORDER_LEFT_IN: case ORDER_LEFT_IN:
@ -1537,7 +1556,11 @@ void* tree_next(struct _tree* self)
if(self->cur_node != NULL) if(self->cur_node != NULL)
{ {
node = self->cur_node; node = self->cur_node;
self->stack->push(self->stack, &self->cur_node); self->stack->push(self->stack, &self->cur_node);
self->cur_node = self->cur_node->left;
break;
} }
else else
{ {
@ -1545,6 +1568,10 @@ void* tree_next(struct _tree* self)
self->cur_node = self->cur_node->right; self->cur_node = self->cur_node->right;
} }
} }
if(node == NULL)
{
return NULL;
}
return node->obj; return node->obj;
}break; }break;
case ORDER_LEFT_IN: case ORDER_LEFT_IN:

30
test/test_tree.c
View File

@ -39,7 +39,7 @@ void test_avltree_num(void)
int temp = 0; int temp = 0;
uint32_t len = sizeof(data) / sizeof(data[0]); uint32_t len = sizeof(data) / sizeof(data[0]);
tree_t tree = tree_new(); tree_t tree = tree_new,;
tree_avl_init(tree, sizeof(int)); tree_avl_init(tree, sizeof(int));
tree->print_obj = print_num; tree->print_obj = print_num;
tree->compare = compare_num; tree->compare = compare_num;
@ -211,7 +211,7 @@ void test_rbtree_num(void)
int temp = 0; int temp = 0;
uint32_t len = sizeof(data) / sizeof(data[0]); uint32_t len = sizeof(data) / sizeof(data[0]);
tree_t tree = tree_new(); tree_t tree = tree_new,;
tree_rb_init(tree, sizeof(int)); tree_rb_init(tree, sizeof(int));
tree->print_obj = print_num; tree->print_obj = print_num;
tree->compare = compare_num; tree->compare = compare_num;
@ -343,7 +343,7 @@ void test_rbtree_struct(void)
struct _student temp = {0}; struct _student temp = {0};
uint32_t len = sizeof(data) / sizeof(data[0]); uint32_t len = sizeof(data) / sizeof(data[0]);
tree_t tree = tree_new(); tree_t tree = tree_new,;
tree_rb_init(tree, sizeof(struct _student)); tree_rb_init(tree, sizeof(struct _student));
tree->print_obj = print_struct; tree->print_obj = print_struct;
tree->compare = compare_struct; tree->compare = compare_struct;
@ -463,14 +463,20 @@ void test_rbtree_struct(void)
} }
#endif #endif
static const int const expected_int_array[9][15] = {
{ 5, 2, 3, 1, 7, 8, 6, 4, 9, 10, 12, 11, 15, 14, 13, }, // original data
{ 7, 3, 2, 1, 5, 4, 6, 11, 9, 8, 10, 14, 12, 13, 15, }, // order_left_pre
};
static void test_tree_iter(void) static void test_tree_iter(void)
{ {
uint32_t i = 0; uint32_t i = 0;
int data[] = { 2,1,3,4}; // int data[] = { 2,1,3,4};
// int data[] = { 1,2,3,4,5,6}; // int data[] = { 1,2,3,4,5,6};
// int data[] = { 5,2,3,1,7,8,6 }; // int data[] = { 5,2,3,1,7,8,6 };
// int data[] = { 5,2,3,1,7,8,6,4,9,10,12,11,15,14,13 }; // int data[] = { 5,2,3,1,7,8,6,4,9,10,12,11,15,14,13 };
int data[15] = { 5, 2, 3, 1, 7, 8, 6, 4, 9, 10, 12, 11, 15, 14, 13, };
int buff[32]; int buff[32];
int count = 0; int count = 0;
int temp = 0; int temp = 0;
@ -492,16 +498,26 @@ static void test_tree_iter(void)
// tree->preorder(tree, tree->_root); // tree->preorder(tree, tree->_root);
// printf("\n"); // printf("\n");
} }
printf("insert = ");
tree->print_obj(&temp);
printf("size = %2d : \n", tree->size(tree));
tree->preorder(tree, tree->_root);
printf("\n");
// set order
tree->order(tree, ORDER_LEFT_PRE);
// tree->set_order(tree, ORDER_LEFT_IN);
printf("\niter test\n"); printf("\niter test\n");
int * iter = NULL; int * iter = NULL;
for(iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree)) for(iter = tree->begin(tree); iter != tree->end(tree); iter = tree->next(tree))
{ {
printf("%d \n", *iter); printf("(%2d ) ", *iter);
buff[count++] = *iter; buff[count++] = *iter;
} }
TEST_ASSERT_EQUAL_INT_ARRAY(data, buff, count); printf("\n");
TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[1], 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));