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

Compare commits

base: tvdu29:b22a1a5af7b9598450e3a9706abda59dac81eb35
Branches Tags
tvdu29:master tvdu29:tmaze tvdu29:Mthandazo42
...
compare: tvdu29:master
Branches Tags
tvdu29:master tvdu29:tmaze tvdu29:Mthandazo42

13 Commits
b22a1a5af7 ... master

Author SHA1 Message Date
Tanguy MAZE
94a1cdaffc more cleanup 2019-05-10 13:19:24 +02:00
Tanguy MAZE
c672ca1205 Merge branch 'master' of https://github.com/tvdu29/lem_in 2019-05-09 18:46:01 +02:00
Tanguy MAZE
ca1abc4990 repo cleanup 
removing test maps & test files
 2019-05-09 18:40:19 +02:00
Mthandazo Ndhlovu
ea99e7b1fc norm errors eliminated and parser modified 2019-05-09 17:41:07 +02:00
Tanguy MAZE
94145d3d17 minor modifications to map printing and ant paths 
print map if look ok and has path
if start & end linked, only 1 operation
 2019-05-09 16:26:35 +02:00
Mthandazo Ndhlovu
f44cda2833 another commit 2019-05-09 13:09:22 +02:00
Mthandazo Ndhlovu
a21860983e Cleaned the seg faults and normed the code, only 
lm_mem_utils has a norm error.
 2019-05-06 08:05:37 +02:00
Tanguy MAZE
5894c0cdd0 correted invalid free 
invalid free occuring with invalid chars in ant number
 2019-05-02 14:55:46 +02:00
Tanguy MAZE
3156bddf27 added start-end check 
if start and end are linked, push all the ants through
 2019-05-02 14:35:37 +02:00
Mthandazo Ndhlovu
a40b6b00e7 no more leaks on all maps 2019-05-02 13:25:41 +02:00
Mthandazo Ndhlovu
8552cf8a32 semi-final parser 2019-05-02 12:58:28 +02:00
Mthandazo Ndhlovu
4bb3b45781 a bit of code cleaning on the parser 2019-04-30 12:07:28 +02:00
Mthandazo Ndhlovu
ee59b79e75 a bit of code cleaning on the parser 2019-04-30 12:06:58 +02:00
48 changed files with 269 additions and 3473 deletions
Expand all files Collapse all files

4
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/29 12:01:17 by mndhlovu ### ########.fr #
# Updated: 2019/05/09 18:39:33 by tmaze ### ########.fr #
# #
#******************************************************************************#
@@ -27,7 +27,7 @@ endif
# Compilator
CC = gcc
FLAGS = -Wall -Wextra -Werror -g
FLAGS = -Wall -Wextra -Werror
# Folders
LIBDIR = libft

