dfs和bfs代码优化完毕,现在思路非常清晰了

This commit is contained in:
建峰 2025-04-26 19:00:20 +08:00
parent 9d5f71250e
commit 5fd74a4d15

View File

@ -796,12 +796,12 @@ static struct _graph_node * graph_find_unvisited_vertex(struct _graph *self)
return NULL; return NULL;
} }
static struct _graph_node * graph_find_unvisited_target(struct _graph *self, struct _graph_node *node) static struct _graph_node * graph_find_next_unvisited_target(struct _graph *self, struct _graph_node *node)
{ {
assert(self != NULL); assert(self != NULL);
if (self->empty(self)) if (self->empty(self))
{ {
return false; return NULL;
} }
if(node == NULL) if(node == NULL)
@ -920,13 +920,7 @@ const void *graph_iter_next(struct _iterator *iter)
queue->pop(queue, &node); queue->pop(queue, &node);
node->visited = true; node->visited = true;
// 2. find unvisited target node // 2. find all unvisited target node and push them to queue
// target = graph_find_unvisited_target(self, node);
// if(target != NULL)
// {
// queue->push(queue, &target);
// }
cur_edge = node->edgehead; cur_edge = node->edgehead;
while (cur_edge != NULL) while (cur_edge != NULL)
{ {
@ -934,10 +928,6 @@ const void *graph_iter_next(struct _iterator *iter)
if (target != NULL && target->visited != true) if (target != NULL && target->visited != true)
{ {
queue->push(queue, &target); queue->push(queue, &target);
// self->print_obj(node->obj);
// printf(" -> ");
// self->print_obj(target->obj);
} }
cur_edge = cur_edge->next; cur_edge = cur_edge->next;
} }
@ -970,7 +960,7 @@ const void *graph_iter_next(struct _iterator *iter)
cur_node->visited = true; cur_node->visited = true;
// 3. find unvisited target node // 3. find unvisited target node
cur_node = graph_find_unvisited_target(self, cur_node); cur_node = graph_find_next_unvisited_target(self, cur_node);
break; break;
} }
else else
@ -979,7 +969,7 @@ const void *graph_iter_next(struct _iterator *iter)
self->stack->pop(self->stack, &cur_node); self->stack->pop(self->stack, &cur_node);
// 5. find unvisited target node // 5. find unvisited target node
cur_node = graph_find_unvisited_target(self, cur_node); cur_node = graph_find_next_unvisited_target(self, cur_node);
// 6. [graph special] If the graph contains isolated vertices // 6. [graph special] If the graph contains isolated vertices
if(cur_node == NULL) if(cur_node == NULL)