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

minor modifications to map printing and ant paths

Browse Source 
print map if look ok and has path
if start & end linked, only 1 operation
This commit is contained in:
Tanguy MAZE 2019-05-09 16:26:35 +02:00
parent f44cda2833
commit 94145d3d17
2 changed files with 5256 additions and 12706 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17916
map3
View File

File diff suppressed because it is too large Load Diff

46
srcs/lem_in.c
View File

@ -6,12 +6,40 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/05/06 07:19:24 by mndhlovu ### ########.fr */
/* Updated: 2019/05/09 16:24:17 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
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 do_algorithm(t_lmdata *lmdata, t_ind ***ret)
{
get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind);
if ((*ret = edmonds_karp(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind)) == NULL)
return (0);
print_map(lmdata);
if (!push_ants(lmdata, *ret, get_nb_paths(*ret)))
return (0);
tablst_inddel(*ret);
return (1);
}
static int lem_in(t_holder *holder,
t_lmdata *lmdata, t_ind ***ret)
{
@ -22,17 +50,15 @@ static int lem_in(t_holder *holder,
return (0);
if ((lm_adj_parser(lmdata, holder) == 0))
return (0);
print_map(lmdata);
lm_clear_unv(holder, lmdata);
get_nb_paths_max(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind);
if ((*ret = edmonds_karp(lmdata,
get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind)) == NULL)
if (start_end_link(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind))
{
print_map(lmdata);
push_ants_end(lmdata, get_node_role(lmdata, 'e')->name);
}
else if (!do_algorithm(lmdata, ret))
return (0);
if (!push_ants(lmdata, *ret, get_nb_paths(*ret)))
return (0);
tablst_inddel(*ret);
return (1);
}