From bd2ab13be892f98e6e52ac10bdaffff3e62ee4d8 Mon Sep 17 00:00:00 2001 From: wjf-hs Date: Mon, 2 Sep 2024 11:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E5=99=A8=EF=BC=9A=E4=B8=AD?= =?UTF-8?q?=E5=BA=8F/=E5=90=8E=E5=BA=8F=E9=81=8D=E5=8E=86right=E4=BC=98?= =?UTF-8?q?=E5=85=88=E6=B5=8B=E8=AF=95=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tree.c | 141 ++++++++++++++++++++++++++++++++--------------- test/test_tree.c | 10 +++- 2 files changed, 104 insertions(+), 47 deletions(-) diff --git a/src/tree.c b/src/tree.c index 6009ded..11f0766 100644 --- a/src/tree.c +++ b/src/tree.c @@ -1536,25 +1536,48 @@ void* tree_begin(struct _tree* self) return node->obj; }break; case ORDER_LEFT_IN: + case ORDER_RIGHT_IN: { struct _tree_node* node = NULL; self->cur_node = self->_root; 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); - self->cur_node = self->cur_node->left; + if (self->cur_node != NULL) + { + 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); - // self->print_obj(self->cur_node->obj); - node = self->cur_node; - self->cur_node = self->cur_node->right; - break; + if (self->cur_node != NULL) + { + self->stack->push(self->stack, &self->cur_node); + self->cur_node = self->cur_node->right; + } + 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) @@ -1564,25 +1587,47 @@ void* tree_begin(struct _tree* self) return node->obj; }break; case ORDER_LEFT_POST: + case ORDER_RIGHT_POST: { struct _tree_node* node = self->_root; self->stack->clear(self->stack); stack_t stack = stack_new(); 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); - node = node->right; + stack->push(stack, &node); + node = node->right; + } + else + { + stack->pop(stack, &node); + node = node->left; + } } - else + } + else + { + while (!stack->empty(stack) || node != NULL) { - stack->pop(stack, &node); - node = node->left; + if (node != NULL) + { + self->stack->push(self->stack, &node); + + stack->push(stack, &node); + node = node->left; + } + else + { + stack->pop(stack, &node); + node = node->right; + } } } stack_free(&stack); @@ -1640,14 +1685,6 @@ void* tree_begin(struct _tree* self) } } return self->cur_node == NULL ? NULL : self->cur_node->obj; - }break; - case ORDER_RIGHT_IN: - { - - }break; - case ORDER_RIGHT_POST: - { - }break; default: { @@ -1712,22 +1749,45 @@ void* tree_next(struct _tree* self) return node->obj; }break; case ORDER_LEFT_IN: + case ORDER_RIGHT_IN: { 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); - self->cur_node = self->cur_node->left; + if (self->cur_node != NULL) + { + 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); - // self->print_obj(self->cur_node->obj); - node = self->cur_node; - self->cur_node = self->cur_node->right; - break; + if (self->cur_node != NULL) + { + self->stack->push(self->stack, &self->cur_node); + self->cur_node = self->cur_node->right; + } + else + { + self->stack->pop(self->stack, &self->cur_node); + + node = self->cur_node; + self->cur_node = self->cur_node->left; + break; + } } } if (node == NULL) @@ -1737,6 +1797,7 @@ void* tree_next(struct _tree* self) return node->obj; }break; case ORDER_LEFT_POST: + case ORDER_RIGHT_POST: { if (!self->stack->empty(self->stack)) { @@ -1785,14 +1846,6 @@ void* tree_next(struct _tree* self) self->cur_node = NULL; } return self->cur_node == NULL ? NULL : self->cur_node->obj; - }break; - case ORDER_RIGHT_IN: - { - - }break; - case ORDER_RIGHT_POST: - { - }break; default: { diff --git a/test/test_tree.c b/test/test_tree.c index b6fd1db..7d5be93 100644 --- a/test/test_tree.c +++ b/test/test_tree.c @@ -545,7 +545,7 @@ static void test_tree_iter(void) 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 // 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); } +#if 0 tree->order(tree, true); printf("\n\nactual data = \n"); - tree->preorder(tree, tree->_root); + tree->postorder(tree, tree->_root); printf("\n"); // 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_POST); // 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); printf("\n ----- iter data -----\n"); 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"); TEST_ASSERT_EQUAL_INT_ARRAY(expected_int_array[tree->_order], buff, count); +#endif TEST_ASSERT_FALSE(tree->empty(tree)); TEST_ASSERT_TRUE(tree->clear(tree));