66
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/29 12:14:34 by mndhlovu ### ########.fr */
/* Updated: 2019/05/09 17:39:33 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -49,24 +49,6 @@ typedef struct s_ants
struct s_ants *next;
} t_ants;
typedef struct s_syntax
{
int nb_state;
int s_cmd;
int s_pos;
int error;
int s_error;
int e_error;
int v_error;
int l_error;
int gr_status;
int s_vert;
int e_vert;
int e_cmd;
int e_pos;
int v_flag;
} t_syntax;
typedef struct s_temp
{
int src_ind;
@@ -77,6 +59,21 @@ typedef struct s_temp
typedef struct s_holder
{
int count;
int nb_state;
int s_cmd;
int s_pos;
int error;
int s_error;
int state;
int e_error;
int v_error;
int l_error;
int gr_status;
int s_vert;
int e_vert;
int e_cmd;
int e_pos;
int v_flag;
t_temp *data;
} t_holder;
@@ -96,32 +93,34 @@ 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
, char **name);
void lm_clear_unv(t_holder *holder);
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);
void lm_ext_conn_sub(t_holder *holder, t_temp *new_data);
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);
void lm_get_cmd_vert(int count, t_syntax *synt
void lm_get_cmd_vertices(int count, t_holder *holder
, t_lmdata *ldata, char *line);
void lm_get_vert_link(int count, t_syntax *synt
, t_lmdata *ldata, t_holder *holder
, char *line);
int lm_get_value(char *line);
void lm_check_start_vert(int count, t_holder *hol
, t_lmdata *ldata, char *line);
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_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);
@@ -144,6 +143,7 @@ int get_score(t_lmdata *data, t_ind **ret, int nb_paths);
void print_paths(t_lmdata *data, t_ind **ret);
int push_ants(t_lmdata *data, t_ind **paths
, int nb_paths);
void push_ants_end(t_lmdata *data, char *e_name);
void del_map(t_lmdata *data);
int add_line_map(t_lmdata *data, char *line);

4
libft/Makefile
View File

@@ -6,12 +6,12 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2018/04/07 12:47:06 by tmaze #+# #+# #
# Updated: 2019/04/26 11:54:46 by mndhlovu ### ########.fr #
# Updated: 2019/05/09 18:39:42 by tmaze ### ########.fr #
# #
#******************************************************************************#
CC = gcc
CCFLAGS = -Wall -Werror -Wextra -g
CCFLAGS = -Wall -Werror -Wextra
CCSTD =
NAME = libft.a

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);
}

14
map3
View File

@@ -1,14 +0,0 @@
21
##start
start 0 0
##end
end 1 1
plop 2 2
lol 4 4
xd 3 3
start-plop
end-plop
start-lol
xd-lol
end-xd

BIN
maps/.DS_Store vendored
View File

Binary file not shown.

3050
maps/big
View File

File diff suppressed because it is too large Load Diff

11
maps/comments
View File

@@ -1,11 +0,0 @@
3
#you
##start
start 0 0
#lost
##end
end 1 1
#the
#game
start-end
#!!

7
maps/duplicatepipe
View File

@@ -1,7 +0,0 @@
3
##start
start 0 0
##end
end 0 0
start-end
end-start

7
maps/duplicatepipe1
View File

@@ -1,7 +0,0 @@
3
##start
start 0 0
##end
end 0 0
start-end
start-end

0
maps/empty
View File

7
maps/illegalname
View File

@@ -1,7 +0,0 @@
3
Lillegalname 2 2
##start
start 0 0
##end
end 1 1
start-end

7
maps/illegalname1
View File

@@ -1,7 +0,0 @@
3
ill-egalname 2 2
##start
start 0 0
##end
end 1 1
start-end

25
maps/in0
View File

@@ -1,25 +0,0 @@
3
##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
0-6
1-3
4-3
5-2
3-5
#autre commentaire
4-2
2-1
7-6
7-2
7-4
6-5

8
maps/invalidcommand
View File

@@ -1,8 +0,0 @@
3
##start
start 0 0
##end
end 1 1
##invalidcommand
room 2 2
start-end

6
maps/invalidcommand1
View File

@@ -1,6 +0,0 @@
3
start 0 0
##end
end 1 1
##start
start-end

11
maps/loop
View File

@@ -1,11 +0,0 @@
3
##start
start 0 0
##end
end 1 1
mid0 2 2
mid1 3 3
start-mid0
mid0-mid1
mid1-start
start-end

10
maps/loop1
View File

@@ -1,10 +0,0 @@
3
##start
start 0 0
##end
end 1 1
mid0 2 2
mid1 3 3
start-mid0
mid0-mid1
mid1-start

5
maps/noants
View File

@@ -1,5 +0,0 @@
##start
start 0 0
##end
end 1 1
start-end

5
maps/noend
View File

@@ -1,5 +0,0 @@
3
##start
start 0 0
end 1 1
start-end

5
maps/nopath
View File

@@ -1,5 +0,0 @@
3
##start
start 0 0
##end
end 1 1

5
maps/nostart
View File

@@ -1,5 +0,0 @@
3
start 0 0
##end
end 1 1
start-end

6
maps/overflow
View File

@@ -1,6 +0,0 @@
3
##start
start 0 0
##end
end 999999999999999999999 9999999999999999999999999999
start-end

20
maps/shortest
View File

@@ -1,20 +0,0 @@
3
##start
start 0 0
##end
end 1 1
long0 2 2
long1 3 3
short 4 4
longer0 5 5
longer1 6 6
longer2 7 7
start-long0
long0-long1
long1-end
start-short
short-end
start-longer0
longer0-longer1
longer1-longer2
longer2-end

6
maps/simple
View File

@@ -1,6 +0,0 @@
3
##start
start 0 0
##end
end 1 1
start-end

10
maps/simple1
View File

@@ -1,10 +0,0 @@
4
##start
start 0 0
##end
end 1 1
dead0 2 2
dead1 3 3
start-dead0
start-dead1
start-end

16
maps/simple2
View File

@@ -1,16 +0,0 @@
4
##start
start 0 0
##end
end 1 1
dead0 2 2
dead1 3 3
mid0 4 4
mid1 5 5
mid2 6 6
start-dead0
start-mid0
mid0-dead0
start-mid1
mid1-mid2
mid2-end

4
maps/startisend
View File

@@ -1,4 +0,0 @@
3
##start
##end
startend 0 0

13
maps/subject22.map
View File

@@ -1,13 +0,0 @@
3
1 0 2
##start
0 2 0
##end
4 2 6
2 4 2
3 4 4
0-1
0-2
2-3
3-4
4-1

6
maps/underflow
View File

@@ -1,6 +0,0 @@
3
##start
start 0 0
##end
end 1 -9999999999999999999999999
start-end

7
maps/whitespaces
View File

@@ -1,7 +0,0 @@
3
# #end
##start
start 0 0
##end
end 1 1
start-end

2
srcs/bfs.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/18 09:25:05 by tmaze #+# #+# */
/* Updated: 2019/04/21 14:42:08 by tmaze ### ########.fr */
/* Updated: 2019/04/30 07:08:31 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */

