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

norm errors eliminated and parser modified

Browse Source
This commit is contained in:
Mthandazo Ndhlovu 2019-05-09 17:41:07 +02:00
parent 94145d3d17
commit ea99e7b1fc
10 changed files with 70 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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/06 07:39:55 by mndhlovu ### ########.fr */ /* Updated: 2019/05/09 17:39:33 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -64,6 +64,7 @@ typedef struct s_holder
int s_pos; int s_pos;
int error; int error;
int s_error; int s_error;
int state;
int e_error; int e_error;
int v_error; int v_error;
int l_error; int l_error;
@ -94,12 +95,14 @@ typedef struct s_lmdata
int lm_parser(t_lmdata *ldata int lm_parser(t_lmdata *ldata
, t_holder *holder); , t_holder *holder);
int lm_check_room_before(char **tab, t_holder *holder); int lm_check_room_before(char **tab, t_holder *holder
void lm_clear_unv(t_holder *holder, t_lmdata *ldata); , char **name);
void lm_clear_unv(t_holder *holder);
int lm_add_vertex(t_lmdata *ldata, char *raw, char flag int lm_add_vertex(t_lmdata *ldata, char *raw, char flag
, t_holder *holder); , t_holder *holder);
int lm_ext_conn(t_holder *holder, t_lmdata *data int lm_ext_conn(t_holder *holder, t_lmdata *data
, char *raw); , char *raw);
void lm_ext_conn_sub(t_holder *holder, t_temp *new_data);
int lm_init_src_dest(int *src, int *dest, t_lmdata *data int lm_init_src_dest(int *src, int *dest, t_lmdata *data
, char *raw); , char *raw);
int lm_find_index(t_lmdata *data, char *str); int lm_find_index(t_lmdata *data, char *str);

28
map4 Normal file
View File

@ -0,0 +1,28 @@
10
##start
1 23 3
2 16 7
#commentaire
3 16 3
4 16 5
5 9 3
6 1 5
7 4 8
##end
0 9 5
0-4
10 9 5
0-6
1-3
4-3
5-2
3-5
#autre commentaire
4-2
2-1
7-6
7-2
7-4
#C'est la fin
6-5
#autre commentaire

5
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/09 16:24:17 by tmaze ### ########.fr */ /* Updated: 2019/05/09 17:38:50 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -50,7 +50,7 @@ static int lem_in(t_holder *holder,
return (0); return (0);
if ((lm_adj_parser(lmdata, holder) == 0)) if ((lm_adj_parser(lmdata, holder) == 0))
return (0); return (0);
lm_clear_unv(holder, lmdata); lm_clear_unv(holder);
if (start_end_link(lmdata, get_node_role(lmdata, 's')->ind if (start_end_link(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind)) , get_node_role(lmdata, 'e')->ind))
{ {
@ -59,6 +59,7 @@ static int lem_in(t_holder *holder,
} }
else if (!do_algorithm(lmdata, ret)) else if (!do_algorithm(lmdata, ret))
return (0); return (0);
del_map(lmdata);
return (1); return (1);
} }

16
srcs/lm_check_errors.c
View File

