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

aaaaaaand it's done !

Browse Source 
algorithm finished and normed
more testing might be needed
This commit is contained in:
Tanguy MAZE 2019-04-03 17:20:29 +02:00
parent 15669b7402
commit ea0eda89d0
5 changed files with 92 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/lem_in.h
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/23 17:31:19 by tmaze #+# #+# */ /* Created: 2019/03/23 17:31:19 by tmaze #+# #+# */
/* Updated: 2019/03/31 17:58:52 by tmaze ### ########.fr */ /* Updated: 2019/04/03 15:57:39 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -112,6 +112,7 @@ int lm_getparams(t_lmdata *data);
t_ind *lst_indadd(t_ind **lst, int ind); t_ind *lst_indadd(t_ind **lst, int ind);
void lst_inddel(t_ind **lst); void lst_inddel(t_ind **lst);
void tablst_inddel(t_ind **tab);
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);
t_ind **edmunds_karp(t_lmdata *data, int start_ind, int end_ind); t_ind **edmunds_karp(t_lmdata *data, int start_ind, int end_ind);

33
srcs/bfs.c
View File

@ -6,26 +6,12 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/27 14:41:49 by tmaze #+# #+# */ /* Created: 2019/03/27 14:41:49 by tmaze #+# #+# */
/* Updated: 2019/04/01 17:52:57 by tmaze ### ########.fr */ /* Updated: 2019/04/03 17:19:07 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "lem_in.h" #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) static void bfs_addtoqueue(t_bfs *tab, int node, int nb_nodes)
{ {
int i; 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) static void bfs_checkadj(t_lmdata *data, t_bfs *tab, int i)
{ {
t_ind *it; 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]; it = data->adj[tab[i].queue];
while (it != NULL) 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); 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; tab[it->index].parent = tab[i].queue;
it = it->next; it = it->next;
} }

147
srcs/edmunds_karp.c
View File

@ -6,113 +6,80 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/28 16:21:19 by tmaze #+# #+# */ /* Created: 2019/03/28 16:21:19 by tmaze #+# #+# */
/* Updated: 2019/04/01 18:36:10 by tmaze ### ########.fr */ /* Updated: 2019/04/03 17:18:35 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "lem_in.h" #include "lem_in.h"
int in_use(t_ind **ret, int node) static void update_weights(t_lmdata *data, t_bfs *tab, int end_ind)
{ {
t_ind *it; t_ind *it;
int i; int i;
i = 0; i = end_ind;
while (ret && ret[i]) while (i != -1)
{ {
it = ret[i]; it = data->adj[tab[i].parent];
while (it) while (it && it->index != i)
{
if (it->index == node)
return (1);
it = it->next; it = it->next;
if (it && it->index == i)
it->weight--;
it = data->adj[i];
while (it && it->index != tab[i].parent)
it = it->next;
if (it && it->index == tab[i].parent)
it->weight++;
i = tab[i].parent;
} }
i++;
}
return (0);
} }
void reset_node(t_lmdata *data, int node) static int reset_weights(t_lmdata *data, int s_ind, int node)
{ {
t_ind *it; t_ind *it;
t_ind *it2; t_ind *it2;
it = data->adj[node]; it = data->adj[node];
while (it) while (it && it->weight != 2)
{ it = it->next;
it->weight = 1; if (it && it->weight == 2)
it->weight--;
it2 = data->adj[it->index]; it2 = data->adj[it->index];
while (it2 && it2->index != node) while (it2 && it2->index != node)
it2 = it2->next; it2 = it2->next;
if (it2) if (it2 && it2->index == node)
it2->weight = 1; it2->weight++;
it = it->next; return ((node == s_ind) ? -1 : it->index);
}
} }
void mark_node(t_lmdata *data, int node) static t_ind **clean_ret(t_ind **ret)
{ {
t_ind *it; tablst_inddel(ret);
t_ind *it2; return (NULL);
it = data->adj[node];
while (it)
{
it->weight = 2;
it2 = data->adj[it->index];
while (it2 && it2->index != node)
it2 = it2->next;
if (it2)
it2->weight = 0;
it = it->next;
}
} }
t_ind **resolve_path(t_lmdata *data, int start_ind, int end_ind, int nb_path) t_ind **resolve_path(t_lmdata *data, int s_ind, int e_ind
, int nb_path)
{ {
t_ind **ret; t_ind **ret;
t_ind *it;
int i; int i;
int j; int j;
ret = NULL; ret = NULL;
i = 0; i = 0;
if (nb_path > 0 && (ret = (t_ind**)ft_memalloc(sizeof(t_ind*) * (nb_path + 1))) if (nb_path > 0 && (ret = (t_ind**)ft_memalloc(sizeof(t_ind*)
!= NULL) * (nb_path + 1))) != NULL)
{ {
ret[nb_path] = NULL; while (i < nb_path && (j = e_ind) == e_ind)
while (i < nb_path)
{ {
j = end_ind; while (j != s_ind)
ft_printf("===== start resolv %d =====\n", i);
it = data->adj[j];
while (j != start_ind)
{ {
if (in_use(ret, j))
{
lst_inddel(&(ret[i]));
j = -1;
break ;
}
if (lst_indadd(&(ret[i]), j) == NULL) if (lst_indadd(&(ret[i]), j) == NULL)
return (NULL); //protect this return (clean_ret(ret));
it = data->adj[j]; j = reset_weights(data, s_ind, j);
ft_printf("===== parents of %d =====\n", j);
while (it && it->weight != 2)
{
ft_printf("index: %d\nweight: %d\n\n", it->index, it->weight);
it = it->next;
}
if (it && it->weight == 2)
{
ft_printf("parent selected: %d\n", it->index);
if (j != end_ind)
reset_node(data, j);
}
j = (j == start_ind) ? -1 : it->index;
} }
if (j != -1 && lst_indadd(&(ret[i]), j) == NULL) if (j != -1 && lst_indadd(&(ret[i]), j) == NULL)
return (NULL); //protect this return (clean_ret(ret));
i++; i++;
} }
} }
@ -121,52 +88,16 @@ t_ind **resolve_path(t_lmdata *data, int start_ind, int end_ind, int nb_path)
t_ind **edmunds_karp(t_lmdata *data, int start_ind, int end_ind) t_ind **edmunds_karp(t_lmdata *data, int start_ind, int end_ind)
{ {
t_bfs bfs_tab[data->nb_nodes]; t_bfs tab[data->nb_nodes];
int i;
int nb_path; int nb_path;
t_ind *it;
nb_path = 0; nb_path = 0;
ft_printf("===== Init bfs =====\n"); bfs(data, tab, start_ind, end_ind);
bfs(data, bfs_tab, start_ind, end_ind); while (tab[end_ind].parent != -1)
while (bfs_tab[end_ind].parent != -1)
{ {
nb_path++; nb_path++;
i = end_ind; update_weights(data, tab, end_ind);
while (i != -1) bfs(data, tab, start_ind, end_ind);
{
if (i != end_ind && i != start_ind)
mark_node(data, i);
i = bfs_tab[i].parent;
}
ft_printf("===== list of adj =====\n");
i = 0;
while (i < data->nb_nodes)
{
ft_printf("===== adj of %d =====\n", i);
it = data->adj[i];
while (it)
{
ft_printf("index: %d\nweight: %d\n\n", it->index, it->weight);
it = it->next;
}
i++;
}
ft_printf("===== new bfs =====\n");
bfs(data, bfs_tab, start_ind, end_ind);
}
ft_printf("===== list of adj =====\n");
i = 0;
while (i < 7)
{
ft_printf("===== adj of %d =====\n", i);
it = data->adj[i];
while (it)
{
ft_printf("index: %d\nweight: %d\n\n", it->index, it->weight);
it = it->next;
}
i++;
} }
return (resolve_path(data, start_ind, end_ind, nb_path)); return (resolve_path(data, start_ind, end_ind, nb_path));
} }

12
srcs/lst_ind.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/27 14:56:55 by tmaze #+# #+# */ /* Created: 2019/03/27 14:56:55 by tmaze #+# #+# */
/* Updated: 2019/04/01 17:37:51 by tmaze ### ########.fr */ /* Updated: 2019/04/03 15:57:26 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -37,3 +37,13 @@ void lst_inddel(t_ind **lst)
ft_memdel((void**)&tmp); ft_memdel((void**)&tmp);
} }
} }
void tablst_inddel(t_ind **tab)
{
int i;
i = 0;
while (tab[i])
lst_inddel(&(tab[i++]));
ft_memdel((void**)&tab);
}

39
srcs/test.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/28 11:37:06 by tmaze #+# #+# */ /* Created: 2019/03/28 11:37:06 by tmaze #+# #+# */
/* Updated: 2019/04/01 17:51:54 by tmaze ### ########.fr */ /* Updated: 2019/04/03 15:58:22 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -36,7 +36,7 @@ int main(void)
ft_memdel((void**)&(data.adj)); ft_memdel((void**)&(data.adj));
return (1); return (1);
} }
if (!add_link(&data, 1, 3)) if (!add_link(&data, 1, 4))
{ {
lst_inddel(&(data.adj[2])); lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1])); lst_inddel(&(data.adj[1]));
@ -44,7 +44,7 @@ int main(void)
ft_memdel((void**)&(data.adj)); ft_memdel((void**)&(data.adj));
return (1); return (1);
} }
if (!add_link(&data, 2, 3)) if (!add_link(&data, 2, 3) || !add_link(&data, 2, 5))
{ {
lst_inddel(&(data.adj[3])); lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2])); lst_inddel(&(data.adj[2]));
@ -53,20 +53,9 @@ int main(void)
ft_memdel((void**)&(data.adj)); ft_memdel((void**)&(data.adj));
return (1); return (1);
} }
if (!add_link(&data, 3, 4) || !add_link(&data, 3, 5)) if (!add_link(&data, 3, 6))
{
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 4, 6))
{ {
lst_inddel(&(data.adj[5])); lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3])); lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2])); lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1])); lst_inddel(&(data.adj[1]));
@ -74,7 +63,18 @@ int main(void)
ft_memdel((void**)&(data.adj)); ft_memdel((void**)&(data.adj));
return (1); return (1);
} }
if (!add_link(&data, 5, 6)) if (!add_link(&data, 4, 5))
{
lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 5, 6) || !add_link(&data, 5, 7))
{ {
lst_inddel(&(data.adj[6])); lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5])); lst_inddel(&(data.adj[5]));
@ -86,7 +86,7 @@ int main(void)
ft_memdel((void**)&(data.adj)); ft_memdel((void**)&(data.adj));
return (1); return (1);
} }
if (!add_link(&data, 7, 4) || !add_link(&data, 7, 1)) if (!add_link(&data, 6, 7))
{ {
lst_inddel(&(data.adj[7])); lst_inddel(&(data.adj[7]));
lst_inddel(&(data.adj[6])); lst_inddel(&(data.adj[6]));
@ -112,7 +112,7 @@ int main(void)
} }
i++; i++;
} }
path = edmunds_karp(&data, 0, 6); path = edmunds_karp(&data, 0, 7);
if (path != NULL) if (path != NULL)
{ {
i = 0; i = 0;
@ -125,11 +125,10 @@ int main(void)
it = it->next; it = it->next;
} }
ft_putchar('\n'); ft_putchar('\n');
lst_inddel(&(path[i]));
i++; i++;
} }
} }
ft_memdel((void**)&path); tablst_inddel(path);
lst_inddel(&(data.adj[7])); lst_inddel(&(data.adj[7]));
lst_inddel(&(data.adj[6])); lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5])); lst_inddel(&(data.adj[5]));