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

added start-end check

Browse Source 
if start and end are linked, push all the ants through
This commit is contained in:
Tanguy MAZE 2019-05-02 14:35:37 +02:00
parent a40b6b00e7
commit 3156bddf27
6 changed files with 12746 additions and 10566 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/05/02 13:05:37 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 14:26:31 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -149,6 +149,7 @@ int get_score(t_lmdata *data, t_ind **ret, int nb_paths);
void print_paths(t_lmdata *data, t_ind **ret); void print_paths(t_lmdata *data, t_ind **ret);
int push_ants(t_lmdata *data, t_ind **paths int push_ants(t_lmdata *data, t_ind **paths
, int nb_paths); , int nb_paths);
void push_ants_end(t_lmdata *data, char *e_name);
void del_map(t_lmdata *data); void del_map(t_lmdata *data);
int add_line_map(t_lmdata *data, char *line); int add_line_map(t_lmdata *data, char *line);

23247
map3
View File

File diff suppressed because it is too large Load Diff

2
maps/simple1
View File

@ -1,4 +1,4 @@
4 23
##start ##start
start 0 0 start 0 0
##end ##end

23
srcs/lem_in.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */ /* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 13:23:06 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 14:26:13 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -27,6 +27,20 @@ void lm_test_print(t_lmdata *data)
} }
} }
static int start_end_link(t_lmdata *data, int s_ind, int e_ind)
{
t_ind *it;
it = data->adj[s_ind];
while (it)
{
if (it->index == e_ind)
return (1);
it = it->next;
}
return (0);
}
static int lem_in(t_syntax *synt, t_holder *holder, static int lem_in(t_syntax *synt, t_holder *holder,
t_lmdata *lmdata, t_ind ***ret) t_lmdata *lmdata, t_ind ***ret)
{ {
@ -38,8 +52,12 @@ static int lem_in(t_syntax *synt, t_holder *holder,
if ((lm_adj_parser(lmdata, holder) == 0)) if ((lm_adj_parser(lmdata, holder) == 0))
return (0); return (0);
print_map(lmdata); print_map(lmdata);
//lm_test_print(lmdata);
lm_clear_unv(holder, lmdata); lm_clear_unv(holder, lmdata);
if (start_end_link(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind))
push_ants_end(lmdata, get_node_role(lmdata, 'e')->name);
else
{
get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind); , get_node_role(lmdata, 'e')->ind);
if ((*ret = edmonds_karp(lmdata, get_node_role(lmdata, 's')->ind if ((*ret = edmonds_karp(lmdata, get_node_role(lmdata, 's')->ind
@ -48,6 +66,7 @@ static int lem_in(t_syntax *synt, t_holder *holder,
if (!push_ants(lmdata, *ret, get_nb_paths(*ret))) if (!push_ants(lmdata, *ret, get_nb_paths(*ret)))
return (0); return (0);
tablst_inddel(*ret); tablst_inddel(*ret);
}
return (1); return (1);
} }

4
srcs/print_map.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/24 17:35:29 by tmaze #+# #+# */ /* Created: 2019/04/24 17:35:29 by tmaze #+# #+# */
/* Updated: 2019/05/02 13:09:34 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 14:34:28 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -37,6 +37,7 @@ void print_map(t_lmdata *data)
it = it->next; it = it->next;
} }
del_map(data); del_map(data);
ft_printf("\n");
} }
int add_line_map(t_lmdata *data, char *line) int add_line_map(t_lmdata *data, char *line)
@ -59,4 +60,3 @@ int add_line_map(t_lmdata *data, char *line)
} }
return (0); return (0);
} }

17
srcs/push_ants_utils.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/10 11:23:36 by tmaze #+# #+# */ /* Created: 2019/04/10 11:23:36 by tmaze #+# #+# */
/* Updated: 2019/04/30 07:06:08 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 14:33:30 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -69,3 +69,18 @@ t_ind *get_node_path(t_ind *lst, int index)
it = it->next; it = it->next;
return (it); return (it);
} }
void push_ants_end(t_lmdata *data, char *e_name)
{
int i;
i = 1;
while (i <= data->nbants)
{
ft_printf("L%d-%s", i, e_name);
if (i != data->nbants)
ft_putchar(' ');
i++;
}
ft_printf("\n");
}