@ -6,19 +6,24 @@
/* 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/06 07:34:46 by mndhlovu ### ########.fr */ /* Updated: 2019/05/09 17:37:23 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "lem_in.h" #include "lem_in.h"
int lm_check_room_before(char **tab, t_holder *holder) int lm_check_room_before(char **tab, t_holder *holder
, char **name)
{ {
if (tab[0] != NULL && tab[1] != NULL && tab[2] != NULL) if (tab[0] != NULL && tab[1] != NULL && tab[2] != NULL)
{ {
if (lm_validate_rooms(tab[0], tab[1], tab[2])) if (lm_validate_rooms(tab[0], tab[1], tab[2]) && !holder->state)
{
if (!(*name = ft_strdup(tab[0])))
return (0);
return (1); return (1);
} }
}
holder->v_error = 1; holder->v_error = 1;
return (0); return (0);
} }
@ -45,7 +50,7 @@ int lm_check_forbiden_chars(char *line, int flag)
return (0); return (0);
} }
void lm_clear_unv(t_holder *holder, t_lmdata *ldata) void lm_clear_unv(t_holder *holder)
{ {
t_temp *data; t_temp *data;
t_temp *flush; t_temp *flush;
@ -59,7 +64,6 @@ void lm_clear_unv(t_holder *holder, t_lmdata *ldata)
flush = NULL; flush = NULL;
} }
holder->data = NULL; holder->data = NULL;
del_map(ldata);
} }
int lm_verify_links(t_holder *data, t_holder *hold) int lm_verify_links(t_holder *data, t_holder *hold)
@ -83,6 +87,6 @@ int lm_verify_cmd(t_holder *holder
&& lm_verify_links(holder, holder) && lm_verify_links(holder, holder)
&& (data->nb_nodes > 0)) && (data->nb_nodes > 0))
return (1); return (1);
lm_clear_unv(holder, data); lm_clear_unv(holder);
return (0); return (0);
} }

2
srcs/lm_data_utils.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/05 06:35:40 by mndhlovu #+# #+# */ /* Created: 2019/04/05 06:35:40 by mndhlovu #+# #+# */
/* Updated: 2019/04/30 07:14:50 by mndhlovu ### ########.fr */ /* Updated: 2019/05/09 17:35:34 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

12
srcs/lm_graph_utils.c
View File

@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */ /* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/29 07:17:06 by mndhlovu #+# #+# */ /* Created: 2019/03/29 07:17:06 by mndhlovu #+# #+# */
/* Updated: 2019/04/30 07:15:04 by mndhlovu ### ########.fr */ /* Updated: 2019/05/09 17:26:36 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -29,6 +29,16 @@ static int is_link_in(t_lmdata *data, int src, int dest)
return (0); return (0);
} }
void lm_ext_conn_sub(t_holder *holder, t_temp *new_data)
{
t_temp *temp;
temp = holder->data;
while (temp->next)
temp = temp->next;
temp->next = new_data;
}
int lm_adj_parser(t_lmdata *lmdata, t_holder *holder) int lm_adj_parser(t_lmdata *lmdata, t_holder *holder)
{ {
t_temp *data; t_temp *data;

2
srcs/lm_initdata.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/23 17:43:34 by tmaze #+# #+# */ /* Created: 2019/03/23 17:43:34 by tmaze #+# #+# */
/* Updated: 2019/05/06 07:25:15 by mndhlovu ### ########.fr */ /* Updated: 2019/05/09 17:35:50 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

24
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/05/06 07:34:54 by mndhlovu ### ########.fr */ /* Updated: 2019/05/09 17:33:39 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -23,7 +23,7 @@ void lm_init_data(t_holder *holder, t_lmdata *ldata)
holder->l_error = 0; holder->l_error = 0;
holder->s_vert = 0; holder->s_vert = 0;
holder->e_vert = 0; holder->e_vert = 0;
holder->gr_status = 0; holder->state = 0;
holder->s_pos = 0; holder->s_pos = 0;
holder->e_pos = 0; holder->e_pos = 0;
holder->v_flag = 0; holder->v_flag = 0;
@ -57,18 +57,15 @@ int lm_add_vertex(t_lmdata *ldata, char *raw, char flag,
{ {
char **tab; char **tab;
t_node *new; t_node *new;
char *str;
if (!(new = (t_node *)ft_memalloc(sizeof(t_node)))) if (!(new = (t_node *)ft_memalloc(sizeof(t_node))))
return (0); return (0);
tab = ft_strsplit(raw, ' '); if ((tab = ft_strsplit(raw, ' ')) != NULL)
if (tab != NULL)
{ {
if (lm_check_room_before(tab, holder)) if (lm_check_room_before(tab, holder, &str))
{ {
if ((new->name = ft_strdup(tab[0])) == NULL) new->name = str;
ft_del_words_tables(&tab);
if (new->name == NULL)
return (0);
new->x = ft_atoi(tab[1]); new->x = ft_atoi(tab[1]);
new->y = ft_atoi(tab[2]); new->y = ft_atoi(tab[2]);
new->role = flag; new->role = flag;
@ -100,7 +97,6 @@ int lm_find_index(t_lmdata *data, char *str)
int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw) int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
{ {
t_temp *temp;
t_temp *new; t_temp *new;
int src; int src;
int dest; int dest;
@ -115,13 +111,9 @@ int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
if (holder->data == NULL) if (holder->data == NULL)
holder->data = new; holder->data = new;
else else
{ lm_ext_conn_sub(holder, new);
temp = holder->data;
while (temp->next)
temp = temp->next;
temp->next = new;
}
(holder->count)++; (holder->count)++;
holder->state = 1;
return (1); return (1);
} }
free(new); free(new);

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 13:35:43 by mndhlovu ### ########.fr */ /* Updated: 2019/05/09 16:55:53 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
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/06 07:25:00 by mndhlovu ### ########.fr */ /* Updated: 2019/05/09 17:40:24 by mndhlovu ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */