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
Download Patch File Download Diff File Expand all files Collapse all files

39
srcs/test.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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));
return (1);
}
if (!add_link(&data, 1, 3))
if (!add_link(&data, 1, 4))
{
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
@@ -44,7 +44,7 @@ int main(void)
ft_memdel((void**)&(data.adj));
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[2]));
@@ -53,20 +53,9 @@ int main(void)
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 3, 4) || !add_link(&data, 3, 5))
{
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))
if (!add_link(&data, 3, 6))
{
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
@@ -74,7 +63,18 @@ int main(void)
ft_memdel((void**)&(data.adj));
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[5]));
@@ -86,7 +86,7 @@ int main(void)
ft_memdel((void**)&(data.adj));
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[6]));
@@ -112,7 +112,7 @@ int main(void)
}
i++;
}
path = edmunds_karp(&data, 0, 6);
path = edmunds_karp(&data, 0, 7);
if (path != NULL)
{
i = 0;
@@ -125,11 +125,10 @@ int main(void)
it = it->next;
}
ft_putchar('\n');
lst_inddel(&(path[i]));
i++;
}
}
ft_memdel((void**)&path);
tablst_inddel(path);
lst_inddel(&(data.adj[7]));
lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5]));