not quite there yet but nearly ^^

WIP for the algorithm not to pass on previously used node
This commit is contained in:
Tanguy MAZE
2019-04-01 19:06:19 +02:00
parent 4e2fc9f19e
commit 15669b7402
5 changed files with 114 additions and 56 deletions

View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/28 11:37:06 by tmaze #+# #+# */
/* Updated: 2019/03/31 19:47:57 by tmaze ### ########.fr */
/* Updated: 2019/04/01 17:51:54 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -31,19 +31,29 @@ int main(void)
return (1);
if (!add_link(&data, 0, 1) || !add_link(&data, 0, 2))
{
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 1, 4))
{
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 2, 3) || !add_link(&data, 2, 5))
if (!add_link(&data, 1, 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, 2, 3))
{
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, 3, 4) || !add_link(&data, 3, 5))
{
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
@@ -53,9 +63,9 @@ int main(void)
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 3, 6))
if (!add_link(&data, 4, 6))
{
lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
@@ -64,21 +74,8 @@ int main(void)
ft_memdel((void**)&(data.adj));
return (1);
}
/* if (!add_link(&data, 4, 5)) */
/* { */
/* lst_inddel(&(data.adj[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])); */
/* lst_inddel(&(data.adj[0])); */
/* ft_memdel((void**)&(data.adj)); */
/* return (1); */
/* } */
if (!add_link(&data, 5, 7))
if (!add_link(&data, 5, 6))
{
lst_inddel(&(data.adj[7]));
lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
@@ -89,7 +86,7 @@ int main(void)
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 6, 7))
if (!add_link(&data, 7, 4) || !add_link(&data, 7, 1))
{
lst_inddel(&(data.adj[7]));
lst_inddel(&(data.adj[6]));
@@ -115,7 +112,7 @@ int main(void)
}
i++;
}
path = edmunds_karp(&data, 0, 7);
path = edmunds_karp(&data, 0, 6);
if (path != NULL)
{
i = 0;