5
srcs/edmonds_karp.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/18 09:59:11 by tmaze #+# #+# */
/* Updated: 2019/04/26 12:49:36 by mndhlovu ### ########.fr */
/* Updated: 2019/04/30 07:14:04 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -109,14 +109,11 @@ t_ind **edmonds_karp(t_lmdata *data, int s_ind, int e_ind)
scores[0] = 0;
nb_paths = 0;
i = 0;
ft_printf("data: %p\ndata->nb_nodes: %d\ndata->adj: %p\n\n", data, data->nb_nodes, data->adj);
while (i < data->nb_nodes)
tab[i++].old_visited = 0;
bfs(data, tab, s_ind, e_ind);
ft_printf("tab[e_ind].parent: %d\n", tab[e_ind].parent);
while (tab[e_ind].parent != -1)
{
ft_printf("new path\n");
nb_paths++;
update_weights(data, tab, s_ind, e_ind);
ret[1] = resolve_paths(data, nb_paths, s_ind, e_ind);

61
srcs/lem_in.c
View File

@@ -6,32 +6,60 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/04/29 12:54:07 by tmaze ### ########.fr */
/* Updated: 2019/05/09 17:38:50 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
static int lem_in(t_syntax *synt, t_holder *holder,
t_lmdata *lmdata, t_ind ***ret)
static int start_end_link(t_lmdata *data, int s_ind, int e_ind)
{
lm_parser(synt, lmdata, holder);
if (!lm_verify_cmd(synt, holder, lmdata))
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)
{
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_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)
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);
del_map(lmdata);
return (1);
}
@@ -43,7 +71,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;
@@ -51,12 +78,14 @@ 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);
return (lm_error_exit());
}
del_map(&ldata);
lm_clean_data(&ldata);
return (0);
}

35
srcs/lm_check_errors.c
View File

@@ -6,20 +6,25 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/22 08:55:30 by mndhlovu #+# #+# */
/* Updated: 2019/04/29 12:06:41 by mndhlovu ### ########.fr */
/* Updated: 2019/05/09 17:37:23 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
, char **name)
{
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);
}
}
synt->v_error = 1;
holder->v_error = 1;
return (0);
}
@@ -39,7 +44,7 @@ int lm_check_forbiden_chars(char *line, int flag)
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);
@@ -61,21 +66,25 @@ void lm_clear_unv(t_holder *holder)
holder->data = NULL;
}
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->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);

2
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/29 12:06:18 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> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/29 07:17:06 by mndhlovu #+# #+# */
/* Updated: 2019/04/29 12:05:52 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);
}
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)
{
t_temp *data;

58
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/29 12:08:36 by mndhlovu ### ########.fr */
/* Updated: 2019/05/09 17:35:50 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */
@@ -19,6 +19,62 @@ void lm_initdata(t_lmdata *data)
data->adj = NULL;
}
void lm_check_start_vert(int count, t_holder *hol
, t_lmdata *ldata, char *line)
{
if ((hol->s_pos < hol->e_pos)
&& lm_check_forbiden_chars(line, 0))
{
if ((count > hol->s_pos && count < hol->e_pos)
&& (!hol->s_vert))
{
if ((lm_add_vertex(ldata, line, 's', hol)))
hol->s_vert = count;
else
hol->s_error = 1;
}
}
if ((hol->s_pos > hol->e_pos)
&& lm_check_forbiden_chars(line, 0))
{
if (!hol->s_vert)
{
if ((lm_add_vertex(ldata, line, 's', hol)))
hol->s_vert = count;
else
hol->s_error = 1;
}
}
}
void lm_check_end_vert(int count, t_holder *hol
, t_lmdata *ldata, char *line)
{
if ((hol->e_pos < hol->s_pos)
&& lm_check_forbiden_chars(line, 0))
{
if ((count > hol->e_pos && count < hol->s_pos)
&& (!hol->e_vert))
{
if ((lm_add_vertex(ldata, line, 'e', hol)))
hol->e_vert = count;
else
hol->e_error = 1;
}
}
if ((hol->e_pos > hol->s_pos)
&& lm_check_forbiden_chars(line, 0))
{
if (!hol->e_vert)
{
if ((lm_add_vertex(ldata, line, 'e', hol)))
hol->e_vert = count;
else
hol->e_error = 1;
}
}
}
int lm_init_src_dest(int *src, int *dest, t_lmdata *data
, char *raw)
{

55
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/04/29 12:07:09 by mndhlovu ### ########.fr */
/* Updated: 2019/05/09 17:33:39 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->state = 0;
holder->s_pos = 0;
holder->e_pos = 0;
holder->v_flag = 0;
holder->count = 0;
holder->data = NULL;
ldata->nbants = 0;
@@ -53,22 +53,19 @@ 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;
char *str;
if (!(new = (t_node *)ft_memalloc(sizeof(t_node))))
return (0);
tab = ft_strsplit(raw, ' ');
if (tab != NULL)
if ((tab = ft_strsplit(raw, ' ')) != NULL)
{
if (lm_check_room_before(tab, synt))
if (lm_check_room_before(tab, holder, &str))
{
if ((new->name = ft_strdup(tab[0])) == NULL)
ft_del_words_tables(&tab);
if (new->name == NULL)
return (0);
new->name = str;
new->x = ft_atoi(tab[1]);
new->y = ft_atoi(tab[2]);
new->role = flag;
@@ -78,6 +75,8 @@ int lm_add_vertex(t_lmdata *ldata, char *raw, char flag,
ft_del_words_tables(&tab);
return (1);
}
ft_del_words_tables(&tab);
free(new);
}
return (0);
}
@@ -98,7 +97,6 @@ int lm_find_index(t_lmdata *data, char *str)
int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
{
t_temp *temp;
t_temp *new;
int src;
int dest;
@@ -113,14 +111,11 @@ int lm_ext_conn(t_holder *holder, t_lmdata *data, char *raw)
if (holder->data == NULL)
holder->data = new;
else
{
temp = holder->data;
while (temp->next)
temp = temp->next;
temp->next = new;
}
lm_ext_conn_sub(holder, new);
(holder->count)++;
holder->state = 1;
return (1);
}
free(new);
return (0);
}

44
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/04/29 13:07:10 by tmaze ### ########.fr */
/* Updated: 2019/05/09 16:55:53 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,29 +51,27 @@ 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);
}
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_lmdata *data
, t_holder *holder, char *line)
{
lm_get_cmd_vert(count, synt, data, line);
if (!synt->s_error && !synt->e_error)
lm_get_cmd_vertices(count, holder, data, line);
if (!holder->s_error && !holder->e_error)
{
lm_get_vert_link(count, synt, data, holder, line);
if (!synt->v_error && !synt->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 +81,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, synt, ldata, holder, raw)))
lm_locate_cd(index, holder, raw);
if (!(lm_get_vertices(index, ldata, holder, raw)))
return (0);
index++;
}

6
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 (0);
return (1);
}

2
srcs/lm_utils_algo.c
View File

@@ -6,7 +6,7 @@
/* 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 */
/* Updated: 2019/04/30 07:19:29 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */

46
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/04/29 12:05:40 by mndhlovu ### ########.fr */
/* Updated: 2019/05/09 17:40:24 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,49 +34,33 @@ int lm_get_value(char *line)
return (0);
}
void lm_get_cmd_vert(int count, t_syntax *synt
void lm_get_cmd_vertices(int count, t_holder *holder
, t_lmdata *ldata, char *line)
{
char *tmp;
if (synt->s_pos == count - 1)
if (count > 0 && line != NULL)
{
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)
{
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;
}
lm_check_start_vert(count, holder, ldata, line);
lm_check_end_vert(count, holder, ldata, line);
}
}
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_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))
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', synt)))
synt->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)))
synt->l_error = 1;
holder->l_error = 1;
}
}
}

2
srcs/lst_ind.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/27 14:56:55 by tmaze #+# #+# */
/* Updated: 2019/04/24 09:51:38 by tmaze ### ########.fr */
/* Updated: 2019/04/30 07:19:43 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */

18
srcs/print_map.c
View File

@@ -6,23 +6,25 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/24 17:35:29 by tmaze #+# #+# */
/* Updated: 2019/04/29 13:05:56 by tmaze ### ########.fr */
/* Updated: 2019/05/09 16:35:02 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
#include <stdio.h>
void del_map(t_lmdata *data)
{
t_rdata *tmp;
while (data->map)
if (data != NULL)
{
tmp = data->map;
data->map = data->map->next;
ft_strdel(&(tmp->line));
ft_memdel((void**)&tmp);
while (data->map)
{
tmp = data->map;
data->map = data->map->next;
ft_strdel(&(tmp->line));
ft_memdel((void**)&tmp);
}
}
}
@@ -37,6 +39,7 @@ void print_map(t_lmdata *data)
it = it->next;
}
del_map(data);
ft_printf("\n");
}
int add_line_map(t_lmdata *data, char *line)
@@ -59,4 +62,3 @@ int add_line_map(t_lmdata *data, char *line)
}
return (0);
}

2
srcs/push_ants.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/06 11:37:56 by tmaze #+# #+# */
/* Updated: 2019/04/21 16:14:45 by tmaze ### ########.fr */
/* Updated: 2019/04/30 07:05:43 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */

17
srcs/push_ants_utils.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/10 11:23:36 by tmaze #+# #+# */
/* Updated: 2019/04/18 19:04:49 by tmaze ### ########.fr */
/* Updated: 2019/05/02 14:33:30 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -69,3 +69,18 @@ t_ind *get_node_path(t_ind *lst, int index)
it = it->next;
return (it);
}
void push_ants_end(t_lmdata *data, char *e_name)
{
int i;
i = 1;
while (i <= data->nbants)
{
ft_printf("L%d-%s", i, e_name);
if (i != data->nbants)
ft_putchar(' ');
i++;
}
ft_printf("\n");
}

2
srcs/score_utils.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/18 18:05:06 by tmaze #+# #+# */
/* Updated: 2019/04/21 16:53:11 by tmaze ### ########.fr */
/* Updated: 2019/04/30 07:05:10 by mndhlovu ### ########.fr */
/* */
/* ************************************************************************** */