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

Cleaned the seg faults and normed the code, only

Browse Source 
lm_mem_utils has a norm error.
This commit is contained in:
Mthandazo Ndhlovu 2019-05-06 08:05:37 +02:00
parent a40b6b00e7
commit a21860983e
14 changed files with 139 additions and 10737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
Archive.zip
View File

Binary file not shown.

49
includes/lem_in.h
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/23 17:31:19 by tmaze #+# #+# */
/* Updated: 2019/05/02 13:05:37 by mndhlovu ### ########.fr */
/* Updated: 2019/05/06 07:39:55 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@ -49,8 +49,16 @@ typedef struct s_ants
struct s_ants *next;
} t_ants;
typedef struct s_syntax
typedef struct s_temp
{
int src_ind;
int dest_ind;
struct s_temp *next;
} t_temp;
typedef struct s_holder
{
int count;
int nb_state;
int s_cmd;
int s_pos;
@ -65,20 +73,7 @@ typedef struct s_syntax
int e_cmd;
int e_pos;
int v_flag;
} t_syntax;
typedef struct s_temp
{
int src_ind;
int dest_ind;
struct s_temp *next;
} t_temp;
typedef struct s_holder
{
int count;
t_temp *data;
t_syntax *syntax;
} t_holder;
typedef struct s_rdata
@ -97,36 +92,32 @@ typedef struct s_lmdata
t_rdata *map;
} t_lmdata;
int lm_validate(t_syntax *synt, t_lmdata *lmdata);
int lm_parser(t_syntax *synt, t_lmdata *ldata
int lm_parser(t_lmdata *ldata
, t_holder *holder);
int lm_check_room_before(char **tab, t_syntax *synt);
int lm_check_room_before(char **tab, t_holder *holder);
void lm_clear_unv(t_holder *holder, t_lmdata *ldata);
int lm_add_vertex(t_lmdata *ldata, char *raw, char flag
, t_syntax *synt);
, t_holder *holder);
int lm_ext_conn(t_holder *holder, t_lmdata *data
, char *raw);
int lm_init_src_dest(int *src, int *dest, t_lmdata *data
, char *raw);
int lm_find_index(t_lmdata *data, char *str);
void lm_get_cmd_vertices(int count, t_syntax *synt
void lm_get_cmd_vertices(int count, t_holder *holder
, t_lmdata *ldata, char *line);
int lm_get_value(char *line);
void lm_get_cmd_vert(int count, t_syntax *synt
void lm_check_start_vert(int count, t_holder *hol
, t_lmdata *ldata, char *line);
void lm_check_start_vert(int count, t_syntax *synt
, t_lmdata *ldata, char *line);
void lm_check_end_vert(int count, t_syntax *synt
void lm_check_end_vert(int count, t_holder *hol
, t_lmdata *ldata, char *line);
void lm_get_vert_link(int count, t_lmdata *ldata
, t_syntax *synt, t_holder *holder, char *line);
, t_holder *holder, char *line);
int lm_validate_rooms(char *name, char *x, char *y);
int lm_adj_parser(t_lmdata *lmdata, t_holder *holder);
void lm_init_data(t_syntax *synt, t_holder *holder
, t_lmdata *ldata);
int lm_verify_cmd(t_syntax *synt, t_holder *holder
, t_lmdata *data);
void lm_init_data(t_holder *holder, t_lmdata *ldata);
int lm_verify_cmd(t_holder *holder, t_lmdata *data);
void lm_initdata(t_lmdata *data);
int lm_error_nbr(char *raw);
int lm_getparams(t_lmdata *data);
void lm_clean_data(t_lmdata *data);
int lm_check_forbiden_chars(char *line, int flag);

28
libft/ft_strcmp.c
View File

@ -1,28 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_strcmp.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tmaze <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/04/03 15:38:27 by tmaze #+# #+# */
/* Updated: 2019/04/22 10:46:05 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_strcmp(const char *s1, const char *s2)
{
int i;
int diff;
i = 1;
diff = (unsigned char)s1[0] - (unsigned char)s2[0];
while (diff == 0 && s1[i - 1] && s2[i - 1])
{
diff = (unsigned char)s1[i] - (unsigned char)s2[i];
i++;
}
return (diff);
}

10553
map3
View File

File diff suppressed because it is too large Load Diff

BIN
srcs/.lem_in.c.swp
View File

Binary file not shown.

32
srcs/lem_in.c
View File

@ -6,43 +6,28 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 13:23:06 by mndhlovu ### ########.fr */
/* Updated: 2019/05/06 07:19:24 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
void lm_test_print(t_lmdata *data)
{
t_node *node;
if (data != NULL)
{
node = data->nodes_data;
while (node)
{
ft_printf("name: %s | x: %d | y: %d | role: %c \n", node->name, node->x, node->y, node->role);
node = node->next;
}
}
}
static int lem_in(t_syntax *synt, t_holder *holder,
static int lem_in(t_holder *holder,
t_lmdata *lmdata, t_ind ***ret)
{
lm_parser(synt, lmdata, holder);
if (!lm_verify_cmd(synt, holder, lmdata))
lm_parser(lmdata, holder);
if (!lm_verify_cmd(holder, lmdata))
return (0);
if (!lst_indinit(lmdata))
return (0);
if ((lm_adj_parser(lmdata, holder) == 0))
return (0);
print_map(lmdata);
//lm_test_print(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
if ((*ret = edmonds_karp(lmdata,
get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind)) == NULL)
return (0);
if (!push_ants(lmdata, *ret, get_nb_paths(*ret)))
@ -59,7 +44,6 @@ static int lm_error_exit(void)
int main(int ac, char **av)
{
t_syntax synt;
t_lmdata ldata;
t_holder holder;
t_ind **ret;
@ -67,8 +51,8 @@ int main(int ac, char **av)
(void)av;
if (ac == 1)
{
lm_init_data(&synt, &holder, &ldata);
if (!(lem_in(&synt, &holder, &ldata, &ret)))
lm_init_data(&holder, &ldata);
if (!(lem_in(&holder, &ldata, &ret)))
{
lm_clean_data(&ldata);
del_map(&ldata);

28
srcs/lm_check_errors.c
View File

@ -6,20 +6,20 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/22 08:55:30 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 13:20:38 by mndhlovu ### ########.fr */
/* Updated: 2019/05/06 07:34:46 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
int lm_check_room_before(char **tab, t_syntax *synt)
int lm_check_room_before(char **tab, t_holder *holder)
{
if (tab[0] != NULL && tab[1] != NULL && tab[2] != NULL)
{
if (lm_validate_rooms(tab[0], tab[1], tab[2]))
return (1);
}
synt->v_error = 1;
holder->v_error = 1;
return (0);
}
@ -62,23 +62,25 @@ void lm_clear_unv(t_holder *holder, t_lmdata *ldata)
del_map(ldata);
}
int lm_verify_links(t_holder *data, t_syntax *synt)
int lm_verify_links(t_holder *data, t_holder *hold)
{
if (!synt->l_error || (synt->l_error && data->count > 0))
if (!hold->l_error
|| (hold->l_error
&& data->count > 0))
return (1);
return (0);
}
int lm_verify_cmd(t_syntax *synt, t_holder *holder
int lm_verify_cmd(t_holder *holder
, t_lmdata *data)
{
if (synt->s_cmd && synt->e_cmd
&& !synt->e_error && !synt->s_error
&& !synt->v_error
&& synt->s_vert
&& synt->e_vert
&& synt->nb_state
&& lm_verify_links(holder, synt)
if (holder->s_cmd && holder->e_cmd
&& !holder->e_error && !holder->s_error
&& !holder->v_error
&& holder->s_vert
&& holder->e_vert
&& holder->nb_state
&& lm_verify_links(holder, holder)
&& (data->nb_nodes > 0))
return (1);
lm_clear_unv(holder, data);

56
srcs/lm_initdata.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/23 17:43:34 by tmaze #+# #+# */
/* Updated: 2019/05/02 12:52:26 by mndhlovu ### ########.fr */
/* Updated: 2019/05/06 07:25:15 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@ -19,52 +19,58 @@ void lm_initdata(t_lmdata *data)
data->adj = NULL;
}
void lm_check_start_vert(int count, t_syntax *synt, t_lmdata *ldata, char *line)
void lm_check_start_vert(int count, t_holder *hol
, t_lmdata *ldata, char *line)
{
if ((synt->s_pos < synt->e_pos) && lm_check_forbiden_chars(line, 0))
if ((hol->s_pos < hol->e_pos)
&& lm_check_forbiden_chars(line, 0))
{
if ((count > synt->s_pos && count < synt->e_pos)
&& (!synt->s_vert))
if ((count > hol->s_pos && count < hol->e_pos)
&& (!hol->s_vert))
{
if ((lm_add_vertex(ldata, line, 's', synt)))
synt->s_vert = count;
if ((lm_add_vertex(ldata, line, 's', hol)))
hol->s_vert = count;
else
synt->s_error = 1;
hol->s_error = 1;
}
}
if ((synt->s_pos > synt->e_pos) && lm_check_forbiden_chars(line, 0))
if ((hol->s_pos > hol->e_pos)
&& lm_check_forbiden_chars(line, 0))
{
if (!synt->s_vert)
if (!hol->s_vert)
{
if ((lm_add_vertex(ldata, line, 's', synt)))
synt->s_vert = count;
if ((lm_add_vertex(ldata, line, 's', hol)))
hol->s_vert = count;
else
synt->s_error = 1;
hol->s_error = 1;
}
}
}
void lm_check_end_vert(int count, t_syntax *synt, t_lmdata *ldata, char *line)
void lm_check_end_vert(int count, t_holder *hol
, t_lmdata *ldata, char *line)
{
if((synt->e_pos < synt->s_pos) && lm_check_forbiden_chars(line, 0))
if ((hol->e_pos < hol->s_pos)
&& lm_check_forbiden_chars(line, 0))
{
if ((count > synt->e_pos && count < synt->s_pos)
&& (!synt->e_vert))
if ((count > hol->e_pos && count < hol->s_pos)
&& (!hol->e_vert))
{
if ((lm_add_vertex(ldata, line, 'e', synt)))
synt->e_vert = count;
if ((lm_add_vertex(ldata, line, 'e', hol)))
hol->e_vert = count;
else
synt->e_error = 1;
hol->e_error = 1;
}
}
if ((synt->e_pos > synt->s_pos) && lm_check_forbiden_chars(line, 0))
if ((hol->e_pos > hol->s_pos)
&& lm_check_forbiden_chars(line, 0))
{
if (!synt->e_vert)
if (!hol->e_vert)
{
if ((lm_add_vertex(ldata, line, 'e', synt)))
synt->e_vert = count;
if ((lm_add_vertex(ldata, line, 'e', hol)))
hol->e_vert = count;
else
synt->e_error = 1;
hol->e_error = 1;
}
}
}

34
srcs/lm_mem_utils.c
View File

@ -6,27 +6,27 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:37 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 13:20:36 by mndhlovu ### ########.fr */
/* Updated: 2019/05/06 07:34:54 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
void lm_init_data(t_syntax *synt, t_holder *holder, t_lmdata *ldata)
void lm_init_data(t_holder *holder, t_lmdata *ldata)
{
synt->nb_state = 0;
synt->s_cmd = 0;
synt->e_cmd = 0;
synt->s_error = 0;
synt->e_error = 0;
synt->v_error = 0;
synt->l_error = 0;
synt->s_vert = 0;
synt->e_vert = 0;
synt->gr_status = 0;
synt->s_pos = 0;
synt->e_pos = 0;
synt->v_flag = 0;
holder->nb_state = 0;
holder->s_cmd = 0;
holder->e_cmd = 0;
holder->s_error = 0;
holder->e_error = 0;
holder->v_error = 0;
holder->l_error = 0;
holder->s_vert = 0;
holder->e_vert = 0;
holder->gr_status = 0;
holder->s_pos = 0;
holder->e_pos = 0;
holder->v_flag = 0;
holder->count = 0;
holder->data = NULL;
ldata->nbants = 0;
@ -53,7 +53,7 @@ static void lm_add_vertex_sub(t_lmdata *ldata, t_node *new)
}
int lm_add_vertex(t_lmdata *ldata, char *raw, char flag,
t_syntax *synt)
t_holder *holder)
{
char **tab;
t_node *new;
@ -63,7 +63,7 @@ int lm_add_vertex(t_lmdata *ldata, char *raw, char flag,
tab = ft_strsplit(raw, ' ');
if (tab != NULL)
{
if (lm_check_room_before(tab, synt))
if (lm_check_room_before(tab, holder))
{
if ((new->name = ft_strdup(tab[0])) == NULL)
ft_del_words_tables(&tab);

41
srcs/lm_parser.c
View File

@ -6,42 +6,42 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/20 15:24:51 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 13:11:43 by mndhlovu ### ########.fr */
/* Updated: 2019/05/02 13:35:43 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
static void lm_locate_cd(int index, t_syntax *synt, char *line)
static void lm_locate_cd(int index, t_holder *holder, char *line)
{
char *tmp;
tmp = ft_strchr(line, '#');
if ((!synt->s_cmd || !synt->e_cmd)
if ((!holder->s_cmd || !holder->e_cmd)
&& (tmp != NULL && line[1] == '#'
&& lm_check_forbiden_chars(line, 1)))
{
if (!synt->s_cmd)
if (!holder->s_cmd)
{
if (ft_strcmp(line, "##start") == 0)
{
synt->s_cmd = 1;
synt->s_pos = index;
holder->s_cmd = 1;
holder->s_pos = index;
}
}
if (!synt->e_cmd)
if (!holder->e_cmd)
{
if (ft_strcmp(line, "##end") == 0)
{
synt->e_cmd = 1;
synt->e_pos = index;
holder->e_cmd = 1;
holder->e_pos = index;
}
}
}
}
static int lm_get_ant_(int counter, t_lmdata *ldata
, t_syntax *synt, char *line)
, t_holder *holder, char *line)
{
int value;
@ -51,7 +51,7 @@ static int lm_get_ant_(int counter, t_lmdata *ldata
if (value > 0)
{
ldata->nbants = value;
synt->nb_state = 1;
holder->nb_state = 1;
return (1);
}
free(line);
@ -60,20 +60,19 @@ static int lm_get_ant_(int counter, t_lmdata *ldata
}
static int lm_get_vertices(int count, t_lmdata *data
, t_syntax *syntax, t_holder *holder, char *line)
, t_holder *holder, char *line)
{
lm_get_cmd_vertices(count, syntax, data, line);
if (!syntax->s_error && !syntax->e_error)
lm_get_cmd_vertices(count, holder, data, line);
if (!holder->s_error && !holder->e_error)
{
lm_get_vert_link(count, data, syntax, holder, line);
if (!syntax->v_error && !syntax->l_error)
lm_get_vert_link(count, data, holder, line);
if (!holder->v_error && !holder->l_error)
return (1);
}
return (0);
}
int lm_parser(t_syntax *synt
, t_lmdata *ldata, t_holder *holder)
int lm_parser(t_lmdata *ldata, t_holder *holder)
{
char *raw;
int index;
@ -83,10 +82,10 @@ int lm_parser(t_syntax *synt
{
if ((add_line_map(ldata, raw)))
return (0);
if (!(lm_get_ant_(index, ldata, synt, raw)) && index == 0)
if (!(lm_get_ant_(index, ldata, holder, raw)) && index == 0)
return (0);
lm_locate_cd(index, synt, raw);
if (!(lm_get_vertices(index, ldata, synt, holder, raw)))
lm_locate_cd(index, holder, raw);
if (!(lm_get_vertices(index, ldata, holder, raw)))
return (0);
index++;
}

4
srcs/lm_parser_error_check.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/08 06:42:37 by mndhlovu #+# #+# */
/* Updated: 2019/04/29 12:06:08 by mndhlovu ### ########.fr */
/* Updated: 2019/05/06 07:24:46 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@ -71,6 +71,6 @@ int lm_error_nbr(char *raw)
|| lm_check_max(raw) == -1
|| (ft_atoi(raw) > 0 && (ft_atoi(raw) == 0))
|| ft_strlen(raw) > 19)
return (-1);
return (0);
return (1);
}

26
srcs/lm_utils_parser.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/04 09:24:45 by mndhlovu #+# #+# */
/* Updated: 2019/05/02 13:12:06 by mndhlovu ### ########.fr */
/* Updated: 2019/05/06 07:25:00 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,7 +21,7 @@ static int lm_check_ant_no(char *line)
{
if (len == 1 && ft_isdigit(*line))
return (*line - '0');
else if (len > 1 && len < 19 && ft_isnumeric(line))
else if (len > 1 && lm_error_nbr(line) && ft_isnumeric(line))
return (ft_atoi(line));
}
return (0);
@ -34,33 +34,33 @@ int lm_get_value(char *line)
return (0);
}
void lm_get_cmd_vertices(int count, t_syntax *synt
void lm_get_cmd_vertices(int count, t_holder *holder
, t_lmdata *ldata, char *line)
{
if (count > 0 && line != NULL)
{
lm_check_start_vert(count, synt, ldata, line);
lm_check_end_vert(count, synt, ldata, line);
lm_check_start_vert(count, holder, ldata, line);
lm_check_end_vert(count, holder, ldata, line);
}
}
void lm_get_vert_link(int count, t_lmdata *ldata
, t_syntax *syntax, t_holder *holder, char *line)
, t_holder *holder, char *line)
{
if (count > 0 && (count != syntax->s_vert
&& count != syntax->e_vert)
&& (count != syntax->s_pos
&& count != syntax->e_pos && line != NULL))
if (count > 0 && (count != holder->s_vert
&& count != holder->e_vert)
&& (count != holder->s_pos
&& count != holder->e_pos && line != NULL))
{
if (lm_check_forbiden_chars(line, 0))
{
if (!(lm_add_vertex(ldata, line, 'v', syntax)))
syntax->v_error = 1;
if (!(lm_add_vertex(ldata, line, 'v', holder)))
holder->v_error = 1;
}
if (lm_check_forbiden_chars(line, 3))
{
if (!(lm_ext_conn(holder, ldata, line)))
syntax->l_error = 1;
holder->l_error = 1;
}
}
}

7
srcs/print_map.c
View File

@ -6,17 +6,18 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/24 17:35:29 by tmaze #+# #+# */
/* Updated: 2019/05/02 13:09:34 by mndhlovu ### ########.fr */
/* Updated: 2019/05/06 07:38:36 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
#include <stdio.h>
void del_map(t_lmdata *data)
{
t_rdata *tmp;
if (data != NULL)
{
while (data->map)
{
tmp = data->map;
@ -24,6 +25,7 @@ void del_map(t_lmdata *data)
ft_strdel(&(tmp->line));
ft_memdel((void**)&tmp);
}
}
}
void print_map(t_lmdata *data)
@ -59,4 +61,3 @@ int add_line_map(t_lmdata *data, char *line)
}
return (0);
}