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

rework on score system

Browse Source 
need to score with correct amount of ants on each paths
also secured ft_atois
This commit is contained in:
Tanguy MAZE
2019-04-14 14:45:38 +02:00
parent 9b75432c2e
commit 4a5c798b25
4 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
srcs/lem_in.c
View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/04/13 14:52:37 by tmaze ### ########.fr */
/* Updated: 2019/04/14 12:22:28 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -36,7 +36,7 @@ static int get_nb_paths(t_ind **ret)
return (i);
}
static int get_nb_paths_max(t_lmdata *data, int start, int end)
static void get_nb_paths_max(t_lmdata *data, int start, int end)
{
int i;
int j;
@@ -45,12 +45,12 @@ static int get_nb_paths_max(t_lmdata *data, int start, int end)
i = 0;
j = 0;
it = data->adj[start];
while (it && i++)
it= it->next;
while (it && ++i)
it = it->next;
it = data->adj[end];
while (it && j++)
while (it && ++j)
it= it->next;
return ((i > j) ? j : i);
data->nb_paths_max = (i > j) ? j : i;
}
static int lem_in(t_syntax *synt, t_holder *holder,
@@ -65,9 +65,10 @@ static int lem_in(t_syntax *synt, t_holder *holder,
if (!(lm_adj_parser(lmdata, holder)))
return (0);
lm_clear_unv(holder);
get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind);
if ((*ret = edmunds_karp(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind, get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind))) == NULL)
, get_node_role(lmdata, 'e')->ind)) == NULL)
return (0);
if (!push_ants(lmdata, *ret, get_nb_paths(*ret)))
return (0);