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

code cleaning done on 80 percent of the parser functions, whats left is to re structure the syntax struct and do furthure tests to eliminate level 0 errors

Browse Source
This commit is contained in:
Mthandazo Ndhlovu
2019-04-29 12:47:14 +02:00
parent 6ad8cd2d95
commit a51c8ad81d
17 changed files with 389 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -6,7 +6,7 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2019/03/27 16:51:02 by tmaze #+# #+# #
# Updated: 2019/04/24 18:00:14 by tmaze ### ########.fr #
# Updated: 2019/04/29 12:01:17 by mndhlovu ### ########.fr #
# #
#******************************************************************************#
@@ -45,6 +45,7 @@ SRC = lm_parser.c \
lm_graph_utils.c \
lm_parser_error_check.c \
lm_utils_parser.c \
lm_utils_algo.c \
bfs.c \
lst_ind.c \
edmonds_karp.c \

9
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/04/26 11:22:41 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:14:34 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -96,7 +96,6 @@ typedef struct s_lmdata
t_rdata *map;
} t_lmdata;
int lm_error_exit(void);
int lm_validate(t_syntax *synt, t_lmdata *lmdata);
int lm_parser(t_syntax *synt, t_lmdata *ldata
, t_holder *holder);
@@ -106,6 +105,8 @@ int lm_add_vertex(t_lmdata *ldata, char *raw, char flag
, t_syntax *synt);
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);
int lm_get_value(char *line);
@@ -148,4 +149,8 @@ void del_map(t_lmdata *data);
int add_line_map(t_lmdata *data, char *line);
void print_map(t_lmdata *data);
t_node *get_node_role(t_lmdata *data, char role);
int get_nb_paths(t_ind **ret);
void get_nb_paths_max(t_lmdata *data, int start, int end);
#endif

2
libft/srcs/ft_isdigit.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/04/04 11:33:35 by tmaze #+# #+# */
/* Updated: 2018/04/04 11:34:10 by tmaze ### ########.fr */
/* Updated: 2019/04/29 11:16:40 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */

