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

Compare commits

base: tvdu29:94145d3d17f452c9d28d939520eaf578076747c5
Branches Tags
tvdu29:master tvdu29:tmaze tvdu29:Mthandazo42
..
compare: tvdu29:master
Branches Tags
tvdu29:master tvdu29:tmaze tvdu29:Mthandazo42

4 Commits
94145d3d17 ... 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
41 changed files with 47 additions and 8566 deletions
Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

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

BIN
generator
View File

Binary file not shown.

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/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 error;
int s_error;
int state;
int e_error;
int v_error;
int l_error;
@@ -94,12 +95,14 @@ typedef struct s_lmdata
int lm_parser(t_lmdata *ldata
, t_holder *holder);
int lm_check_room_before(char **tab, t_holder *holder);
void lm_clear_unv(t_holder *holder, t_lmdata *ldata);
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_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);

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

5222
map3
View File

File diff suppressed because it is too large Load Diff

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 @@
23
##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

63
maps/subject22.map
View File

@@ -1,63 +0,0 @@
3
1 0 2
##start
#dd
#ddddd
##sjdjdjssjds
##djsjddjs
#sddsds
##start
#dsdsdsdsd
0 2 0
##end
##sjsjsjjds
#sjdsjdsjs
#sjsjdsjsaj
#sjsjss
##start
##end
#sjsjdsjsdh
#sksksdksdsk
#skdkskdsjds
4 2 6
2 4 2
#comment
#comment
#comment
#comment
#comment
3 4 4
#comment
#comment
##nothing
#comming
#asazii
0-1
#hellow
##42 ecole
##good
0-2
#comment
#comment
#comment
#comment
#comment
#comment
#comment
#comment
2-3
##kkkk
#kkklkk
#sdedfdds
#cdkskvkfdkndfvnds
#cbdjvbdj
#wofokdkfsdsd
3-4
#cooment
#comment
#comment
##starrtt
4-1
1-2
0-2

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

5
srcs/lem_in.c
View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
if ((lm_adj_parser(lmdata, holder) == 0))
return (0);
lm_clear_unv(holder, lmdata);
lm_clear_unv(holder);
if (start_end_link(lmdata, get_node_role(lmdata, 's')->ind
, get_node_role(lmdata, 'e')->ind))
{
@@ -59,6 +59,7 @@ static int lem_in(t_holder *holder,
}
else if (!do_algorithm(lmdata, ret))
return (0);
del_map(lmdata);
return (1);
}

16
srcs/lm_check_errors.c
View File

@@ -6,18 +6,23 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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"
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 (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);
}
}
holder->v_error = 1;
return (0);
@@ -45,7 +50,7 @@ int lm_check_forbiden_chars(char *line, int flag)
return (0);
}
void lm_clear_unv(t_holder *holder, t_lmdata *ldata)
void lm_clear_unv(t_holder *holder)
{
t_temp *data;
t_temp *flush;
@@ -59,7 +64,6 @@ void lm_clear_unv(t_holder *holder, t_lmdata *ldata)
flush = NULL;
}
holder->data = NULL;
del_map(ldata);
}
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)
&& (data->nb_nodes > 0))
return (1);
lm_clear_unv(holder, data);
lm_clear_unv(holder);
return (0);
}

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/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> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
}
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;

2
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/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> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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->s_vert = 0;
holder->e_vert = 0;
holder->gr_status = 0;
holder->state = 0;
holder->s_pos = 0;
holder->e_pos = 0;
holder->v_flag = 0;
@@ -57,18 +57,15 @@ int lm_add_vertex(t_lmdata *ldata, char *raw, char flag,
{
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, holder))
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;
@@ -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)
{
t_temp *temp;
t_temp *new;
int src;
int dest;
@@ -115,13 +111,9 @@ 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);

2
srcs/lm_parser.c
View File

@@ -6,7 +6,7 @@
/* By: mndhlovu <mndhlovu@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 */
/* */
/* ************************************************************************** */

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/05/06 07:38:36 by mndhlovu ### ########.fr */
/* Updated: 2019/05/09 16:35:02 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */