tvdu29/lem_in
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tmaze'

Browse Source 
merging algorithm to master of project
This commit is contained in:
Tanguy MAZE
2019-04-05 14:06:42 +02:00
parent 1abb3fc566 ea0eda89d0
commit 0a9d7b816d
7 changed files with 182 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
srcs/bfs.c
View File

@@ -6,26 +6,12 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/27 14:41:49 by tmaze #+# #+# */
/* Updated: 2019/03/31 18:23:21 by tmaze ### ########.fr */
/* Updated: 2019/04/05 13:24:22 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
static void bfs_print(t_bfs *tab, int nb_nodes)
{
int i;
i = 0;
ft_printf("===== bfs print =====\n");
while (i < nb_nodes)
{
ft_printf("index: %d\nparent: %d\nvisited: %d\nqueue: %d\n\n", i
, tab[i].parent, tab[i].visited != 0, tab[i].queue);
i++;
}
}
static void bfs_addtoqueue(t_bfs *tab, int node, int nb_nodes)
{
int i;
@@ -43,13 +29,26 @@ static void bfs_addtoqueue(t_bfs *tab, int node, int nb_nodes)
static void bfs_checkadj(t_lmdata *data, t_bfs *tab, int i)
{
t_ind *it;
char used;
it = data->adj[tab[i].queue];
used = 0;
while (it != NULL)
{
if (tab[it->index].visited == 0 && it->weight == 2)
used = 1;
if (tab[it->index].visited == 0 && it->weight == 2)
break ;
it = it->next;
}
it = data->adj[tab[i].queue];
while (it != NULL)
{
if (tab[it->index].visited == 0 && it->weight > 0)
if (tab[it->index].visited == 0 && ((!used && it->weight > 0)
|| (used && it->weight == 2)))
bfs_addtoqueue(tab, it->index, data->nb_nodes);
if (tab[it->index].visited == 0 && it->weight > 0)
if (tab[it->index].visited == 0 && ((!used && it->weight > 0)
|| (used && it->weight == 2)))
tab[it->index].parent = tab[i].queue;
it = it->next;
}
@@ -69,7 +68,7 @@ static void bfs_init(t_bfs *tab, t_lmdata *data)
}
}
void bfs(t_lmdata *data, t_bfs *tab, int start_ind, int end_ind)
void bfs(t_lmdata *data, t_bfs *tab, int start_ind, int end_ind)
{
int i;
@@ -79,5 +78,4 @@ void bfs(t_lmdata *data, t_bfs *tab, int start_ind, int end_ind)
while (i < data->nb_nodes && tab[i].queue != -1
&& tab[end_ind].parent == -1 && (tab[tab[i].queue].visited = 1))
bfs_checkadj(data, tab, i++);
bfs_print(tab, data->nb_nodes);
}