4
libft/srcs/ft_isnumeric.c
View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/26 10:17:04 by mndhlovu #+# #+# */
/* Updated: 2019/04/26 10:35:46 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 11:20:54 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -17,6 +17,8 @@ int ft_isnumeric(char *str)
int index;
index = 0;
if (str[index] == '-' || str[index] == '+')
index++;
while (str[index] != '\0')
{
if (!ft_isdigit(str[index]))

BIN
srcs/.lm_mem_utils.c.swp
View File

Binary file not shown.

55
srcs/lem_in.c
View File

@@ -6,79 +6,36 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/04/26 13:21:09 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:40:52 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
static t_node *get_node_role(t_lmdata *data, char role)
{
t_node *it;
it = data->nodes_data;
while (it)
{
if (it->role == role)
return (it);
it = it->next;
}
return (NULL);
}
static int get_nb_paths(t_ind **ret)
{
int i;
i = 0;
while (ret[i])
i++;
return (i);
}
static void get_nb_paths_max(t_lmdata *data, int start, int end)
{
int i;
int j;
t_ind *it;
i = 0;
j = 0;
it = data->adj[start];
while (it && ++i)
it = it->next;
it = data->adj[end];
while (it && ++j)
it= it->next;
data->nb_paths_max = (i > j) ? j : i;
}
static int lem_in(t_syntax *synt, t_holder *holder,
t_lmdata *lmdata, t_ind ***ret)
{
lm_parser(synt, lmdata, holder);
if (!(lm_verify_cmd(synt, holder, lmdata)))
if (!lm_verify_cmd(synt, holder, lmdata))
return (0);
print_map(lmdata);
if (!lst_indinit(lmdata))
return (0);
lm_adj_parser(lmdata, holder);
if ((lm_adj_parser(lmdata, holder) == 0))
return (0);
//print_map(lmdata);
lm_clear_unv(holder);
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)
{
ft_printf("plop\n");
return (0);
}
if (!push_ants(lmdata, *ret, get_nb_paths(*ret)))
return (0);
tablst_inddel(*ret);
return (1);
}
int lm_error_exit(void)
static int lm_error_exit(void)
{
ft_putendl_fd("ERROR", 2);
return (1);

17
srcs/lm_check_errors.c
View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/22 08:55:30 by mndhlovu #+# #+# */
/* Updated: 2019/04/26 13:35:05 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:06:41 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -32,17 +32,14 @@ int lm_check_forbiden_chars(char *line, int flag)
{
dash = ft_strchr(line, '-');
hash = ft_strchr(line, '#');
if (flag == 0 && dash == NULL
&& hash == NULL)
if (flag == 0 && dash == NULL && hash == NULL)
return (1);
if (flag == 1 && dash == NULL
&& hash != NULL)
if (flag == 1 && dash == NULL && hash != NULL)
return (1);
if (flag == 2 && dash == NULL
&& (hash == NULL || (hash != NULL && line[1] != '#')))
return (1);
if (flag == 3 && dash != NULL
&& hash == NULL)
if (flag == 3 && dash != NULL && hash == NULL)
return (1);
}
return (0);
@@ -67,14 +64,12 @@ void lm_clear_unv(t_holder *holder)
int lm_verify_links(t_holder *data, t_syntax *synt)
{
if (!synt->l_error || (synt->l_error && data->count > 0))
{
ft_printf("Bingo\n");
return (1);
}
return (0);
}
int lm_verify_cmd(t_syntax *synt, t_holder *holder, t_lmdata *data)
int lm_verify_cmd(t_syntax *synt, t_holder *holder
, t_lmdata *data)
{
if (synt->s_cmd && synt->e_cmd
&& !synt->e_error && !synt->s_error

4
srcs/lm_data_utils.c
View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/05 06:35:40 by mndhlovu #+# #+# */
/* Updated: 2019/04/23 11:01:37 by tmaze ### ########.fr */
/* Updated: 2019/04/29 12:06:18 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -27,7 +27,7 @@ void lm_append_line(t_rdata **line, char *raw)
{
if (*line)
{
if((*line)->next)
if ((*line)->next)
lm_append_line(&(*line)->next, raw);
else
(*line)->next = lm_new_raw_line(raw);

5
srcs/lm_graph_utils.c
View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/29 07:17:06 by mndhlovu #+# #+# */
/* Updated: 2019/04/26 12:15:47 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:05:52 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -15,6 +15,7 @@
static int is_link_in(t_lmdata *data, int src, int dest)
{
t_ind *it;
if (src < data->nb_nodes)
{
it = data->adj[src];
@@ -32,11 +33,9 @@ int lm_adj_parser(t_lmdata *lmdata, t_holder *holder)
{
t_temp *data;
ft_printf("=== lm_adj_parser ===\nholder: %p\n\n", holder);
if (holder != NULL)
{
data = holder->data;
ft_printf("data: %p\n\n", data);
if (data != NULL)
{
while (data)

31
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/04/22 12:44:00 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:08:36 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -18,3 +18,32 @@ void lm_initdata(t_lmdata *data)
data->nodes_data = NULL;
data->adj = NULL;
}
int lm_init_src_dest(int *src, int *dest, t_lmdata *data
, char *raw)
{
int s;
int d;
char **tab;
if (raw != NULL)
{
tab = ft_strsplit(raw, '-');
if (tab != NULL)
{
s = lm_find_index(data, tab[0]);
d = lm_find_index(data, tab[1]);
if (s == -1 || d == -1)
{
ft_del_words_tables(&tab);
return (0);
}
*src = s;
*dest = d;
ft_del_words_tables(&tab);
return (1);
}
}
ft_del_words_tables(&tab);
return (0);
}

16
srcs/lm_mem_utils.c
View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:37 by mndhlovu #+# #+# */
/* Updated: 2019/04/26 12:15:05 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:07:09 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -98,24 +98,15 @@ int lm_find_index(t_lmdata *data, char *str)
int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
{
char **tab;
t_temp *temp;
t_temp *new;
int src;
int dest;
t_temp *new;
if (!(new = (t_temp *)ft_memalloc(sizeof(t_temp))))
return (0);
tab = ft_strsplit(raw, '-');
if (tab != NULL)
if (lm_init_src_dest(&src, &dest, data, raw))
{
src = lm_find_index(data, tab[0]);
dest = lm_find_index(data, tab[1]);
if (src == -1 || dest == -1)
{
ft_del_words_tables(&tab);
return 0;
}
new->src_ind = src;
new->dest_ind = dest;
new->next = NULL;
@@ -129,7 +120,6 @@ int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
temp->next = new;
}
(holder->count)++;
ft_del_words_tables(&tab);
return (1);
}
return (0);

20
srcs/lm_parser.c
View File

@@ -6,13 +6,13 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/20 15:24:51 by mndhlovu #+# #+# */
/* Updated: 2019/04/26 13:05:45 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:45:25 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
void lm_locate_cd(int index, t_syntax *synt, char *line)
static void lm_locate_cd(int index, t_syntax *synt, char *line)
{
char *tmp;
@@ -40,7 +40,8 @@ void lm_locate_cd(int index, t_syntax *synt, char *line)
}
}
int lm_get_ant_(int counter, t_lmdata *ldata, t_syntax *synt, char *line)
static int lm_get_ant_(int counter, t_lmdata *ldata
, t_syntax *synt, char *line)
{
int value;
@@ -58,8 +59,8 @@ int lm_get_ant_(int counter, t_lmdata *ldata, t_syntax *synt, char *line)
return (0);
}
static int lm_get_vertices(int count, t_syntax *synt,
t_lmdata *data, t_holder *holder, char *line)
static int lm_get_vertices(int count, t_syntax *synt
, t_lmdata *data, t_holder *holder, char *line)
{
lm_get_cmd_vert(count, synt, data, line);
if (!synt->s_error && !synt->e_error)
@@ -71,8 +72,8 @@ static int lm_get_vertices(int count, t_syntax *synt,
return (0);
}
int lm_parser(t_syntax *synt, t_lmdata *ldata,
t_holder *holder)
int lm_parser(t_syntax *synt
, t_lmdata *ldata, t_holder *holder)
{
char *raw;
int index;
@@ -80,7 +81,8 @@ int lm_parser(t_syntax *synt, t_lmdata *ldata,
index = 0;
while (ft_getline(&raw) > 0 && raw[0] != '\0')
{
ft_printf("%s\n", raw);
if ((add_line_map(ldata, raw)))
return (0);
if (!(lm_get_ant_(index, ldata, synt, raw)) && index == 0)
{
//ft_strdel(&raw);
@@ -95,8 +97,6 @@ int lm_parser(t_syntax *synt, t_lmdata *ldata,
ft_strdel(&raw);
index++;
}
ft_printf("final raw: %s\n", raw);
ft_strdel(&raw);
ft_putchar('\n');
return (1);
}

31
srcs/lm_parser_error_check.c
View File

@@ -6,13 +6,13 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/08 06:42:37 by mndhlovu #+# #+# */
/* Updated: 2019/04/26 10:42:43 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:06:08 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
int lm_chk_format_nbr(char *raw)
static int lm_chk_format_nbr(char *raw)
{
while (*raw)
{
@@ -25,14 +25,14 @@ int lm_chk_format_nbr(char *raw)
return (0);
}
int lm_check_max(char *raw)
static int lm_check_max(char *raw)
{
if (ft_atoi(raw) < INT_MIN || ft_atoi(raw) > INT_MAX)
return (-1);
return (0);
}
int lm_validate_name(char *name)
static int lm_validate_name(char *name)
{
int index;
@@ -52,24 +52,25 @@ int lm_validate_rooms(char *name, char *x, char *y)
{
if (lm_validate_name(name) == -1)
return (0);
if (lm_chk_format_nbr(x) == -1 ||
lm_check_max(x) == -1 || (ft_atoi(x) > 0 &&
(ft_atoi(x) == 0)) ||
ft_strlen(x) > 19)
if (lm_chk_format_nbr(x) == -1
|| lm_check_max(x) == -1
|| (ft_atoi(x) > 0 && (ft_atoi(x) == 0))
|| ft_strlen(x) > 19)
return (0);
if (lm_chk_format_nbr(y) == -1 ||
lm_check_max(y) == -1 || (ft_atoi(y) > 0 &&
(ft_atoi(y) == 0)) ||
ft_strlen(y) > 19)
if (lm_chk_format_nbr(y) == -1
|| lm_check_max(y) == -1
|| (ft_atoi(y) > 0 && (ft_atoi(y) == 0))
|| ft_strlen(y) > 19)
return (0);
return (1);
}
int lm_error_nbr(char *raw)
{
if (lm_chk_format_nbr(raw) == -1 || lm_check_max(raw) == -1 ||
(ft_atoi(raw) > 0 && (ft_atoi(raw) == 0)) ||
ft_strlen(raw) > 19)
if (lm_chk_format_nbr(raw) == -1
|| lm_check_max(raw) == -1
|| (ft_atoi(raw) > 0 && (ft_atoi(raw) == 0))
|| ft_strlen(raw) > 19)
return (-1);
return (0);
}

54
srcs/lm_utils_algo.c Normal file
View File

@@ -0,0 +1,54 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* lm_utils_algo.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/29 11:50:04 by mndhlovu #+# #+# */
/* Updated: 2019/04/29 12:10:09 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
t_node *get_node_role(t_lmdata *data, char role)
{
t_node *it;
it = data->nodes_data;
while (it)
{
if (it->role == role)
return (it);
it = it->next;
}
return (NULL);
}
int get_nb_paths(t_ind **ret)
{
int index;
index = 0;
while (ret[index])
index++;
return (index);
}
void get_nb_paths_max(t_lmdata *data, int start, int end)
{
int i;
int j;
t_ind *it;
i = 0;
j = 0;
it = data->adj[start];
while (it && ++i)
it = it->next;
it = data->adj[end];
while (it && ++j)
it = it->next;
data->nb_paths_max = (i > j) ? j : i;
}

15
srcs/lm_utils_parser.c
View File

@@ -6,13 +6,13 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/04 09:24:45 by mndhlovu #+# #+# */
/* Updated: 2019/04/26 13:35:09 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:05:40 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
int lm_check_ant_no(char *line)
static int lm_check_ant_no(char *line)
{
int len;
@@ -46,7 +46,7 @@ void lm_get_cmd_vert(int count, t_syntax *synt
{
synt->s_vert = count;
if (!(lm_add_vertex(ldata, line, 's', synt)))
synt->e_error = 1;
synt->s_error = 1;
}
}
if (synt->e_pos == count - 1)
@@ -56,16 +56,17 @@ void lm_get_cmd_vert(int count, t_syntax *synt
{
synt->e_vert = count;
if (!(lm_add_vertex(ldata, line, 'e', synt)))
synt->s_error = 1;
synt->e_error = 1;
}
}
}
void lm_get_vert_link(int count, t_syntax *synt, t_lmdata *ldata
, t_holder *holder, char *line)
void lm_get_vert_link(int count, t_syntax *synt
, t_lmdata *ldata, t_holder *holder, char *line)
{
if (count > 0 && (count != synt->s_vert && count != synt->e_vert)
&& (count != synt->s_pos && count != synt->e_pos && line != NULL))
&& (count != synt->s_pos
&& count != synt->e_pos && line != NULL))
{
if (lm_check_forbiden_chars(line, 0))
{

2
srcs/print_map.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/24 17:35:29 by tmaze #+# #+# */
/* Updated: 2019/04/26 11:53:36 by mndhlovu ### ########.fr */
/* Updated: 2019/04/29 12:40:25 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */