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

no more leaks on all maps

Browse Source
This commit is contained in:
Mthandazo Ndhlovu 2019-05-02 13:25:41 +02:00
parent 8552cf8a32
commit a40b6b00e7
9 changed files with 10572 additions and 7269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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 11:18:03 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 13:05:37 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -101,7 +101,7 @@ int lm_validate(t_syntax *synt, t_lmdata *lmdata);
int lm_parser(t_syntax *synt, t_lmdata *ldata int lm_parser(t_syntax *synt, t_lmdata *ldata
, t_holder *holder); , t_holder *holder);
int lm_check_room_before(char **tab, t_syntax *synt); int lm_check_room_before(char **tab, t_syntax *synt);
void lm_clear_unv(t_holder *holder); void lm_clear_unv(t_holder *holder, t_lmdata *ldata);
int lm_add_vertex(t_lmdata *ldata, char *raw, char flag int lm_add_vertex(t_lmdata *ldata, char *raw, char flag
, t_syntax *synt); , t_syntax *synt);
int lm_ext_conn(t_holder *holder, t_lmdata *data int lm_ext_conn(t_holder *holder, t_lmdata *data

17776
map3
View File

File diff suppressed because it is too large Load Diff

BIN
srcs/.lm_utils_parser.c.swp
View File

Binary file not shown.

10
srcs/lem_in.c
View File

@ -6,13 +6,13 @@
/* 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 12:56:48 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 13:23:06 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "lem_in.h" #include "lem_in.h"
static void lm_test_print(t_lmdata *data) void lm_test_print(t_lmdata *data)
{ {
t_node *node; t_node *node;
@ -38,8 +38,8 @@ 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_test_print(lmdata);
lm_clear_unv(holder); lm_clear_unv(holder, lmdata);
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
@ -71,8 +71,10 @@ int main(int ac, char **av)
if (!(lem_in(&synt, &holder, &ldata, &ret))) if (!(lem_in(&synt, &holder, &ldata, &ret)))
{ {
lm_clean_data(&ldata); lm_clean_data(&ldata);
del_map(&ldata);
return (lm_error_exit()); return (lm_error_exit());
} }
del_map(&ldata);
lm_clean_data(&ldata); lm_clean_data(&ldata);
return (0); return (0);
} }

9
srcs/lm_check_errors.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/22 08:55:30 by mndhlovu #+# #+# */ /* Created: 2019/04/22 08:55:30 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 12:58:05 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 13:20:38 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -45,7 +45,7 @@ int lm_check_forbiden_chars(char *line, int flag)
return (0); return (0);
} }
void lm_clear_unv(t_holder *holder) void lm_clear_unv(t_holder *holder, t_lmdata *ldata)
{ {
t_temp *data; t_temp *data;
t_temp *flush; t_temp *flush;
@ -59,6 +59,7 @@ void lm_clear_unv(t_holder *holder)
flush = NULL; flush = NULL;
} }
holder->data = NULL; holder->data = NULL;
del_map(ldata);
} }
int lm_verify_links(t_holder *data, t_syntax *synt) int lm_verify_links(t_holder *data, t_syntax *synt)
@ -74,10 +75,12 @@ int lm_verify_cmd(t_syntax *synt, t_holder *holder
if (synt->s_cmd && synt->e_cmd if (synt->s_cmd && synt->e_cmd
&& !synt->e_error && !synt->s_error && !synt->e_error && !synt->s_error
&& !synt->v_error && !synt->v_error
&& synt->s_vert
&& synt->e_vert
&& synt->nb_state && synt->nb_state
&& lm_verify_links(holder, synt) && lm_verify_links(holder, synt)
&& (data->nb_nodes > 0)) && (data->nb_nodes > 0))
return (1); return (1);
lm_clear_unv(holder); lm_clear_unv(holder, data);
return (0); return (0);
} }

5
srcs/lm_mem_utils.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:37 by mndhlovu #+# #+# */ /* Created: 2019/03/25 06:31:37 by mndhlovu #+# #+# */
/* Updated: 2019/04/30 07:56:14 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 13:20:36 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -78,6 +78,8 @@ int lm_add_vertex(t_lmdata *ldata, char *raw, char flag,
ft_del_words_tables(&tab); ft_del_words_tables(&tab);
return (1); return (1);
} }
ft_del_words_tables(&tab);
free(new);
} }
return (0); return (0);
} }
@ -122,5 +124,6 @@ int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
(holder->count)++; (holder->count)++;
return (1); return (1);
} }
free(new);
return (0); return (0);
} }

2
srcs/lm_parser.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/20 15:24:51 by mndhlovu #+# #+# */ /* Created: 2019/04/20 15:24:51 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 11:18:42 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 13:11:43 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

33
srcs/lm_utils_parser.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/04 09:24:45 by mndhlovu #+# #+# */ /* Created: 2019/04/04 09:24:45 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 11:18:12 by mndhlovu ### ########.fr */ /* Updated: 2019/05/02 13:12:06 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -44,37 +44,6 @@ void lm_get_cmd_vertices(int count, t_syntax *synt
} }
} }
void lm_get_cmd_vert(int count, t_syntax *synt
, t_lmdata *ldata, char *line)
{
char *tmp;
if ((synt->s_pos == count - 1 && lm_check_forbiden_chars(line, 0))
|| ((synt->s_pos <= count && !synt->s_vert)
&& lm_check_forbiden_chars(line, 0)))
{
tmp = ft_strchr(line, '#');
if (tmp == NULL && count != synt->e_vert)
{
synt->s_vert = count;
if (!(lm_add_vertex(ldata, line, 's', synt)))
synt->s_error = 1;
}
}
if ((synt->e_pos == count - 1 && lm_check_forbiden_chars(line, 0))
|| ((synt->e_pos <= count && !synt->e_vert)
&& lm_check_forbiden_chars(line, 0)))
{
tmp = ft_strchr(line, '#');
if (tmp == NULL && count != synt->s_vert)
{
synt->e_vert = count;
if (!(lm_add_vertex(ldata, line, 'e', synt)))
synt->e_error = 1;
}
}
}
void lm_get_vert_link(int count, t_lmdata *ldata void lm_get_vert_link(int count, t_lmdata *ldata
, t_syntax *syntax, t_holder *holder, char *line) , t_syntax *syntax, t_holder *holder, char *line)
{ {

2
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/04/29 13:05:56 by tmaze ### ########.fr */ /* Updated: 2019/05/02 13:09:34 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */