From 8044d3b7b45bc8fd44f006935301f0577187480e Mon Sep 17 00:00:00 2001 From: wjf-hs Date: Mon, 2 Sep 2024 11:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E5=99=A8=EF=BC=9A=E5=B1=82?= =?UTF-8?q?=E7=BA=A7=E9=81=8D=E5=8E=86=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 | 43 +++++++++++++++++++++++++++++++++++++++++++ test/test_tree.c | 7 ++++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/tree.c b/src/tree.c index a2079c1..1ddc1b7 100644 --- a/src/tree.c +++ b/src/tree.c @@ -1570,7 +1570,30 @@ void* tree_begin(struct _tree* self) }break; 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; case ORDER_RIGHT_PRE: { @@ -1664,7 +1687,27 @@ void* tree_next(struct _tree* self) }break; 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; case ORDER_RIGHT_PRE: { diff --git a/test/test_tree.c b/test/test_tree.c index a5ccfce..70af1e7 100644 --- a/test/test_tree.c +++ b/test/test_tree.c @@ -559,13 +559,14 @@ static void test_tree_iter(void) } printf("\n\nactual data = \n"); - tree->postorder(tree, tree->_root); + tree->breadth(tree, tree->_root); printf("\n"); // set order // tree->set_order(tree, ORDER_LEFT_PRE); // 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"); 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; } 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_TRUE(tree->clear(tree));