61 Commits

Author SHA1 Message Date
Hugo LAMY
a602b3a78c a la norme et avec le dossier fillit de robin 2019-06-04 10:09:02 +02:00
Hugo LAMY
1aa695c85a mise a la racine des sous dossiers de libt 2019-06-03 22:01:27 +02:00
Hugo LAMY
700fb91632 a la norme et sans erreur 2019-06-03 13:00:46 +02:00
Hugo LAMY
d86dc433dc jsais pas ce qui a change 2019-06-03 09:54:19 +02:00
Hugo LAMY
9aa1acafe4 synchro maison ecole 2019-06-03 09:22:29 +02:00
pia Lepetit
602ebf070d ajout de l'effacement selectif lors de l'opti, pas ouf ouf 2019-06-03 08:16:18 +02:00
Hugo LAMY
f1471562f3 makefile lance la libft aussi 2019-06-01 17:00:52 +02:00
Hugo LAMY
58490cfb56 pret a rendre 2019-06-01 16:27:26 +02:00
Hugo LAMY
214dc0dc5c tout foncioooooone 2019-06-01 16:25:29 +02:00
Manzovince
47fcd0ec91 free bonus print 2019-06-01 16:25:28 +02:00
Hugo LAMY
ee2620e540 tout foncioooooone 2019-06-01 16:23:27 +02:00
Hugo LAMY
26a9c9cbac merge a la main c pas bien 2019-06-01 16:05:47 +02:00
Hugo LAMY
d7dc746779 catastrophe merge 2019-06-01 16:00:49 +02:00
Hugo LAMY
c81b7515be clean pour merge 2019-06-01 15:58:31 +02:00
Manzovince
c007a8299a handle error correct 2019-06-01 15:53:43 +02:00
Manzovince
fd696fc499 oubli dans le main.c 2019-06-01 15:27:46 +02:00
Manzovince
bfe7658388 Merge remote-tracking branch 'origin/ralentit' 2019-06-01 15:17:58 +02:00
Hugo LAMY
5bdc944da9 dernier leaks disparu avec nouvelle fonction dans read_file 2019-06-01 15:13:08 +02:00
Manzovince
482861a3c9 Auto stash before merge of "master" and "origin/ralentit" 2019-06-01 14:54:12 +02:00
Manzovince
5d4de7718e Merge remote-tracking branch 'origin/ralentit' 2019-06-01 14:52:37 +02:00
Hugo LAMY
f29d9d8e60 a la norme et flag e enleve la limite de 26 tetri 2019-06-01 14:49:30 +02:00
Hugo LAMY
2d06dcf837 merging ralentit branch 2019-06-01 14:08:35 +02:00
Manzovince
0c48e90449 Merge branch 'ralentit' 2019-06-01 14:04:23 +02:00
Manzovince
68bac851e2 free(map) in print_binary_map - Auto stash before rebase of "origin/master" 2019-06-01 14:03:37 +02:00
Hugo LAMY
f79d3812d0 il ne reste qu'un seul leaks 2019-06-01 13:57:39 +02:00
Hugo LAMY
56ca478503 version sans erreurs de valgrind autre que trois leaks 2019-06-01 13:47:21 +02:00
Hugo LAMY
27afcbe7e9 tentative d'enlever les leaks en cours 2019-06-01 12:36:34 +02:00
Hugo LAMY
04a4fef38b les sames ne s'impriment pas avec juste le flag p mais seulement le o en plus 2019-05-29 16:36:04 +02:00
Hugo LAMY
e7e944f1ac derniere erreur de valgrind resolu mais a tester sur les mauvais tetri 2019-05-29 15:53:08 +02:00
Hugo LAMY
819a14407d derniere erreur de valgrind resolu mais a tester sur les mauvais tetri 2019-05-29 15:51:41 +02:00
Manzovince
2bc1f50b46 README edit 2019-05-29 15:44:36 +02:00
Manzovince
7a07d84d6c README and few little corrections on code readability 2019-05-29 15:42:31 +02:00
Manzovince
0236573b6d all debug comments deleted for norm 2019-05-29 13:57:37 +02:00
Manzovince
fb1a41e94f correction of handle_errors.c (1 error still not solved)
Quand on a une nl après le dernier tetrimino du fichier input, on devrait sortir une erreur au lieu de résoudre le fillit
2019-05-29 13:52:41 +02:00
Manzovince
6ca294272f .dSYM deleted 2019-05-29 13:37:34 +02:00
Manzovince
bfd23d6211 gitignore edit for libft symlink 2019-05-29 13:37:13 +02:00
Manzovince
fa5f2e7f00 new version of fillit.h with details 2019-05-29 13:36:40 +02:00
Manzovince
246906a490 all test files grouped in folder 2019-05-29 13:15:53 +02:00
Manzovince
eea8110abd correction on main.c (working for me now) 2019-05-29 13:12:31 +02:00
Manzovince
79a5fb188c correction on fillit.h 2019-05-29 13:10:21 +02:00
Manzovince
59d2be2756 Merge remote-tracking branch 'origin/master' 2019-05-29 11:35:00 +02:00
Hugo LAMY
c82ba9bccb presque toutes les erreures de vlgrind resolues, sauf une derniere dans error_proxy 2019-05-28 19:36:21 +02:00
Hugo LAMY
ed06e3eb8e corrige deux bad read or write due au depassement de la taille de map, en ajoutant total_num dans la struct 2019-05-28 17:35:34 +02:00
Manzovince
2dfe395a9b Merge remote-tracking branch 'origin/master' 2019-05-28 13:23:15 +02:00
Hugo LAMY
77656ba113 sans l'opion o opti les sames ne s'affichent pas 2019-05-28 13:05:14 +02:00
Hugo LAMY
a9e62833bb flags organises 2019-05-27 19:53:27 +02:00
Hugo LAMY
6b9936b0cd en cours de reorganisation des fichiers pour gerer les flags 2019-05-24 18:05:18 +02:00
Hugo LAMY
1a16e305d3 a une ligne pret le programme fonctionne tout le temps aaaarg 2019-05-21 15:31:04 +02:00
Hugo LAMY
1811268725 fillit ultrrrrrrra rapide ! pas encore a la norme 2019-05-20 15:58:45 +02:00
Manzovince
184981a28d Merge remote-tracking branch 'origin/master' 2019-05-20 15:52:43 +02:00
Hugo LAMY
c2e87b7303 opti fonctionne super bien et super mal 2019-05-20 15:42:30 +02:00
Manzovince
2dbd5b7320 Auto stash before merge of "master" and "origin/master" + CLEANING 2019-05-20 13:53:01 +02:00
Hugo LAMY
0912e52a7a clean les comments 2019-05-18 15:34:47 +02:00
Hugo LAMY
f4b1da414c list s'imprime dans main 2019-05-17 18:43:33 +02:00
Manzovince
a639da4ac5 New test opti, strange behavior 2019-05-13 21:48:00 +02:00
Manzovince
b9bdc14db7 New samples added + First Try Optimisation 2019-05-13 18:26:39 +02:00
Manzovince
8a62783a6b WORKING VERSION FOR 42FileChecker test. All test passed ! 2019-05-09 12:46:59 +02:00
Manzovince
1c6e41e8bf 4 new samples for testing 2019-05-09 12:45:57 +02:00
Hugo LAMY
3977a73682 resolu les deux problemes de add_remove et find_place mais bcp bcp plus lent 2019-05-08 18:45:21 +02:00
Manzovince
4a7ad39626 new samples + map_color modified 2019-05-08 15:42:49 +02:00
Manzovince
fe191054c9 New handle_errors and cleaner print_map_with_colors 2019-05-08 08:10:09 +02:00
204 changed files with 10858 additions and 1118 deletions

BIN
.DS_Store vendored

Binary file not shown.

2
.gitignore vendored
View File

@@ -12,4 +12,4 @@ a\.out
fillit fillit
test_fillit\.c \.DS_Store

View File

@@ -6,14 +6,10 @@
# By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ # # By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2019/03/01 13:24:35 by vmanzoni #+# #+# # # Created: 2019/03/01 13:24:35 by vmanzoni #+# #+# #
# Updated: 2019/05/17 17:11:53 by hulamy ### ########.fr # # Updated: 2019/06/03 21:55:31 by hulamy ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
# - - - - - - - - - - - - - - - #
# VARIABLES #
# - - - - - - - - - - - - - - - #
NAME = fillit NAME = fillit
CC = gcc CC = gcc
@@ -23,13 +19,17 @@ CFLAGS += -Wall -Wextra -Werror
LDFLAGS = -L./libft/ LDFLAGS = -L./libft/
LDLIBS = -lft LDLIBS = -lft
SRCS = $(shell find . -depth 1 -type f -not -name '.*' -not -name 'test*' -name '*.c') SRCS = main.c \
f_bonus_opti.c \
f_bonus_print.c \
f_handle_errors.c \
f_parse_input.c \
f_print.c \
f_print_map_with_colors.c \
f_read_file.c \
f_search_map.c
TRASH = $(shell find . -depth 1 -name '*.dSYM') OBJS = $(SRCS:.c=.o)
TRASH += $(shell find . -depth 1 -type f -name '*.o')
TRASH += $(shell find . -depth 1 -type f -name '*.swp')
TRASH += $(shell find . -depth 1 -type f -name '*.swo')
TRASH += $(shell find . -depth 1 -type f -name '*.swn')
# - - - - - - - - - - - - - - - # # - - - - - - - - - - - - - - - #
# RULES # # RULES #
@@ -37,19 +37,16 @@ TRASH += $(shell find . -depth 1 -type f -name '*.swn')
all: $(NAME) all: $(NAME)
$(NAME): $(SRCS) $(NAME): $(OBJS)
make -C ./libft/
$(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(SRCS) -o $(NAME) $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(SRCS) -o $(NAME)
debug: $(SRCS)
$(CC) -g $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(SRCS) -o $(NAME)
lib:
make -C ./libft/
clean: clean:
/bin/rm -rf $(TRASH) make clean -C libft/
/bin/rm -rf $(OBJS)
fclean: clean fclean: clean
make fclean -C libft/
/bin/rm -rf $(NAME) /bin/rm -rf $(NAME)
re: fclean all re: fclean all

View File

@@ -18,5 +18,7 @@ Le but de ce projet est dagencer les Tetriminos entre eux pour former le plus
## BONUS ## BONUS
- [x] Best error handler (more details on why there is an error.) - [x] Best error handler (more details on why there is an error.)
- [ ] Optimisation - [x] Optimisation (skip when tetri with same shape was already tested on map)
- [ ] Add colors to tetri when printing result map - [x] Add colors to tetri when printing result map
- [x] Flag for debbuging (print every step in backtracking)
- [x] Adding flags (and password for blocking more args on moulinette)

100
f_bonus_opti.c Normal file
View File

@@ -0,0 +1,100 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* bonus.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/05/24 14:42:46 by hulamy #+# #+# */
/* Updated: 2019/06/03 12:51:22 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
/*
** Test optimisation for not testing wrong maps when tetri are identical
*/
int check_tetri_memory(t_fillist *list, int pos)
{
t_fillist *tetri;
unsigned int mask;
tetri = list;
mask = 1 << ((pos % 32) - 1);
if (tetri->same)
{
if (!(tetri->same->memory[pos / 32] & mask))
return (tetri->same->memory[pos / 32] |= mask);
}
else
{
if (!(tetri->memory[pos / 32] & mask))
return (tetri->memory[pos / 32] |= mask);
}
return (0);
}
/*
** Test optimisation for not testing wrong maps when tetri are identical
*/
int compare_tetri(t_fillist *tetri_a, t_fillist *tetri_b)
{
if (tetri_a->tetribit != tetri_b->tetribit)
return (0);
if (tetri_a->width != tetri_b->width)
return (0);
if (tetri_a->height != tetri_b->height)
return (0);
return (1);
}
/*
** Function that free the list->memory each time it's malloc
*/
t_fillist *clean_list_memory(t_fillist *list, t_fillist *tmp)
{
while (tmp)
{
if (tmp->memory)
free(tmp->memory);
tmp = tmp->next;
}
return (list);
}
/*
** Test optimisation for not testing wrong maps when tetri are identical
*/
int check_same_tetri(t_fillist *list, int num)
{
t_fillist *curr_tetri;
t_fillist *next_tetri;
int i;
curr_tetri = clean_list_memory(list, list);
while (curr_tetri != NULL)
{
i = 0;
if (!(curr_tetri->memory =
(unsigned int *)malloc(sizeof(*curr_tetri->memory) * num)))
return (0);
while (i < num)
curr_tetri->memory[i++] = 0;
next_tetri = curr_tetri->next;
while (next_tetri != NULL)
{
if (compare_tetri(curr_tetri, next_tetri))
if (next_tetri->same == NULL)
next_tetri->same = curr_tetri;
next_tetri = next_tetri->next;
}
curr_tetri->total_num = num;
curr_tetri = curr_tetri->next;
}
return (0);
}

78
f_bonus_print.c Normal file
View File

@@ -0,0 +1,78 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* f_bonus_print.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/05/27 13:46:29 by hulamy #+# #+# */
/* Updated: 2019/06/01 16:26:09 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
/*
** function that print the given tetris if flag p is present
*/
t_fillist *print_tetri(t_fillist *list)
{
unsigned int print;
t_fillist *tmp;
tmp = list;
if (list->dope[2])
{
while (tmp)
{
check_same_tetri(list, 1);
print = tmp->tetribit;
print <<= 16;
print_sized_map(&print, tmp->width, tmp->height, tmp->letter);
if (tmp->same && list->dope[1])
{
print = tmp->same->tetribit;
print <<= 16;
ft_putstr("same --> ");
ft_put_tetri_color(tmp->same->letter);
ft_putchar('\n');
}
ft_putchar('\n');
tmp = tmp->next;
}
}
return (list);
}
/*
** function that print the map in binary if flag p is present
** it returns anyway the size of the map for main to print it
*/
int print_binary_map(unsigned int *map, int size, int *dope)
{
size--;
if (dope[2])
{
ft_putendl("result in binary :");
print_sized_map(map, size, size, '#');
ft_putchar('\n');
}
free(map);
return (size);
}
/*
** function that print the flags usage
*/
int print_flags_usage(void)
{
ft_putendl("flags usage :");
ft_putendl("d : debug print (print the map during the backtracking)");
ft_putendl("o : optimisation ultra fast but with some errors still");
ft_putendl("p : print the tetri and the map in different formats");
ft_putendl("e : error msgs more precise AND no error for too much tetri\n");
return (0);
}

View File

@@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* handle_errors.c :+: :+: :+: */ /* f_handle_errors.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */
/* Updated: 2019/05/03 19:11:02 by vmanzoni ### ########.fr */ /* Updated: 2019/06/01 19:44:08 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -16,31 +16,36 @@
** Function that display error message *s on fd and exit program ** Function that display error message *s on fd and exit program
*/ */
void print_error(char *s) void print_error(char *str)
{ {
write(2, s, strlen(s)); write(1, str, ft_strlen(str));
exit(1); exit(0);
} }
/* /*
** Function that display error message *s on fd ** Function that display error message *s on fd with more informations
** with more informations
** and exit program
*/ */
void print_error_extended(int error) void print_error_extended(int error, int *dope)
{ {
if (!dope[3])
print_error("error\n");
if (error == 1) if (error == 1)
ft_putstr("error: File contains char other than . # \\n found.\n"); print_error("error: File contains char other than '.','#' and '\\n'\n");
if (error == 2) if (error == 2)
ft_putstr("error: File contains more than 2 \\n in a row.\n"); print_error("error: File contains two tetriminos not"
"separated by a '\\n'\n");
if (error == 3) if (error == 3)
ft_putstr("error: File contains less than 1 tetrimino or more than 26.\n"); print_error("error: File contains more than 2 '\\n' in a row\n");
if (error == 4) if (error == 4)
ft_putstr("\n\nerror: This tetrimino has more or less than 4 #.\n"); print_error("error: File contains less than 1 tetrimino\n");
if (error == 5) if (error == 5)
ft_putstr("\n\nerror: This tetrimino # are not well connected.\n"); print_error("error: File contains more than 26 tetriminos\n");
exit(1); if (error == 6)
print_error("error: Tetrimino has more or less than 4 #\n");
if (error == 7)
print_error("error: Tetrimino # are not all connected\n");
print_error("error\n");
} }
/* /*
@@ -50,7 +55,7 @@ void print_error_extended(int error)
** - two \n in a row ** - two \n in a row
*/ */
int check_file_errors(char *file) void check_file_errors(char *file, int *dope)
{ {
int i; int i;
int line_nbr; int line_nbr;
@@ -60,17 +65,22 @@ int check_file_errors(char *file)
while (file[i]) while (file[i])
{ {
if (file[i] != '.' && file[i] != '#' && file[i] != '\n') if (file[i] != '.' && file[i] != '#' && file[i] != '\n')
return (1); print_error_extended(1, dope);
if (file[i] == '\n') else if (file[i] == '\n')
line_nbr++; line_nbr++;
if (file[i] == '\n' && file[i+1] != '\0' && \ if (file[i] == '\n' && line_nbr % 5 == 0 && file[i - 1] != '\n')
file[i+2] != '.' && file[i+2] != '#') print_error_extended(2, dope);
return (2); if (file[i] == '\n' && file[i + 1] != '\0' && \
file[i + 2] != '.' && file[i + 2] != '#')
print_error_extended(3, dope);
i++; i++;
} }
if (line_nbr < 4 || line_nbr > 129) if (file[i - 1] == '\n')
return (3); print_error_extended(3, dope);
return (0); if (line_nbr < 3)
print_error_extended(4, dope);
if (!dope[3] && line_nbr > 129)
print_error_extended(5, dope);
} }
/* /*
@@ -97,7 +107,7 @@ int check_tetri_errors(char *tetri)
i++; i++;
} }
if (htg != 4 || dot != 12 || check_tetri_errors_proxy(tetri)) if (htg != 4 || dot != 12 || check_tetri_errors_proxy(tetri))
return (4 + check_tetri_errors_proxy(tetri)); return (6 + check_tetri_errors_proxy(tetri));
return (0); return (0);
} }
@@ -108,17 +118,21 @@ int check_tetri_errors(char *tetri)
int check_tetri_errors_proxy(char *tetri) int check_tetri_errors_proxy(char *tetri)
{ {
int i; int i;
int j;
i = 0; i = 0;
j = 0;
while (tetri[i]) while (tetri[i])
{ {
if (tetri[i] == '.' || tetri[i] == '\n') if (i < 19 && tetri[i] == '#' && tetri[i + 1] == '#')
i++; j++;
else if (tetri[i] == '#' && (tetri[i + 1] == '#' || tetri[i - 1] == '#' if (i > 0 && tetri[i] == '#' && tetri[i - 1] == '#')
|| tetri[i + 5] == '#' || tetri[i - 5] == '#')) j++;
i++; if (i < 15 && tetri[i] == '#' && tetri[i + 5] == '#')
else j++;
return (1); if (i > 4 && tetri[i] == '#' && tetri[i - 5] == '#')
j++;
i++;
} }
return (0); return ((j < 6) ? 1 : 0);
} }

View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */ /* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */
/* Updated: 2019/05/16 15:30:57 by hulamy ### ########.fr */ /* Updated: 2019/06/01 13:32:38 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -44,10 +44,7 @@ unsigned short reduce_tetri(unsigned short tetri, int width)
unsigned int mask; unsigned int mask;
unsigned int tmp; unsigned int tmp;
// cree un mask avec des 1 a gauche sur la largeur du tetriminos
mask = ~0u << (32 - width) >> 16; mask = ~0u << (32 - width) >> 16;
// fabrique la ligne pour le tetriminos de la bonne largeur
tmp = tetri;
tmp = (mask & tetri); tmp = (mask & tetri);
tmp |= ((mask & tetri << 4) >> width); tmp |= ((mask & tetri << 4) >> width);
tmp |= ((mask & tetri << 8) >> (2 * width)); tmp |= ((mask & tetri << 8) >> (2 * width));
@@ -58,18 +55,27 @@ unsigned short reduce_tetri(unsigned short tetri, int width)
/* /*
** Function that transforme a tetriminos char* into a short of 16 bites ** Function that transforme a tetriminos char* into a short of 16 bites
** and then fills it and its reversed into the list ** and then fills it and its reversed into the list
**
** 1) transforme la ligne de . et # en un short de 0 et 1
** 2) cree un mask avec des 1 sur la colonne de droite (#...#...#...#...)
** 3) utilise le mask pour trouver la largeur que prend le tetriminos
** 4) deplace le tetriminos tout en haut a gauche
** (i - list->width = le nombre de colonne vide a gauche)
** 5) trouve la hauteur du tetri
** 6) fabrique la ligne pour le tetriminos de la bonne largeur
**
** list->test is used to debug the backtracking, allowing to print the
** map each time without the previous tries
*/ */
void fill_list(char line[], t_fillist *list) void fill_list(char line[], t_fillist *list)
{ {
unsigned int mask; unsigned int mask;
int i; int i;
// transforme la ligne de . et # en un short de 0 et 1
list->tetribit = tab_to_bin(line); list->tetribit = tab_to_bin(line);
// cree un mask avec des 1 sur la colonne de droite (#...#...#...#...) list->memory = 0;
mask = (1 << 15) | (1 << 11) | (1 << 7) | (1 << 3); mask = (1 << 15) | (1 << 11) | (1 << 7) | (1 << 3);
// utilise le mask pour trouver la largeur que prend le tetriminos
i = 0; i = 0;
while (!(mask & list->tetribit) && i++ < 4) while (!(mask & list->tetribit) && i++ < 4)
mask >>= 1; mask >>= 1;
@@ -77,20 +83,16 @@ void fill_list(char line[], t_fillist *list)
while (mask & list->tetribit && ++i < 4) while (mask & list->tetribit && ++i < 4)
mask >>= 1; mask >>= 1;
list->width = i - list->width; list->width = i - list->width;
// deplace le tetriminos tout en haut a gauche
//(i - list->width = le nombre de colonne vide a gauche)
list->tetribit <<= (i - list->width); list->tetribit <<= (i - list->width);
while (!(list->tetribit & (~0u << 12))) while (!(list->tetribit & (~0u << 12)))
list->tetribit <<= 4; list->tetribit <<= 4;
// trouve la hauteur du tetri
i = 0; i = 0;
while (i < 4 && list->tetribit & (~0u << 28 >> (i * 4 + 16))) while (i < 4 && list->tetribit & (~0u << 28 >> (i * 4 + 16)))
i++; i++;
list->height = i; list->height = i;
// fabrique la ligne pour le tetriminos de la bonne largeur
list->tetribit = reduce_tetri(list->tetribit, list->width); list->tetribit = reduce_tetri(list->tetribit, list->width);
list->position = 0; list->same = NULL;
list->test = 0; // DEBUG pour que print_final_map puisse imprimer correctement au fur et a mesure list->test = 0;
} }
/* /*
@@ -98,7 +100,7 @@ void fill_list(char line[], t_fillist *list)
** linked each time needed ** linked each time needed
*/ */
int add_to_list(char *line, t_fillist **list, char letter) int add_to_list(char *line, t_fillist **lst, char letter, int *dope)
{ {
t_fillist *tmp; t_fillist *tmp;
t_fillist *test; t_fillist *test;
@@ -106,17 +108,19 @@ int add_to_list(char *line, t_fillist **list, char letter)
if (!(tmp = (t_fillist*)malloc(sizeof(*tmp)))) if (!(tmp = (t_fillist*)malloc(sizeof(*tmp))))
return (0); return (0);
tmp->next = NULL; tmp->next = NULL;
test = *list; test = *lst;
if (!test) if (!test)
*list = tmp; *lst = tmp;
else else
{ {
while(test->next) while (test->next)
test = test->next; test = test->next;
test->next = tmp; test->next = tmp;
} }
fill_list(line, tmp); fill_list(line, tmp);
tmp->letter = letter; tmp->letter = letter;
tmp->dope = dope;
tmp->start = *lst;
return (1); return (1);
} }
@@ -124,13 +128,13 @@ int add_to_list(char *line, t_fillist **list, char letter)
** Function that parse a file and put each tetrimino in a linked list ** Function that parse a file and put each tetrimino in a linked list
*/ */
void parse_input(char *input) int parse_input(char *input, t_fillist **list, int *dope)
{ {
static t_fillist *list = NULL;
char tetri[20]; char tetri[20];
int i; int i;
int j; int j;
int letter; int letter;
int size;
i = 0; i = 0;
letter = 'A'; letter = 'A';
@@ -141,14 +145,11 @@ void parse_input(char *input)
tetri[j++] = input[i++]; tetri[j++] = input[i++];
tetri[19] = '\0'; tetri[19] = '\0';
if (check_tetri_errors(tetri)) if (check_tetri_errors(tetri))
{ print_error_extended(check_tetri_errors(tetri), dope);
ft_putstr(tetri); add_to_list(tetri, list, letter++, dope);
print_error_extended(check_tetri_errors(tetri));
//print_error("\n\nerror: This tetrimino is not valid.\n");
}
add_to_list(tetri, &list, letter++);
while (input[i] && input[i] != '.' && input[i] != '#') while (input[i] && input[i] != '.' && input[i] != '#')
i++; i++;
} }
search_map(list); size = search_map(*list);
return (size);
} }

122
f_print.c Normal file
View File

@@ -0,0 +1,122 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* f_print.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/30 13:24:28 by hulamy #+# #+# */
/* Updated: 2019/06/01 13:56:50 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
/*
** Function that print a map of height and width
** useful to print tetris
*/
void print_sized_map(unsigned int *tab, int width, int height, char letter)
{
int i;
unsigned int mask;
i = 0;
mask = 0;
while (i++ < width)
mask = (mask >> 1) | ((mask | 1) << 31);
i = 0;
while (i < width * height)
{
if (i && !(i % width))
ft_putchar('\n');
if (tab[i / 32] & (1 << (31 - i % 32)))
ft_put_tetri_color(letter);
else
ft_putchar('.');
ft_putchar(' ');
i++;
}
write(1, "\n", 1);
}
/*
** Print the final map with the letters
** if flag value is 0 -> print moulinette version
** if flag value is p -> print in color
*/
char *init_print_map(t_fillist *list, int size)
{
char *map;
int i;
int j;
if (!(map = (char *)malloc(sizeof(*map) * (size * size + 1))))
return (NULL);
map[size * size] = '\0';
i = -1;
while (++i < size * size)
map[i] = '.';
while (list)
{
j = 0;
i = -1;
while (++i < list->width * list->height)
{
if (i && i % list->width == 0)
j += size - list->width;
if (1 << (15 - i) & list->tetribit && list->test == 1)
map[list->position + i + j - 1] = list->letter;
}
list = list->next;
}
return (map);
}
/*
** Function that print the map with color if flag = 1
** or for moulinette if flag = 0;
*/
void print_letter_map(t_fillist *list, int size, int flag)
{
int i;
char *map;
map = init_print_map(list, size);
i = -1;
while (++i < size * size)
{
if (i && i % size == 0)
ft_putchar('\n');
if (flag == 0)
ft_putchar(map[i]);
else
{
ft_put_tetri_color(map[i]);
ft_putchar(' ');
}
}
ft_putchar('\n');
free(map);
}
/*
** Function that print the map
*/
void print_final_map(t_fillist *list, int size)
{
if (list->dope[2])
{
ft_putendl("result for humans :");
print_letter_map(list, size, 1);
ft_putchar('\n');
ft_putendl("result for moulinette :");
}
print_letter_map(list, size, 0);
if (list->dope[2])
ft_putchar('\n');
}

View File

@@ -6,73 +6,46 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/05/03 20:27:22 by vmanzoni #+# #+# */ /* Created: 2019/05/03 20:27:22 by vmanzoni #+# #+# */
/* Updated: 2019/05/04 19:15:35 by vmanzoni ### ########.fr */ /* Updated: 2019/06/01 14:27:30 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "fillit.h" #include "fillit.h"
void ft_putchar(char c) void ft_putchar_color(char c, char color)
{ {
write(1, &c, 1); if (color == 'R')
} write(1, RED, 5);
else if (color == 'B')
void ft_putchar_red(char c) write(1, BLU, 5);
{ else if (color == 'G')
write(1, RED, 5); write(1, GRN, 5);
ft_putchar(c); else if (color == 'Y')
write(1, RESET, 5); write(1, YEL, 5);
} else if (color == 'M')
write(1, MAG, 5);
void ft_putchar_blue(char c) else if (color == 'C')
{ write(1, CYN, 5);
write(1, BLU, 5); else if (color == 'W' || !c)
ft_putchar(c); write(1, RESET, 5);
write(1, RESET, 5);
}
void ft_putchar_green(char c)
{
write(1, GRN, 5);
ft_putchar(c);
write(1, RESET, 5);
}
void ft_putchar_yellow(char c)
{
write(1, YEL, 5);
ft_putchar(c);
write(1, RESET, 5);
}
void ft_putchar_magenta(char c)
{
write(1, MAG, 5);
ft_putchar(c);
write(1, RESET, 5);
}
void ft_putchar_cyan(char c)
{
write(1, CYN, 5);
ft_putchar(c); ft_putchar(c);
write(1, RESET, 5); write(1, RESET, 5);
} }
void ft_put_tetri_color(char c) void ft_put_tetri_color(char c)
{ {
if (c == 'A' || c == 'G' || c == 'M' || c == 'S') if (c == 'A' || c == 'G' || c == 'M' || c == 'S' || c == 'Y')
ft_putchar_red(c); ft_putchar_color(c, 'R');
else if (c == 'B' || c == 'H' || c == 'N' || c == 'T' || c == 'Y') else if (c == 'B' || c == 'H' || c == 'N' || c == 'T' || c == 'Z')
ft_putchar_blue(c); ft_putchar_color(c, 'B');
else if (c == 'C' || c == 'I' || c == 'O' || c == 'U' || c == 'Z') else if (c == 'C' || c == 'I' || c == 'O' || c == 'U')
ft_putchar_green(c); ft_putchar_color(c, 'G');
else if (c == 'D' || c == 'J' || c == 'P' || c == 'V') else if (c == 'D' || c == 'J' || c == 'P' || c == 'V')
ft_putchar_yellow(c); ft_putchar_color(c, 'Y');
else if (c == 'E' || c == 'K' || c == 'Q' || c == 'W') else if (c == 'E' || c == 'K' || c == 'Q' || c == 'W')
ft_putchar_magenta(c); ft_putchar_color(c, 'M');
else if (c == 'F' || c == 'L' || c == 'R' || c == 'X') else if (c == 'F' || c == 'L' || c == 'R' || c == 'X')
ft_putchar_cyan(c); ft_putchar_color(c, 'C');
else else
ft_putchar(c); ft_putchar(c);
} }

View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/13 12:09:46 by vmanzoni #+# #+# */ /* Created: 2019/04/13 12:09:46 by vmanzoni #+# #+# */
/* Updated: 2019/04/22 15:16:18 by vmanzoni ### ########.fr */ /* Updated: 2019/06/01 15:12:03 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -18,17 +18,17 @@
char *read_file(char *file) char *read_file(char *file)
{ {
char buf[BUFF_SIZE]; char buf[BUFF_SIZE];
int fd; int fd;
int rv; int rv;
int i; int i;
char *result; char *result;
if (((fd = open(file, O_RDONLY)) < 0) \ if (((fd = open(file, O_RDONLY)) < 0) \
|| ((rv = read(fd, &buf, BUFF_SIZE)) < 0) \ || ((rv = read(fd, &buf, BUFF_SIZE)) < 0) \
|| !(result = malloc(sizeof(char) * rv))) || !(result = malloc(sizeof(char) * rv)))
return (NULL); return (NULL);
buf[rv] = '\0'; buf[rv - 1] = '\0';
i = -1; i = -1;
while (buf[++i]) while (buf[++i])
result[i] = buf[i]; result[i] = buf[i];
@@ -36,3 +36,15 @@ char *read_file(char *file)
close(fd); close(fd);
return (result); return (result);
} }
/*
** Function that init num and size for search_map
*/
void init_num_and_size(int num, int *size, t_fillist *tmp)
{
while ((tmp = tmp->next))
num++;
while (*size * *size < num * 4)
(*size)++;
}

View File

@@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* search_map.c :+: :+: :+: */ /* f_search_map.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */ /* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */ /* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */
/* Updated: 2019/05/17 17:06:41 by hulamy ### ########.fr */ /* Updated: 2019/06/03 13:00:28 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -16,7 +16,7 @@
** function that look if a tretri fit in a place ** function that look if a tretri fit in a place
*/ */
unsigned int fit_in_place(unsigned int *map, t_fillist *lst, int size, int i) unsigned int fit_in_place(unsigned int *map, t_fillist *lst, int sze, int i)
{ {
unsigned int tmp; unsigned int tmp;
unsigned int mask; unsigned int mask;
@@ -36,9 +36,11 @@ unsigned int fit_in_place(unsigned int *map, t_fillist *lst, int size, int i)
return (0); return (0);
if (r >= 32 && ++n) if (r >= 32 && ++n)
r -= 32; r -= 32;
tmp = (mask & (map[n] << r)) | (mask & (map[n + 1] >> (32 - r))); tmp = (mask & (map[n] << r));
if (n + 1 < lst->total_num)
tmp |= (mask & (map[n + 1] >> (32 - r)));
tetri <<= lst->width; tetri <<= lst->width;
r += size; r += sze;
} }
return (!(tmp & tetri)); return (!(tmp & tetri));
} }
@@ -47,7 +49,7 @@ unsigned int fit_in_place(unsigned int *map, t_fillist *lst, int size, int i)
** function that look for the first place in the map for a tetri ** function that look for the first place in the map for a tetri
*/ */
int find_place(unsigned int *map, t_fillist *list, int size) int find_place(unsigned int *map, t_fillist *list, int size)
{ {
int limit; int limit;
int pos; int pos;
@@ -80,32 +82,32 @@ int find_place(unsigned int *map, t_fillist *list, int size)
** function that add or remove a tetri on the map ** function that add or remove a tetri on the map
*/ */
void add_remove(unsigned int *map, t_fillist *list, int size) void add_remove(unsigned int *map, t_fillist *list, int size)
{ {
unsigned int mask; unsigned int msk;
unsigned short tetri; unsigned short tetri;
int i; int i;
int j; int j;
tetri = list->tetribit; tetri = list->tetribit;
mask = ~0u << (32 - list->width); msk = ~0u << (32 - list->width);
i = (list->height - 1) * list->width; i = (list->height - 1) * list->width;
j = (list->height - 1) * size + list->position; j = (list->height - 1) * size + list->position;
// change les bits du tetri sur la map a la position donnee
while (j >= list->position) while (j >= list->position)
{ {
map[(j - 1) / 32] ^= (mask & tetri << (16 + i)) >> (j - 1); map[(j - 1) / 32] ^= (msk & tetri << (16 + i)) >> (j - 1);
map[(j - 1) / 32 + 1] ^= (mask & tetri << (16 + i)) << (32 - j) << 1; if ((j - 1) / 32 + 1 < list->total_num)
map[(j - 1) / 32 + 1] ^= (msk & tetri << (16 + i)) << (32 - j) << 1;
j -= size; j -= size;
i -= list->width; i -= list->width;
} }
} }
/* /*
** function that recursively try to fill the map with the tetris ** Function that recursively try to fill the map with the tetris
*/ */
int fill_map(unsigned int *map, t_fillist *list, int size) int fill_map(unsigned int *map, t_fillist *list, int size)
{ {
if (!list) if (!list)
return (1); return (1);
@@ -113,18 +115,31 @@ int fill_map(unsigned int *map, t_fillist *list, int size)
while (find_place(map, list, size)) while (find_place(map, list, size))
{ {
add_remove(map, list, size); add_remove(map, list, size);
if (fill_map(map, list->next, size)) list->test = 1;
return (1); if (list->dope[0])
{
print_letter_map(list->start, size, 1);
ft_putchar('\n');
}
if (list->dope[1])
if (check_tetri_memory(list, list->position))
if (fill_map(map, list->next, size))
return (1);
if (!list->dope[1])
if (fill_map(map, list->next, size))
return (1);
add_remove(map, list, size); add_remove(map, list, size);
list->test = 0;
} }
return (0); return (0);
} }
/* /*
** function that send to "fill_map" a map of a certain size and increment its size untill it's solved ** Function that send to "fill_map" a map of a certain size
** and increment its size untill it's solved
*/ */
int search_map(t_fillist *list) int search_map(t_fillist *list)
{ {
t_fillist *tmp; t_fillist *tmp;
unsigned int *map; unsigned int *map;
@@ -132,38 +147,23 @@ int search_map(t_fillist *list)
int num; int num;
int i; int i;
/////////////////////////////////////////////////// TEST
unsigned int print;
tmp = list;
while (tmp)
{
// imression pour tests
print = tmp->tetribit;
print <<= 16;
print_map(&print, tmp->width, tmp->height, tmp->letter);
ft_putchar('\n');
tmp = tmp->next;
}
/////////////////////////////////////////////////// TEST
size = 2; size = 2;
num = 1; tmp = print_tetri(list);
tmp = list; init_num_and_size(1, &size, tmp);
while ((tmp = tmp->next))
num++;
while (size * size < num * 4)
size++;
i = 0; i = 0;
while (!i) while (!i)
{ {
num = (size * size) / 32 + 1; num = (size * size) / 32 + 1;
if (!(map = (unsigned int *)malloc(sizeof(*map) * num))) if (!(map = (unsigned int *)malloc(sizeof(*map) * num)))
return (0); return (0);
while (num) check_same_tetri(list, num);
map[num--] = 0; if (list->dope[2])
ft_putnbrendl(size);
while (num--)
map[num] = 0;
i = fill_map(map, list, size++); i = fill_map(map, list, size++);
if (!i)
free(map);
} }
print_final_map(list, size - 1); // DEBUG return (print_binary_map(map, size, list->dope));
print_map(map, size - 1, size - 1, '#'); // DEBUG
return (--size);
} }

132
fillit.h
View File

@@ -6,19 +6,19 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */
/* Updated: 2019/05/17 17:03:35 by hulamy ### ########.fr */ /* Updated: 2019/06/03 21:53:09 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef FILLIT_H #ifndef FILLIT_H
# define FILLIT_H # define FILLIT_H
#include <stdlib.h> # include <stdlib.h>
#include <unistd.h> // for system call write # include <unistd.h>
#include <fcntl.h> // for system call open # include <fcntl.h>
#include <stdio.h> // for printf (DELETE BEFORE EVAL) # include <stdbool.h>
#include "libft/includes/libft.h" # include "libft/libft.h"
/* /*
** DEFINE ** DEFINE
@@ -26,19 +26,32 @@
# define BUFF_SIZE 1024 # define BUFF_SIZE 1024
#define RED "\x1B[31m" # define RED "\x1B[31m"
#define GRN "\x1B[32m" # define GRN "\x1B[32m"
#define YEL "\x1B[33m" # define YEL "\x1B[33m"
#define BLU "\x1B[34m" # define BLU "\x1B[34m"
#define MAG "\x1B[35m" # define MAG "\x1B[35m"
#define CYN "\x1B[36m" # define CYN "\x1B[36m"
#define RESET "\x1B[0m" # define RESET "\x1B[0m"
/* /*
** STRUCTURE ** STRUCTURE
** tetribit : tetri ecrit en binaire dans un short de 16 bits
** width : largeur du tetri
** height : hauteur du tetri
** position : memorise la position d tetri bit a bit
** place : position sur l'axe des abscisses de la map (position % size)
** rank : position de 1 a 32 dans l'int du tableau d'int (position % 32)
** num : memorise dans quel int du tableau on se trouve (position / 32)
** test :
** letter : letter of the tetrimino for printing final map
** dope : flags for details, optimisation, printing and error
** memory : positions already tested by a tetrimino in bitwise
** same : pointer to previous identical tetrimino
** next : pointer to next tetrimino
** start : pointer to first tetrimino of input file
*/ */
typedef struct s_fillist
typedef struct s_fillist
{ {
unsigned short tetribit; unsigned short tetribit;
int width; int width;
@@ -47,29 +60,84 @@ typedef struct s_fillist
int place; int place;
int rank; int rank;
int num; int num;
int total_num;
int test; int test;
char letter; char letter;
int *dope;
unsigned int *memory;
struct s_fillist *same;
struct s_fillist *next; struct s_fillist *next;
} t_fillist; struct s_fillist *start;
} t_fillist;
/* /*
** FUNCTIONS ** bonus_opti.c
*/ */
int check_tetri_memory(t_fillist *list, int pos);
int compare_tetri(t_fillist *tetri_a, t_fillist *tetri_b);
t_fillist *clean_list_memory(t_fillist *list, t_fillist *tmp);
int check_same_tetri(t_fillist *list, int num);
char *read_file(char *file); /*
void print_error(char *s); ** bonus_print.c
void print_error_extended(int error); */
void parse_input(char *input); t_fillist *print_tetri(t_fillist *list);
int check_file_errors(char *file); int print_binary_map(unsigned int *map, int size, int *dope);
int check_tetri_errors(char *tetri); int print_flags_usage(void);
int check_tetri_errors_proxy(char *tetri);
int add_to_list(char *square, t_fillist **list, char letter); /*
void fill_list(char line[], t_fillist *list); ** main.c
void print_bits(unsigned int bits, int size); //TO DELETE BEFORE EVAL */
void print_tetri(unsigned int bits, int size); //TO DELETE BEFORE EVAL int *create_dope(char *av, int mdp);
int search_map(t_fillist *list); int is_mdp(int ac, char **av);
void print_map(unsigned int *tab, int width, int height, char letter); void clean_list(t_fillist *list, t_fillist *tmp);
void print_final_map(t_fillist *list, int size); int main(int argc, char **argv);
void ft_put_tetri_color(char c);
/*
** read_file.c
*/
char *read_file(char *file);
void init_num_and_size(int num, int *size, t_fillist *tmp);
/*
** handle_errors.c
*/
void print_error(char *s);
void print_error_extended(int error, int *dope);
void check_file_errors(char *file, int *dope);
int check_tetri_errors(char *tetri);
int check_tetri_errors_proxy(char *tetri);
/*
** parse_input.c
*/
unsigned short tab_to_bin(char line[]);
unsigned short reduce_tetri(unsigned short tetri, int width);
void fill_list(char line[], t_fillist *list);
int add_to_list(char *sqr, t_fillist **lst, char lett, int *dope);
int parse_input(char *input, t_fillist **list, int *dope);
/*
** search_map.c
*/
unsigned int fit_in_place(unsigned int *map, t_fillist *lst, int siz, int i);
int find_place(unsigned int *map, t_fillist *list, int size);
void add_remove(unsigned int *map, t_fillist *list, int size);
int fill_map(unsigned int *map, t_fillist *list, int size);
int search_map(t_fillist *list);
/*
** print.c
*/
void print_sized_map(unsigned int *tab, int wdth, int hgt, char ltr);
char *init_print_map(t_fillist *list, int size);
void print_letter_map(t_fillist *list, int size, int flag);
void print_final_map(t_fillist *list, int size);
/*
** print_map_with_colors.c
*/
void ft_putchar_color(char c, char color);
void ft_put_tetri_color(char c);
#endif #endif

34
fillit_roduquen/Makefile Executable file
View File

@@ -0,0 +1,34 @@
CC = gcc
CFLAGS = -Wall -Wextra -Werror
NAME = fillit
SRCDIR = ./
INCLDIR = ./
SRCS = $(SRCDIR)main.c $(SRCDIR)check_square.c $(SRCDIR)check_square2.c \
$(SRCDIR)fillit.c $(SRCDIR)full_square.c $(SRCDIR)check_hole.c\
$(SRCDIR)full_square2.c $(SRCDIR)remove_square.c $(SRCDIR)utilitys.c \
$(SRCDIR)do_i_fillit.c $(SRCDIR)count_island.c \
$(SRCDIR)check_count_island.c $(SRCDIR)init.c \
$(SRCDIR)check_count_island2.c
OBJS_ = $(SRCS:.c=.o)
OBJS = $(notdir $(OBJS_))
all : $(NAME)
$(NAME) : $(SRCS)
@make $(OBJS)
@$(CC) $(CFLAGS) -I $(INCLDIR) $^ -o $@
@echo "\n\033[36mCreation :\033[0m \033[35;4m$(NAME)\033[0m\n"
%.o : %.c
@$(CC) $(CFLAGS) -c -I $(INCLDIR) $^
@echo "\033[36mCompilation :\033[0m \033[32m$*\033[0m"
clean :
@rm -rf $(OBJS)
@echo "\n\033[36mDeletion :\033[0m \033[32mObjects\033[0m\n"
fclean : clean
@rm -rf $(NAME)
@echo "\033[36mDeletion :\033[0m \033[35;4m$(NAME)\033[0m\n"
re : fclean all

View File

@@ -0,0 +1,54 @@
..#.
###.
....
....
..##
.##.
....
....
.#..
###.
....
....
.#..
##..
.#..
....
.###
...#
....
....
....
....
....
####
....
.##.
.##.
....
.#..
.##.
.#..
....
.#..
.#..
.##.
....
.###
..#.
....
....
.#..
###.
....
....

View File

@@ -0,0 +1,64 @@
..#.
###.
....
....
..##
.##.
....
....
.#..
###.
....
....
.#..
##..
.#..
....
.###
...#
....
....
....
....
....
####
....
.##.
.##.
....
.#..
.##.
.#..
....
.#..
.#..
.##.
....
.###
..#.
....
....
.#..
###.
....
....
....
.#..
###.
....
..##
.##.
....
....

View File

@@ -0,0 +1,34 @@
..#.
###.
....
....
..##
.##.
....
....
.#..
###.
....
....
.#..
##..
.#..
....
.###
...#
....
....
....
....
....
####
....
.##.
.##.
....

View File

@@ -0,0 +1,44 @@
..#.
###.
....
....
..##
.##.
....
....
.#..
###.
....
....
.#..
##..
.#..
....
.###
...#
....
....
....
....
....
####
....
.##.
.##.
....
.#..
.##.
.#..
....
.#..
.#..
.##.
....

39
fillit_roduquen/TEST/test_I.txt Executable file
View File

@@ -0,0 +1,39 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
#...
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
...#
...#
...#

119
fillit_roduquen/TEST/test_J.txt Executable file
View File

@@ -0,0 +1,119 @@
.#..
.#..
##..
....
..#.
..#.
.##.
....
...#
...#
..##
....
....
.#..
.#..
##..
....
..#.
..#.
.##.
....
...#
...#
..##
###.
..#.
....
....
.###
...#
....
....
....
###.
..#.
....
....
.###
...#
....
....
....
###.
..#.
....
....
.###
...#
##..
#...
#...
....
.##.
.#..
.#..
....
..##
..#.
..#.
....
....
##..
#...
#...
....
.##.
.#..
.#..
....
..##
..#.
..#.
#...
###.
....
....
.#..
.###
....
....
....
#...
###.
....
....
.#..
.###
....
....
....
#...
###.
....
....
.#..
.###

119
fillit_roduquen/TEST/test_J2.txt Executable file
View File

@@ -0,0 +1,119 @@
..##
..#.
..#.
....
....
##..
#...
#...
....
.##.
.#..
.#..
....
..##
..#.
..#.
.#..
.#..
##..
....
..#.
..#.
.##.
....
...#
...#
..##
....
....
.#..
.#..
##..
....
..#.
..#.
.##.
....
...#
...#
..##
###.
..#.
....
....
.###
...#
....
....
....
###.
..#.
....
....
.###
...#
....
....
....
###.
..#.
....
....
.###
...#
##..
#...
#...
....
.##.
.#..
.#..
....
#...
###.
....
....
.#..
.###
....
....
....
#...
###.
....
....
.#..
.###
....
....
....
#...
###.
....
....
.#..
.###

119
fillit_roduquen/TEST/test_L.txt Executable file
View File

@@ -0,0 +1,119 @@
#...
#...
##..
....
.#..
.#..
.##.
....
..#.
..#.
..##
....
....
#...
#...
##..
....
.#..
.#..
.##.
....
..#.
..#.
..##
###.
#...
....
....
.###
.#..
....
....
....
###.
#...
....
....
.###
.#..
....
....
....
###.
#...
....
....
.###
.#..
##..
.#..
.#..
....
.##.
..#.
..#.
....
..##
...#
...#
....
....
##..
.#..
.#..
....
.##.
..#.
..#.
....
..##
...#
...#
..#.
###.
....
....
...#
.###
....
....
....
..#.
###.
....
....
...#
.###
....
....
....
..#.
###.
....
....
...#
.###

44
fillit_roduquen/TEST/test_O.txt Executable file
View File

@@ -0,0 +1,44 @@
##..
##..
....
....
.##.
.##.
....
....
..##
..##
....
....
....
##..
##..
....
....
.##.
.##.
....
....
..##
..##
....
....
....
##..
##..
....
....
.##.
.##.
....
....
..##
..##

59
fillit_roduquen/TEST/test_S.txt Executable file
View File

@@ -0,0 +1,59 @@
.##.
##..
....
....
..##
.##.
....
....
....
.##.
##..
....
....
..##
.##.
....
....
....
.##.
##..
....
....
..##
.##.
#...
##..
.#..
....
.#..
.##.
..#.
....
..#.
..##
...#
....
....
#...
##..
.#..
....
.#..
.##.
..#.
....
..#.
..##
...#

119
fillit_roduquen/TEST/test_T.txt Executable file
View File

@@ -0,0 +1,119 @@
###.
.#..
....
....
.###
..#.
....
....
....
###.
.#..
....
....
.###
..#.
....
....
....
###.
.#..
....
....
.###
..#.
#...
##..
#...
....
.#..
.##.
.#..
....
..#.
..##
..#.
....
....
#...
##..
#...
....
.#..
.##.
.#..
....
..#.
..##
..#.
.#..
###.
....
....
..#.
.###
....
....
....
.#..
###.
....
....
..#.
.###
....
....
....
.#..
###.
....
....
..#.
.###
.#..
##..
.#..
....
..#.
.##.
..#.
....
...#
..##
...#
....
....
.#..
##..
.#..
....
..#.
.##.
..#.
....
...#
..##
...#

59
fillit_roduquen/TEST/test_Z.txt Executable file
View File

@@ -0,0 +1,59 @@
##..
.##.
....
....
.##.
..##
....
....
....
##..
.##.
....
....
.##.
..##
....
....
....
##..
.##.
....
....
.##.
..##
.#..
##..
#...
....
..#.
.##.
.#..
....
...#
..##
..#.
....
....
.#..
##..
#...
....
..#.
.##.
.#..
....
...#
..##
..#.

View File

@@ -0,0 +1,24 @@
..#.
###.
....
....
..##
.##.
....
....
.#..
###.
....
....
.#..
##..
.#..
....
.###
...#
....
....

View File

@@ -0,0 +1,129 @@
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....
.#..
###.
....
....

View File

@@ -0,0 +1,39 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
#...
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
...#
...#
...#.

View File

@@ -0,0 +1,40 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
#...
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
...#
...#
...#

View File

@@ -0,0 +1,38 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
#...
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
...#
...#
...#

View File

@@ -0,0 +1,39 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
#...
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
..##
...#
...#

View File

@@ -0,0 +1,40 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
#...
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
...#
...#
...#.

View File

@@ -0,0 +1,39 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
....
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
...#
...#
...#.

View File

@@ -0,0 +1,39 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
#...
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
...#
...#
...#.

View File

@@ -0,0 +1,64 @@
....
####
....
....
#...
#...
#...
#...
.#..
###.
....
....
.#..
.##.
.#..
....
.###
..#.
....
....
###.
..#.
....
....
.###
.#..
....
....
##..
##..
....
....
.#..
.#..
.##.
....
.#..
##..
.#..
....
.#..
.#..
##..
....
...#
.###
....
....
.#..
.###
....
....

View File

@@ -0,0 +1,79 @@
....
####
....
....
#...
#...
#...
#...
.#..
###.
....
....
.#..
.##.
.#..
....
.###
..#.
....
....
###.
..#.
....
....
.###
.#..
....
....
##..
##..
....
....
.#..
.#..
.##.
....
.#..
##..
.#..
....
.#..
.#..
##..
....
...#
.###
....
....
.#..
.###
....
....
##..
.#..
.#..
....
##..
#...
#...
....
.##.
##..
....
....

View File

@@ -0,0 +1,44 @@
....
####
....
....
#...
#...
#...
#...
.#..
###.
....
....
.#..
.##.
.#..
....
.###
..#.
....
....
###.
..#.
....
....
.###
.#..
....
....
##..
##..
....
....
.#..
.#..
.##.
....

1
fillit_roduquen/auteur Executable file
View File

@@ -0,0 +1 @@
roduquen;scarpent

View File

@@ -0,0 +1,121 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* check_count_island.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:04 by roduquen #+# #+# */
/* Updated: 2019/04/01 19:16:13 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
int ft_check_square(int i, t_type *square, char nbr)
{
if (i < square->size)
{
if (i == 0)
{
if ((square->isl[i + 1] == nbr && (i + 1) % square->size != 0)
|| square->isl[i + square->size] == nbr)
{
square->isl[i] = nbr;
if (square->str[i + 1] == '.' && (i + 1) % square->size != 0)
square->isl[i + 1] = nbr;
if (square->str[i + square->size] == '.')
square->isl[i + square->size] = nbr;
return (SUCCESS);
}
return (ERROR);
}
else
return (ft_check_square2(i, square, nbr));
}
return (ft_check_square3(i, square, nbr));
}
int ft_check_square2(int i, t_type *square, char nbr)
{
if ((square->isl[i + 1] == nbr && (i + 1) % square->size != 0)
|| square->isl[i - 1] == nbr
|| square->isl[i + square->size] == nbr)
{
square->isl[i] = nbr;
if (square->str[i + 1] == '.' && (i + 1) % square->size != 0)
square->isl[i + 1] = nbr;
if (square->str[i - 1] == '.')
square->isl[i - 1] = nbr;
if (square->str[i + square->size] == '.')
square->isl[i + square->size] = nbr;
return (SUCCESS);
}
return (ERROR);
}
int ft_check_square3(int i, t_type *square, char nbr)
{
if (i < square->size * (square->size - 1))
{
if (i % square->size == 0)
{
if ((square->isl[i + 1] == nbr && (i + 1) % square->size != 0)
|| square->isl[i + square->size] == nbr
|| square->isl[i - square->size] == nbr)
{
square->isl[i] = nbr;
if (square->str[i + 1] == '.')
square->isl[i + 1] = nbr;
if (square->str[i + square->size] == '.')
square->isl[i + square->size] = nbr;
if (square->str[i - square->size] == '.')
square->isl[i - square->size] = nbr;
return (SUCCESS);
}
return (ERROR);
}
else
return (ft_check_square4(i, square, nbr));
}
return (ft_check_square5(i, square, nbr));
}
int ft_check_square4(int i, t_type *square, char nbr)
{
if ((square->isl[i + 1] == nbr && (i + 1) % square->size != 0)
|| square->isl[i + square->size] == nbr
|| square->isl[i - 1] == nbr || square->isl[i - square->size] == nbr)
{
square->isl[i] = nbr;
if (square->str[i + 1] == '.' && (i + 1) % square->size != 0)
square->isl[i + 1] = nbr;
if (square->str[i + square->size] == '.')
square->isl[i + square->size] = nbr;
if (square->str[i - 1] == '.')
square->isl[i - 1] = nbr;
if (square->str[i - square->size] == '.')
square->isl[i - square->size] = nbr;
return (SUCCESS);
}
return (ERROR);
}
int ft_check_square5(int i, t_type *square, char nbr)
{
if (i % square->size == 0)
{
if ((square->isl[i + 1] == nbr && (i + 1) % square->size != 0)
|| square->isl[i - square->size] == nbr)
{
square->isl[i] = nbr;
if (square->str[i + 1] == '.' && (i + 1) % square->size != 0)
square->isl[i + 1] = nbr;
if (square->str[i - square->size] == '.')
square->isl[i - square->size] = nbr;
return (SUCCESS);
}
return (ERROR);
}
return (ft_check_square6(i, square, nbr));
}

View File

@@ -0,0 +1,31 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* check_count_island.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:04 by roduquen #+# #+# */
/* Updated: 2019/04/01 19:15:21 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
int ft_check_square6(int i, t_type *square, char nbr)
{
if ((square->isl[i + 1] == nbr && (i + 1) % square->size != 0)
|| square->isl[i - square->size] == nbr
|| square->isl[i - 1] == nbr)
{
square->isl[i] = nbr;
if (square->str[i + 1] == '.' && (i + 1) % square->size != 0)
square->isl[i + 1] = nbr;
if (square->str[i - square->size] == '.')
square->isl[i - square->size] = nbr;
if (square->str[i - 1] == '.')
square->isl[i - 1] = nbr;
return (SUCCESS);
}
return (ERROR);
}

41
fillit_roduquen/check_hole.c Executable file
View File

@@ -0,0 +1,41 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* check_hole.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:10 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:12:11 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
int check_hole(t_type *square, char tetri[], int to_test)
{
if (count_island(square, 0, tetri, to_test) > square->hole)
return (ERROR);
return (SUCCESS);
}
int i_fillit_the_power(t_type *square, char tetri[], int pos)
{
int i;
int j;
i = 0;
j = -1;
while (i < pos)
{
if (tetri[i] == tetri[pos])
j = i;
i++;
}
if (j == -1)
return (0);
i = 0;
while (square->str[i] != j + 'A')
i++;
return (i);
}

158
fillit_roduquen/check_square.c Executable file
View File

@@ -0,0 +1,158 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* check_square.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:12 by roduquen #+# #+# */
/* Updated: 2019/04/01 19:14:13 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
#include <stdio.h>
#include <unistd.h>
int check_square(t_type *square, char tetri, int pos)
{
if (tetri == -9
&& square->str[pos] == '.' && (pos + 1) % square->size != 0
&& pos + 2 * square->size + 1 < square->size * square->size
&& square->str[pos + 1] == '.'
&& square->str[pos + square->size + 1] == '.'
&& square->str[pos + 2 * square->size + 1] == '.')
return (SUCCESS);
if (tetri == -8
&& (pos + 1) % square->size != 0
&& pos + 2 * square->size + 1 < square->size * square->size
&& square->str[pos + 1] == '.'
&& square->str[pos + 2 * square->size] == '.'
&& square->str[pos + square->size + 1] == '.'
&& square->str[pos + 2 * square->size + 1] == '.')
return (SUCCESS);
if (tetri == -7
&& (pos + 1) % square->size != 0
&& pos + 2 * square->size < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 * square->size] == '.')
return (SUCCESS);
return (check_square2(square, tetri, pos));
}
int check_square2(t_type *square, char tetri, int pos)
{
if (tetri == -6
&& (pos + 1) % square->size != 0
&& pos + 2 * square->size + 1 < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 2 * square->size + 1] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 * square->size] == '.')
return (SUCCESS);
if (tetri == -5
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& pos + square->size + 1 < square->size * square->size
&& square->str[pos + 1] == '.'
&& square->str[pos + 2] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 1 + square->size] == '.')
return (SUCCESS);
if (tetri == -4
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& pos + 2 + square->size < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1] == '.'
&& square->str[pos + square->size + 1] == '.'
&& square->str[pos + 2 + square->size] == '.')
return (SUCCESS);
return (check_square3(square, tetri, pos));
}
int check_square3(t_type *square, char tetri, int pos)
{
if (tetri == -3
&& (pos + 1) % square->size != 0
&& pos + 2 * square->size < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1 + square->size] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 * square->size] == '.')
return (SUCCESS);
if (tetri == -2
&& (pos + 1) % square->size != 0
&& pos + 2 * square->size + 1 < square->size * square->size
&& square->str[pos + 1] == '.'
&& square->str[pos + 1 + square->size] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 * square->size + 1] == '.')
return (SUCCESS);
if (tetri == -1
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& (pos + 3) % square->size != 0
&& pos + 3 < square->size * square->size
&& square->str[pos] == '.' && square->str[pos + 1] == '.'
&& square->str[pos + 3] == '.'
&& square->str[pos + 2] == '.')
return (SUCCESS);
return (check_square4(square, tetri, pos));
}
int check_square4(t_type *square, char tetri, int pos)
{
if (tetri == 0
&& (pos + 1) % square->size != 0
&& pos + square->size + 1 < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 1 + square->size] == '.')
return (SUCCESS);
if (tetri == 1
&& pos + 3 * square->size < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 3 * square->size] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 * square->size] == '.')
return (SUCCESS);
if (tetri == 2
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& pos + 2 + square->size < square->size * square->size
&& square->str[pos + 1] == '.'
&& square->str[pos + 1 + square->size] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 + square->size] == '.')
return (SUCCESS);
return (check_square5(square, tetri, pos));
}
int check_square5(t_type *square, char tetri, int pos)
{
if (tetri == 3
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& pos + 1 + square->size < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1] == '.'
&& square->str[pos + square->size + 1] == '.'
&& square->str[pos + 2] == '.')
return (SUCCESS);
if (tetri == 4
&& (pos + 1) % square->size != 0
&& pos + 2 * square->size < square->size * square->size
&& square->str[pos + 1] == '.'
&& square->str[pos + 1 + square->size] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 * square->size] == '.')
return (SUCCESS);
if (tetri == 5
&& (pos + 1) % square->size != 0
&& pos + 2 * square->size + 1 < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1 + square->size] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 * square->size + 1] == '.')
return (SUCCESS);
return (check_square6(square, tetri, pos));
}

55
fillit_roduquen/check_square2.c Executable file
View File

@@ -0,0 +1,55 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* check_square2.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:15 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:26:45 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
int check_square6(t_type *square, char tetri, int pos)
{
if (tetri == 6
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& pos + square->size < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2] == '.')
return (SUCCESS);
if (tetri == 7
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& pos + 2 + square->size < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1] == '.'
&& square->str[pos + 2] == '.'
&& square->str[pos + 2 + square->size] == '.')
return (SUCCESS);
if (tetri == 8
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& pos + 2 + square->size < square->size * square->size
&& square->str[pos] == '.'
&& square->str[pos + 1 + square->size] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 + square->size] == '.')
return (SUCCESS);
return (check_square7(square, tetri, pos));
}
int check_square7(t_type *square, char tetri, int pos)
{
if (tetri == 9
&& (pos + 1) % square->size != 0 && (pos + 2) % square->size != 0
&& pos + 2 + square->size < square->size * square->size
&& square->str[pos + 2] == '.'
&& square->str[pos + 1 + square->size] == '.'
&& square->str[pos + square->size] == '.'
&& square->str[pos + 2 + square->size] == '.')
return (SUCCESS);
return (ERROR);
}

126
fillit_roduquen/count_island.c Executable file
View File

@@ -0,0 +1,126 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* count_island.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:17 by roduquen #+# #+# */
/* Updated: 2019/04/01 19:13:25 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
#include <stdio.h>
#include <unistd.h>
int count_island(t_type *square, int i, char tetri[], int to_test)
{
char nbr;
ft_memset(square->isl, '.', 170);
nbr = 'a';
while (1)
{
i = 0;
while (square->str[i])
{
if (square->isl[i] == '.' && square->str[i] == '.')
break ;
i++;
}
if (square->str[i])
square->isl[i] = nbr;
else
return (count_hole(square, nbr, tetri, to_test));
full_count_island_square(square, nbr);
nbr++;
}
return (ERROR);
}
void full_count_island_square(t_type *square, char nbr)
{
int i;
int j;
i = 0;
while (i < square->size * 2)
{
j = 0;
while (square->str[j])
{
if (square->str[j] == '.' && square->isl[j] == '.')
ft_check_square(j, square, nbr);
j++;
}
i++;
}
}
int count_hole(t_type *square, char nbr, char tetri[], int to_test)
{
int i;
int nbr_hole;
int total;
total = 0;
while (nbr >= 'a')
{
i = 0;
nbr_hole = 0;
while (i < square->size * square->size)
{
if (square->isl[i] == nbr)
nbr_hole++;
i++;
}
if (nbr_hole == 4)
total += check_new_possibility(square, nbr, tetri, to_test);
else
total += nbr_hole % 4;
nbr--;
}
return (total);
}
int check_if_placing_tetri_is_possible(t_type *square, char tetri[],
int to_test, int i)
{
while (tetri[to_test] != 42)
{
if (tetri[to_test] == -9 || tetri[to_test] == -7
|| tetri[to_test] == -6 || tetri[to_test] == -4
|| tetri[to_test] == -3 || tetri[to_test] == -1
|| tetri[to_test] == 0 || tetri[to_test] == 1
|| tetri[to_test] == 3 || tetri[to_test] == 5
|| tetri[to_test] == 6 || tetri[to_test] == 7
|| tetri[to_test] == 8)
{
if (check_square(square, tetri[to_test], i) == SUCCESS)
return (0);
}
else if (tetri[to_test] == -8 || tetri[to_test] == -5
|| tetri[to_test] == -2 || tetri[to_test] == 2
|| tetri[to_test] == 4)
{
if (check_square(square, tetri[to_test], i - 1) == SUCCESS)
return (0);
}
else if (check_square(square, tetri[to_test], i - 2) == SUCCESS)
return (0);
to_test++;
}
return (4);
}
int check_new_possibility(t_type *square, char nbr, char tetri[],
int to_test)
{
int i;
i = 0;
while (square->isl[i] != nbr)
i++;
return (check_if_placing_tetri_is_possible(square, tetri, to_test, i));
}

103
fillit_roduquen/do_i_fillit.c Executable file
View File

@@ -0,0 +1,103 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* do_i_fillit.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:19 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:27:29 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include <stdlib.h>
#include "fillit.h"
#include <unistd.h>
int do_i_fillit(char tetri[], int nbr)
{
int i;
t_type *square;
i = 0;
if (!(square = (t_type*)malloc(sizeof(t_type))))
return (ERROR);
while (i * i < nbr * 4)
i++;
if (!(square->str = (char*)malloc(sizeof(char) * (i * i + 1))))
return (free_error(square));
square->size = i;
full_square_hole(square, nbr);
i = 0;
while (i < square->size * square->size)
square->str[i++] = '.';
square->str[i] = 0;
return (do_i_fillit2(tetri, square));
}
int do_i_fillit2(char tetri[], t_type *square)
{
int i;
while (fillit(tetri, square) == ERROR)
{
free(square->str);
square->size++;
square->hole += square->size * 2 - 1;
if (!(square->str = (char*)malloc(sizeof(char) * (square->size
* square->size + 1))))
return (free_error(square));
i = 0;
while (i < square->size * square->size)
square->str[i++] = '.';
square->str[i] = 0;
}
free(square->str);
free(square);
return (SUCCESS);
}
int free_error(void *ptr)
{
free(ptr);
return (ERROR);
}
void print_tab(t_type *square)
{
int i;
i = 0;
while (i < square->size * square->size)
{
if (i != 0 && i % square->size == 0)
write(1, "\n", 1);
write(1, &square->str[i], 1);
i++;
}
write(1, "\n", 1);
}
void full_square_hole(t_type *square, int nbr)
{
if (nbr == 1 || nbr == 4 || nbr == 9 || nbr == 16 || nbr == 25)
square->hole = 0;
else if (nbr == 2 || nbr == 6 || nbr == 12 || nbr == 20)
square->hole = 1;
else if (nbr == 3 || nbr == 8 || nbr == 15 || nbr == 24)
square->hole = 4;
else if (nbr == 5 || nbr == 11 || nbr == 19)
square->hole = 5;
else if (nbr == 7 || nbr == 14 || nbr == 23)
square->hole = 8;
else if (nbr == 10 || nbr == 18)
square->hole = 9;
else if (nbr == 13 || nbr == 22)
square->hole = 12;
else if (nbr == 17)
square->hole = 13;
else if (nbr == 21)
square->hole = 16;
else
square->hole = 17;
}

564
fillit_roduquen/external_file.txt Executable file
View File

@@ -0,0 +1,564 @@
####
....
....
....
....
####
....
....
....
....
####
....
....
....
....
####
#...
#...
#...
#...
.#..
.#..
.#..
.#..
..#.
..#.
..#.
..#.
...#
...#
...#
...#
.#..
.#..
##..
....
..#.
..#.
.##.
....
...#
...#
..##
....
....
.#..
.#..
##..
....
..#.
..#.
.##.
....
...#
...#
..##
###.
..#.
....
....
.###
...#
....
....
....
###.
..#.
....
....
.###
...#
....
....
....
###.
..#.
....
....
.###
...#
##..
#...
#...
....
.##.
.#..
.#..
....
..##
..#.
..#.
....
....
##..
#...
#...
....
.##.
.#..
.#..
....
..##
..#.
..#.
#...
###.
....
....
.#..
.###
....
....
....
#...
###.
....
....
.#..
.###
....
....
....
#...
###.
....
....
.#..
.###
#...
#...
##..
....
.#..
.#..
.##.
....
..#.
..#.
..##
....
....
#...
#...
##..
....
.#..
.#..
.##.
....
..#.
..#.
..##
###.
#...
....
....
.###
.#..
....
....
....
###.
#...
....
....
.###
.#..
....
....
....
###.
#...
....
....
.###
.#..
##..
.#..
.#..
....
.##.
..#.
..#.
....
..##
...#
...#
....
....
##..
.#..
.#..
....
.##.
..#.
..#.
....
..##
...#
...#
..#.
###.
....
....
...#
.###
....
....
....
..#.
###.
....
....
...#
.###
....
....
....
..#.
###.
....
....
...#
.###
##..
##..
....
....
.##.
.##.
....
....
..##
..##
....
....
....
##..
##..
....
....
.##.
.##.
....
....
..##
..##
....
....
....
##..
##..
....
....
.##.
.##.
....
....
..##
..##
.##.
##..
....
....
..##
.##.
....
....
....
.##.
##..
....
....
..##
.##.
....
....
....
.##.
##..
....
....
..##
.##.
#...
##..
.#..
....
.#..
.##.
..#.
....
..#.
..##
...#
....
....
#...
##..
.#..
....
.#..
.##.
..#.
....
..#.
..##
...#
###.
.#..
....
....
.###
..#.
....
....
....
###.
.#..
....
....
.###
..#.
....
....
....
###.
.#..
....
....
.###
..#.
#...
##..
#...
....
.#..
.##.
.#..
....
..#.
..##
..#.
....
....
#...
##..
#...
....
.#..
.##.
.#..
....
..#.
..##
..#.
.#..
###.
....
....
..#.
.###
....
....
....
.#..
###.
....
....
..#.
.###
....
....
....
.#..
###.
....
....
..#.
.###
.#..
##..
.#..
....
..#.
.##.
..#.
....
...#
..##
...#
....
....
.#..
##..
.#..
....
..#.
.##.
..#.
....
...#
..##
...#
##..
.##.
....
....
.##.
..##
....
....
....
##..
.##.
....
....
.##.
..##
....
....
....
##..
.##.
....
....
.##.
..##
.#..
##..
#...
....
..#.
.##.
.#..
....
...#
..##
..#.
....
....
.#..
##..
#...
....
..#.
.##.
.#..
....
...#
..##
..#.

127
fillit_roduquen/fillit.c Executable file
View File

@@ -0,0 +1,127 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* fillit.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:23 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:28:16 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
int full_tetri(char tetri[], char buffer[], char bufftest[], int fd)
{
int i;
if (fd == 26)
return (FILE_ERROR);
i = ft_strstr(buffer, bufftest);
if (i == 0 || i == 21 || i == 42 || i == 63)
tetri[fd] = -1;
if (i == 84 || i == 105 || i == 126 || i == 147)
tetri[fd] = 1;
if (i == 168 || i == 189 || i == 210 || i == 231 || i == 252 || i == 273)
tetri[fd] = -8;
if (i == 294 || i == 315 || i == 336 || i == 357 || i == 378 || i == 399)
tetri[fd] = 7;
if (i == 420 || i == 441 || i == 462 || i == 483 || i == 504 || i == 525)
tetri[fd] = -7;
if (i == 546 || i == 567 || i == 588 || i == 609 || i == 630 || i == 651)
tetri[fd] = 8;
if (i == 672 || i == 693 || i == 714 || i == 735 || i == 756 || i == 777)
tetri[fd] = -6;
if (i == 798 || i == 819 || i == 840 || i == 861 || i == 882 || i == 903)
tetri[fd] = 6;
if (i == 924 || i == 945 || i == 966 || i == 987 || i == 1008 || i == 1029)
tetri[fd] = -9;
return (full_tetri2(i, tetri, fd));
}
int full_tetri2(int i, char tetri[], int fd)
{
if (i == 1050 || i == 1071 || i == 1092 || i == 1113 || i == 1134
|| i == 1155)
tetri[fd] = 9;
if (i == 1176 || i == 1197 || i == 1218 || i == 1239 || i == 1260
|| i == 1281 || i == 1302 || i == 1323 || i == 1344)
tetri[fd] = 0;
if (i == 1365 || i == 1386 || i == 1407 || i == 1428 || i == 1449
|| i == 1470)
tetri[fd] = -5;
if (i == 1491 || i == 1512 || i == 1533 || i == 1554 || i == 1575
|| i == 1596)
tetri[fd] = 5;
if (i == 1617 || i == 1638 || i == 1659 || i == 1680 || i == 1701
|| i == 1722)
tetri[fd] = 3;
if (i == 1743 || i == 1764 || i == 1785 || i == 1806 || i == 1827
|| i == 1848)
tetri[fd] = -3;
if (i == 1869 || i == 1890 || i == 1911 || i == 1932 || i == 1953
|| i == 1974)
tetri[fd] = 2;
if (i == 1995 || i == 2016 || i == 2037 || i == 2058 || i == 2079
|| i == 2100)
tetri[fd] = -2;
return (full_tetri3(i, tetri, fd));
}
int full_tetri3(int i, char tetri[], int fd)
{
if (i == 2121 || i == 2142 || i == 2163 || i == 2184 || i == 2205
|| i == 2226)
tetri[fd] = -4;
if (i == 2247 || i == 2268 || i == 2289 || i == 2310 || i == 2331
|| i == 2352)
tetri[fd] = 4;
if (tetri[fd] == 42)
return (FILE_ERROR);
return (SUCCESS);
}
int fillit(char tetri[], t_type *square)
{
int i;
int j;
i = 0;
j = 0;
while (j >= 0)
{
if (check_square(square, tetri[j], i) == SUCCESS)
{
if (fillit2(square, tetri, &j, &i) == SUCCESS)
return (SUCCESS);
}
else if (square->str[i])
i++;
else
{
j--;
if (j >= 0)
i = remove_square(square, j + 'A', tetri[j]);
}
}
return (ERROR);
}
int fillit2(t_type *square, char tetri[], int *j, int *i)
{
full_square(square, tetri[*j], *j + 'A', *i);
if (tetri[*j + 1] != 42 && check_hole(square, tetri, *j + 1) != SUCCESS)
*i = remove_square(square, *j + 'A', tetri[*j]);
else
{
*i = i_fillit_the_power(square, tetri, *j + 1);
*j += 1;
}
if (tetri[*j] == 42)
{
print_tab(square);
return (SUCCESS);
}
return (CONTINUE);
}

91
fillit_roduquen/fillit.h Executable file
View File

@@ -0,0 +1,91 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* fillit.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:28:32 by roduquen #+# #+# */
/* Updated: 2019/04/01 19:01:09 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef FILLIT_H
# define FILLIT_H
/*
** MACROS
*/
# define SUCCESS 0
# define ERROR -1
# define READ_ERROR -2
# define OPEN_ERROR -3
# define FILE_ERROR -4
# define CONTINUE 1
# define BUFF_SIZE 2372
/*
** TYPEDEF && STRUCTURES
*/
typedef struct s_type
{
int size;
int hole;
char *str;
char isl[170];
} t_type;
/*
** PROTOTYPES
*/
int fillit(char tetri[], t_type *square);
int fillit2(t_type *square, char tetri[], int *j, int *i);
void full_square(t_type *square, char tetri, char nbr, int pos);
void full_square2(t_type *square, char tetri, char nbr, int pos);
void full_square3(t_type *square, char tetri, char nbr, int pos);
void full_square4(t_type *square, char tetri, char nbr, int pos);
void full_square5(t_type *square, char tetri, char nbr, int pos);
void full_square6(t_type *square, char tetri, char nbr, int pos);
int check_square(t_type *square, char tetri, int pos);
int check_square2(t_type *square, char tetri, int pos);
int check_square3(t_type *square, char tetri, int pos);
int check_square4(t_type *square, char tetri, int pos);
int check_square5(t_type *square, char tetri, int pos);
int check_square6(t_type *square, char tetri, int pos);
int check_square7(t_type *square, char tetri, int pos);
int remove_square(t_type *square, char nbr, char type);
int i_fillit_the_power(t_type *square, char tetri[], int pos);
int i_got_a_fillit(int check_fd);
int check_file(char bufftest[], char tetri[], char buffer[],
int fd);
int free_error(void *ptr);
int do_i_fillit(char tetri[], int nbr);
int do_i_fillit2(char tetri[], t_type *square);
void print_tab(t_type *square);
int full_tetri(char tetri[], char buffer[], char bufftest[],
int fd);
int full_tetri2(int i, char tetri[], int fd);
int full_tetri3(int i, char tetri[], int fd);
int ft_strstr(char haystack[], char needle[]);
int chose_type(char type, int ret);
int check_hole(t_type *square, char tetri[], int to_test);
void full_square_hole(t_type *square, int nbr);
int ft_check_square(int i, t_type *square, char nbr);
int ft_check_square2(int i, t_type *square, char nbr);
int ft_check_square3(int i, t_type *square, char nbr);
int ft_check_square4(int i, t_type *square, char nbr);
int ft_check_square5(int i, t_type *square, char nbr);
int ft_check_square6(int i, t_type *square, char nbr);
int count_island(t_type *square, int i, char tetri[],
int to_test);
void full_count_island_square(t_type *square, char nbr);
int count_hole(t_type *square, char nbr, char tetri[],
int to_test);
void ft_memset(void *ptr, char c, int len);
int check_new_possibility(t_type *square, char nbr,
char tetri[], int to_test);
#endif

148
fillit_roduquen/full_square.c Executable file
View File

@@ -0,0 +1,148 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* full_square.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:25 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:29:03 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
void full_square(t_type *square, char tetri, char nbr, int pos)
{
if (tetri == -9)
{
square->str[pos] = nbr;
square->str[pos + 1] = nbr;
square->str[pos + square->size + 1] = nbr;
square->str[pos + 2 * square->size + 1] = nbr;
}
else if (tetri == -8)
{
square->str[pos + 1] = nbr;
square->str[pos + 1 + square->size] = nbr;
square->str[pos + 2 * square->size] = nbr;
square->str[pos + 2 * square->size + 1] = nbr;
}
else if (tetri == -7)
{
square->str[pos] = nbr;
square->str[pos + 1] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + 2 * square->size] = nbr;
}
else
full_square2(square, tetri, nbr, pos);
}
void full_square2(t_type *square, char tetri, char nbr, int pos)
{
if (tetri == -6)
{
square->str[pos] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + 2 * square->size] = nbr;
square->str[pos + 2 * square->size + 1] = nbr;
}
else if (tetri == -5)
{
square->str[pos + 1] = nbr;
square->str[pos + 2] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + square->size + 1] = nbr;
}
else if (tetri == -4)
{
square->str[pos] = nbr;
square->str[pos + 1] = nbr;
square->str[pos + square->size + 1] = nbr;
square->str[pos + square->size + 2] = nbr;
}
else
full_square3(square, tetri, nbr, pos);
}
void full_square3(t_type *square, char tetri, char nbr, int pos)
{
if (tetri == -3)
{
square->str[pos] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + square->size + 1] = nbr;
square->str[pos + 2 * square->size] = nbr;
}
else if (tetri == -2)
{
square->str[pos + 1] = nbr;
square->str[pos + 1 + square->size] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + 2 * square->size + 1] = nbr;
}
else if (tetri == -1)
{
square->str[pos] = nbr;
square->str[pos + 1] = nbr;
square->str[pos + 2] = nbr;
square->str[pos + 3] = nbr;
}
else
full_square4(square, tetri, nbr, pos);
}
void full_square4(t_type *square, char tetri, char nbr, int pos)
{
if (tetri == 0)
{
square->str[pos] = nbr;
square->str[pos + 1] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + square->size + 1] = nbr;
}
else if (tetri == 1)
{
square->str[pos] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + square->size * 2] = nbr;
square->str[pos + 3 * square->size] = nbr;
}
else if (tetri == 2)
{
square->str[pos + 1] = nbr;
square->str[pos + 1 + square->size] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + square->size + 2] = nbr;
}
else
full_square5(square, tetri, nbr, pos);
}
void full_square5(t_type *square, char tetri, char nbr, int pos)
{
if (tetri == 3)
{
square->str[pos] = nbr;
square->str[pos + 1] = nbr;
square->str[pos + 2] = nbr;
square->str[pos + square->size + 1] = nbr;
}
else if (tetri == 4)
{
square->str[pos + 1] = nbr;
square->str[pos + 1 + square->size] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + 2 * square->size] = nbr;
}
else if (tetri == 5)
{
square->str[pos] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + square->size + 1] = nbr;
square->str[pos + 2 * square->size + 1] = nbr;
}
else
full_square6(square, tetri, nbr, pos);
}

38
fillit_roduquen/full_square2.c Executable file
View File

@@ -0,0 +1,38 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* full_square2.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:29 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:12:30 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
void full_square6(t_type *square, char tetri, char nbr, int pos)
{
if (tetri == 6)
{
square->str[pos + 1] = nbr;
square->str[pos + 2] = nbr;
square->str[pos] = nbr;
square->str[pos + square->size] = nbr;
}
else if (tetri == 7)
{
square->str[pos] = nbr;
square->str[pos + 1] = nbr;
square->str[pos + 2] = nbr;
square->str[pos + square->size + 2] = nbr;
}
else if (tetri == 8 || tetri == 9)
{
square->str[(tetri == 8 ? pos : pos + 2)] = nbr;
square->str[pos + square->size] = nbr;
square->str[pos + 1 + square->size] = nbr;
square->str[pos + square->size + 2] = nbr;
}
}

53
fillit_roduquen/init.c Executable file
View File

@@ -0,0 +1,53 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* init.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:31 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:12:32 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
#include <fcntl.h>
#include <unistd.h>
int i_got_a_fillit(int check_fd)
{
int fd;
char buffer[BUFF_SIZE];
char bufftest[21];
char tetri[27];
int ret;
ft_memset(bufftest, 42, 21);
ft_memset(tetri, 42, 27);
bufftest[20] = 0;
if ((fd = open("external_file.txt", O_RDONLY)) < 0)
return (OPEN_ERROR);
if (read(fd, buffer, BUFF_SIZE) <= 0)
return (READ_ERROR);
fd = 0;
while ((ret = read(check_fd, bufftest, 20)) > 0)
{
if (ret != 20 || check_file(bufftest, tetri, buffer, fd) != SUCCESS)
return (FILE_ERROR);
if (read(check_fd, bufftest, 1) > 0 && bufftest[0] != '\n')
return (FILE_ERROR);
tetri[++fd] = 42;
}
if (ret < 0 || fd == 0 || bufftest[0] == '\n')
return (FILE_ERROR);
return (do_i_fillit(tetri, fd));
}
int check_file(char bufftest[], char tetri[], char buffer[], int fd)
{
if (bufftest[0] != '.' && bufftest[0] != '#')
return (FILE_ERROR);
if (full_tetri(tetri, buffer, bufftest, fd) != SUCCESS)
return (FILE_ERROR);
return (SUCCESS);
}

42
fillit_roduquen/main.c Executable file
View File

@@ -0,0 +1,42 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* main.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:34 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:12:35 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
#include <unistd.h>
#include <fcntl.h>
int main(int ac, char **av)
{
int fd;
if (ac != 2 || (fd = open(av[1], O_DIRECTORY | O_RDONLY)) >= 0)
{
write(2, "fillit: usage : fillit [PATH/FILE]\n", 35);
return (-1);
}
if ((fd = open(av[1], O_RDONLY)) == -1)
{
write(2, "fillit: usage : fillit [PATH/FILE]\n", 35);
return (-1);
}
else
{
if ((fd = i_got_a_fillit(fd)) < 0)
{
if (fd == FILE_ERROR || fd == ERROR)
write(1, "error\n", 6);
if (fd == OPEN_ERROR || fd == READ_ERROR)
write(2, "Something went wrong, please try again\n", 39);
}
}
return (fd);
}

46
fillit_roduquen/remove_square.c Executable file
View File

@@ -0,0 +1,46 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* remove_square.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/01 17:12:36 by roduquen #+# #+# */
/* Updated: 2019/04/01 17:12:38 by roduquen ### ########.fr */
/* */
/* ************************************************************************** */
#include "fillit.h"
int remove_square(t_type *square, char nbr, char type)
{
int i;
int ret;
i = 0;
ret = -1;
while (square->str[i])
{
if (square->str[i] == nbr)
{
if (ret == -1)
ret = i;
square->str[i] = '.';
}
i++;
}
return (chose_type(type, ret));
}
int chose_type(char type, int ret)
{
if (type == -9 || type == -7 || type == -6 || type == -4
|| type == -3 || type == -1 || type == 0 || type == 1
|| type == 3 || type == 5 || type == 6 || type == 7
|| type == 8)
return (ret + 1);
else if (type == 9)
return (ret - 1);
else
return (ret);
}

View File

@@ -1,35 +1,42 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* get_smallest_square.c :+: :+: :+: */ /* utilitys.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: roduquen <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/12 22:29:45 by vmanzoni #+# #+# */ /* Created: 2019/04/01 17:12:39 by roduquen #+# #+# */
/* Updated: 2019/04/27 15:04:46 by vmanzoni ### ########.fr */ /* Updated: 2019/04/01 17:12:50 by roduquen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "fillit.h" #include "fillit.h"
/* int ft_strstr(char haystack[], char needle[])
** Function to bruteforce with backtracking for smallest square
*/
int *get_smallest_square(t_fillist list, int size, unsigned int map[])
{ {
unsigned int mask; int i;
int i; int j;
int j;
i = 0; i = 0;
mask = map[size]; while (i < BUFF_SIZE)
while (list.tetribit != NULL)
{ {
mask = (mask >> 1) | (((1 << (i % 32)) & map[j]) << (31 - (i % 32))); j = 0;
if (!(tetri & mask)) while (i + j < BUFF_SIZE && needle[j] && needle[j] == haystack[i + j])
return (1); j++;
if (!needle[j])
return (i);
i++; i++;
} }
return (0); return (ERROR);
}
void ft_memset(void *ptr, char c, int len)
{
int i;
unsigned char *str;
i = 0;
str = (unsigned char*)ptr;
while (i < len)
str[i++] = c;
} }

1
libft
View File

@@ -1 +0,0 @@
../03_libft

46
libft/Makefile Normal file
View File

@@ -0,0 +1,46 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Makefile :+: :+: :+: #
# +:+ +:+ +:+ #
# By: hulamy <marvin@42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2019/06/03 21:52:28 by hulamy #+# #+# #
# Updated: 2019/06/03 21:52:33 by hulamy ### ########.fr #
# #
# **************************************************************************** #
NAME = libft.a
CFLAGS = -Wall -Wextra -Werror -I.
SRCS = ft_isdigit.c ft_memccpy.c ft_putnbr.c ft_strcpy.c ft_strmapi.c ft_strsub.c \
ft_any.c ft_isprint.c ft_memchr.c ft_putnbr_fd.c ft_strdel.c ft_strmultisplit.c ft_strtrim.c \
ft_arraymap.c ft_issort.c ft_memcmp.c ft_putnbrbase.c ft_strdup.c ft_strncat.c ft_tolower.c \
ft_atoi.c ft_itoa.c ft_memcpy.c ft_putnbrendl.c ft_strequ.c ft_strncmp.c ft_toupper.c \
ft_atoibase.c ft_lstadd.c ft_memdel.c ft_putnbrendl_fd.c ft_striter.c ft_strncpy.c \
ft_bzero.c ft_lstdel.c ft_memmove.c ft_putstr.c ft_striteri.c ft_strnequ.c \
ft_convertbase.c ft_lstdelone.c ft_memset.c ft_putstr_fd.c ft_strjoin.c ft_strnew.c \
ft_foreach.c ft_lstiter.c ft_putchar.c ft_strcat.c ft_strjoinfree.c ft_strnstr.c \
ft_isalnum.c ft_lstmap.c ft_putchar_fd.c ft_strchr.c ft_strlcat.c ft_strrchr.c \
ft_isalpha.c ft_lstnew.c ft_putendl.c ft_strclr.c ft_strlen.c ft_strsplit.c \
ft_isascii.c ft_memalloc.c ft_putendl_fd.c ft_strcmp.c ft_strmap.c ft_strstr.c
OBJS = $(SRCS:.c=.o)
all: $(NAME)
$(NAME): $(SRCS)
@gcc $(CFLAGS) -c $(SRCS)
@ar -rc $(NAME) $(OBJS)
@ranlib $(NAME)
clean:
@/bin/rm -f $(OBJS)
fclean: clean
@/bin/rm -f $(NAME)
re: fclean all

26
libft/ft_any.c Normal file
View File

@@ -0,0 +1,26 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_any.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/16 15:14:49 by hulamy #+# #+# */
/* Updated: 2018/11/16 15:14:53 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_any(char **tab, int (*f)(char*))
{
int i;
i = -1;
if (!tab)
return (0);
while (tab[++i])
if (f(tab[i]) == 1)
return (1);
return (0);
}

28
libft/ft_arraymap.c Normal file
View File

@@ -0,0 +1,28 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_arraymap.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/16 15:17:24 by hulamy #+# #+# */
/* Updated: 2018/11/16 15:17:27 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int *ft_arraymap(int *tab, int length, int (*f)(int))
{
int i;
int *newtab;
i = -1;
if (!tab)
return (NULL);
if (!(newtab = (int*)malloc(sizeof(*newtab) * (length + 1))))
return (NULL);
while (++i < length)
newtab[i] = (*f)(tab[i]);
return (newtab);
}

39
libft/ft_atoi.c Normal file
View File

@@ -0,0 +1,39 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_atoi.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:09:04 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:38:12 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_atoi(const char *str)
{
long long nbr;
int i;
int n;
i = 0;
n = 1;
nbr = 0;
while ((str[i] == 32) || (str[i] > 8 && str[i] < 14))
i++;
if (str[i] == '-')
n = -1;
if (str[i] == '+' || str[i] == '-')
i++;
while (str[i] >= '0' && str[i] <= '9')
{
if ((nbr >= 922337203685477580
&& ((str[i] > 8 && n < 0) || (str[i] > 7 && n > 0))))
return ((n > 0) ? -1 : 0);
else
nbr = nbr * 10 + (str[i++] - '0');
}
return (nbr * n);
}

75
libft/ft_atoibase.c Normal file
View File

@@ -0,0 +1,75 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_atoibase.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/16 15:15:31 by hulamy #+# #+# */
/* Updated: 2018/11/16 15:22:34 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
static int is_valid_base(char *base, int i, int j)
{
while (base[i])
{
j = i + 1;
while (base[j])
{
if (base[i] == base[j])
return (0);
j++;
}
if (base[i] == '-' || base[i] == '+')
return (0);
i++;
}
if (i >= 2)
return (1);
return (0);
}
static int skip(int i, char *str, int *n)
{
while ((str[i] == 32) || (str[i] > 8 && str[i] < 14))
i++;
if (str[i] == '+' || str[i] == '-')
{
if (str[i] == '-')
*n = -1;
i++;
}
return (i);
}
int ft_atoibase(char *str, char *base)
{
int i;
int j;
int length;
int res;
int n;
length = 0;
res = 0;
n = 1;
if (!is_valid_base(base, 0, 0))
return (0);
while (base[length])
length++;
i = skip(0, str, &n);
while (str[i] && str[i] > 32 && str[i] != '-' && str[i] != '+')
{
j = 0;
while (str[i] != base[j] && base[j])
j++;
if (base[j] == '\0')
return (0);
res = (res * length) + j;
i++;
}
return (res * n);
}

27
libft/ft_bzero.c Normal file
View File

@@ -0,0 +1,27 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_bzero.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:09:19 by hulamy #+# #+# */
/* Updated: 2018/11/15 21:43:05 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_bzero(void *s, size_t n)
{
size_t i;
unsigned char *ptr;
if (n)
{
ptr = (unsigned char *)s;
i = 0;
while (i < n)
ptr[i++] = '\0';
}
}

86
libft/ft_convertbase.c Normal file
View File

@@ -0,0 +1,86 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_convertbase.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/16 15:15:55 by hulamy #+# #+# */
/* Updated: 2019/04/17 17:09:35 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
static int ft_malloc_size(int decimal, int length, int i)
{
if (decimal <= 0)
i++;
while (decimal)
{
decimal /= length;
i++;
}
return (i);
}
static char *ft_decimal_to_base(int decimal, char *base, char *res, int size)
{
long nb;
int i;
nb = decimal;
i = 0;
while (base[i])
i++;
if (nb < 0)
nb = -nb;
while (--size >= 0)
{
res[size] = base[nb % i];
nb /= i;
}
return (res);
}
static int ft_base_to_decimal(char *nbr, char *base, int length, int i)
{
long decimal;
int j;
decimal = 0;
if (nbr[i] == '-')
i++;
while (nbr[i])
{
j = 0;
while (nbr[i] != base[j] && base[j])
j++;
decimal = (decimal * length) + j;
i++;
}
if (nbr[0] == '-')
decimal = -decimal;
return (decimal);
}
char *ft_convertbase(char *nbr, char *base_from, char *base_to)
{
int length;
int size;
int decimal;
char *res;
res = 0;
length = 0;
while (base_from[length])
length++;
decimal = ft_base_to_decimal(nbr, base_from, length, 0);
length = 0;
while (base_to[length])
length++;
size = ft_malloc_size(decimal, length, 0);
res = (char *)malloc(sizeof(char) * (size + 1));
res[size] = '\0';
return (ft_decimal_to_base(decimal, base_to, res, size));
}

22
libft/ft_foreach.c Normal file
View File

@@ -0,0 +1,22 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_foreach.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/16 15:16:10 by hulamy #+# #+# */
/* Updated: 2018/11/16 15:16:11 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_foreach(int *tab, int length, void (*f)(int))
{
int i;
i = 0;
while (i < length && tab && tab[i])
(*f)(tab[i++]);
}

18
libft/ft_isalnum.c Normal file
View File

@@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_isalnum.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:09:33 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:09:37 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_isalnum(int c)
{
return (ft_isalpha(c) || ft_isdigit(c));
}

18
libft/ft_isalpha.c Normal file
View File

@@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_isalpha.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:09:44 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:09:46 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_isalpha(int c)
{
return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'));
}

18
libft/ft_isascii.c Normal file
View File

@@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_isascii.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:09:53 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:09:55 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_isascii(int c)
{
return (c >= 0 && c <= 127);
}

18
libft/ft_isdigit.c Normal file
View File

@@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_isdigit.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:10:01 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:10:05 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_isdigit(int c)
{
return (c >= '0' && c <= '9');
}

18
libft/ft_isprint.c Normal file
View File

@@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_isprint.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:10:19 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:10:20 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_isprint(int c)
{
return (c >= 32 && c < 127);
}

26
libft/ft_issort.c Normal file
View File

@@ -0,0 +1,26 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_issort.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/16 15:18:14 by hulamy #+# #+# */
/* Updated: 2018/11/16 15:18:15 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
int ft_issort(int *tab, int length, int (*f)(int, int))
{
int i;
i = -1;
if (!tab)
return (0);
while (++i < length - 1)
if (f(tab[i], tab[i + 1]) > 0)
return (0);
return (1);
}

35
libft/ft_itoa.c Normal file
View File

@@ -0,0 +1,35 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_itoa.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:10:25 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:36:38 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
char *ft_itoa(int n)
{
char *str;
int len;
long int nbis;
len = (n < 0) ? 2 : 1;
nbis = n;
while (nbis /= 10)
len++;
nbis = n;
nbis *= (nbis < 0) ? -1 : 1;
if (!(str = ft_strnew(len)))
return (NULL);
str[--len] = nbis % 10 + '0';
while (nbis /= 10)
str[--len] = nbis % 10 + '0';
if (n < 0)
str[0] = '-';
return (str);
}

19
libft/ft_lstadd.c Normal file
View File

@@ -0,0 +1,19 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lstadd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:10:33 by hulamy #+# #+# */
/* Updated: 2018/11/16 13:58:54 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_lstadd(t_list **alst, t_list *new)
{
new->next = *alst;
*alst = new;
}

20
libft/ft_lstdel.c Normal file
View File

@@ -0,0 +1,20 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lstdel.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:10:49 by hulamy #+# #+# */
/* Updated: 2018/11/16 13:59:10 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_lstdel(t_list **alst, void (*del)(void *, size_t))
{
if ((*alst)->next)
ft_lstdel(&(*alst)->next, del);
ft_lstdelone(alst, del);
}

20
libft/ft_lstdelone.c Normal file
View File

@@ -0,0 +1,20 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lstdelone.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:10:59 by hulamy #+# #+# */
/* Updated: 2018/11/16 13:59:22 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_lstdelone(t_list **alst, void (*del)(void *, size_t))
{
del((*alst)->content, (*alst)->content_size);
free(*alst);
*alst = NULL;
}

22
libft/ft_lstiter.c Normal file
View File

@@ -0,0 +1,22 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lstiter.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:11:14 by hulamy #+# #+# */
/* Updated: 2018/11/16 14:01:10 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_lstiter(t_list *lst, void (*f)(t_list *elem))
{
if (!lst)
return ;
if (lst->next)
ft_lstiter(lst->next, f);
f(lst);
}

35
libft/ft_lstmap.c Normal file
View File

@@ -0,0 +1,35 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lstmap.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:11:20 by hulamy #+# #+# */
/* Updated: 2018/11/16 14:01:23 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
t_list *ft_lstmap(t_list *lst, t_list *(*f)(t_list *elem))
{
t_list *new;
t_list *tmp;
if (!lst)
return (NULL);
tmp = f(lst);
new = tmp;
while (lst->next)
{
lst = lst->next;
if (!(tmp->next = f(lst)))
{
free(tmp->next);
return (NULL);
}
tmp = tmp->next;
}
return (new);
}

35
libft/ft_lstnew.c Normal file
View File

@@ -0,0 +1,35 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_lstnew.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:11:42 by hulamy #+# #+# */
/* Updated: 2018/11/16 14:01:36 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
t_list *ft_lstnew(void const *content, size_t content_size)
{
t_list *lst;
if (!(lst = (t_list *)malloc(sizeof(*lst))))
return (NULL);
if (!content)
{
lst->content = NULL;
lst->content_size = 0;
}
else
{
if (!(lst->content = malloc(content_size)))
return (NULL);
ft_memcpy(lst->content, content, content_size);
lst->content_size = content_size;
}
lst->next = NULL;
return (lst);
}

27
libft/ft_memalloc.c Normal file
View File

@@ -0,0 +1,27 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_memalloc.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:11:58 by hulamy #+# #+# */
/* Updated: 2019/04/03 15:42:06 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** allocate size byte of memory and return a pointer to the allocated memory
*/
#include "libft.h"
void *ft_memalloc(size_t size)
{
void *tmp;
if (!(tmp = malloc(size)))
return (NULL);
ft_bzero(tmp, size);
return (tmp);
}

36
libft/ft_memccpy.c Normal file
View File

@@ -0,0 +1,36 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_memccpy.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:12:10 by hulamy #+# #+# */
/* Updated: 2019/04/03 15:42:41 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** copy string until character is found and place cursor in dst
** after last byte copied
*/
#include "libft.h"
void *ft_memccpy(void *dst, const void *src, int c, size_t n)
{
unsigned char *dest;
unsigned char *sourc;
size_t i;
i = -1;
dest = (unsigned char *)dst;
sourc = (unsigned char *)src;
while (++i < n)
{
dest[i] = sourc[i];
if (sourc[i] == (unsigned char)c)
return (dst + i + 1);
}
return (NULL);
}

30
libft/ft_memchr.c Normal file
View File

@@ -0,0 +1,30 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_memchr.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:12:32 by hulamy #+# #+# */
/* Updated: 2019/04/03 15:43:14 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** locate character in string and return its position
*/
#include "libft.h"
void *ft_memchr(const void *s, int c, size_t n)
{
unsigned char *sbis;
size_t i;
sbis = (unsigned char *)s;
i = -1;
while (++i < n)
if (sbis[i] == (unsigned char)c)
return ((void *)sbis + i);
return (NULL);
}

32
libft/ft_memcmp.c Normal file
View File

@@ -0,0 +1,32 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_memcmp.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:13:04 by hulamy #+# #+# */
/* Updated: 2019/04/03 15:43:41 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** compare two bytes strings (doesnt recognize a null terminated string)
** and return value of difference between first two different character
*/
#include "libft.h"
int ft_memcmp(const void *s1, const void *s2, size_t n)
{
unsigned char *frst;
unsigned char *scnd;
size_t i;
i = 0;
frst = (unsigned char *)s1;
scnd = (unsigned char *)s2;
while (i < n && frst[i] == scnd[i])
i++;
return ((i == n) ? 0 : frst[i] - scnd[i]);
}

31
libft/ft_memcpy.c Normal file
View File

@@ -0,0 +1,31 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_memcpy.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:13:17 by hulamy #+# #+# */
/* Updated: 2019/04/03 15:43:56 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** copy n characters from src to dst and return dst
*/
#include "libft.h"
void *ft_memcpy(void *dst, const void *src, size_t n)
{
size_t i;
char *ptr;
char *ptr2;
ptr = (char *)dst;
ptr2 = (char *)src;
i = -1;
while (++i < n)
ptr[i] = ptr2[i];
return (dst);
}

26
libft/ft_memdel.c Normal file
View File

@@ -0,0 +1,26 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_memdel.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:13:26 by hulamy #+# #+# */
/* Updated: 2019/04/03 15:44:12 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** free memory
*/
#include "libft.h"
void ft_memdel(void **ap)
{
if (ap && *ap)
{
free(*ap);
*ap = 0;
}
}

35
libft/ft_memmove.c Normal file
View File

@@ -0,0 +1,35 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_memmove.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:13:34 by hulamy #+# #+# */
/* Updated: 2019/04/03 15:44:28 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** copy n characters from src to dst in a non destructive way and return dst
*/
#include "libft.h"
void *ft_memmove(void *dst, const void *src, size_t len)
{
int i;
char *source;
char *dest;
i = -1;
source = (char *)src;
dest = (char *)dst;
if (source < dest)
while ((int)(--len) >= 0)
dest[len] = source[len];
else
while (++i < (int)len)
dest[i] = source[i];
return (dst);
}

29
libft/ft_memset.c Normal file
View File

@@ -0,0 +1,29 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_memset.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:13:41 by hulamy #+# #+# */
/* Updated: 2019/04/03 15:44:44 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** copy n time a character in a string and return the string
*/
#include "libft.h"
void *ft_memset(void *b, int c, size_t len)
{
char *ptr;
size_t i;
ptr = (char *)b;
i = 0;
while (i < len)
ptr[i++] = c;
return (b);
}

View File

@@ -1,20 +1,18 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* print_fillit.c :+: :+: :+: */ /* ft_putchar.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:35:48 by vmanzoni #+# #+# */ /* Created: 2018/11/14 21:14:00 by hulamy #+# #+# */
/* Updated: 2019/04/16 16:41:46 by vmanzoni ### ########.fr */ /* Updated: 2018/11/14 21:14:01 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "fillit.h" #include "libft.h"
/* void ft_putchar(char c)
void ft_print_fillit()
{ {
write(1, &c, 1);
} }
*/

18
libft/ft_putchar_fd.c Normal file
View File

@@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putchar_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:14:14 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:14:15 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putchar_fd(char c, int fd)
{
write(fd, &c, 1);
}

19
libft/ft_putendl.c Normal file
View File

@@ -0,0 +1,19 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putendl.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:14:32 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:14:33 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putendl(char const *s)
{
ft_putstr(s);
ft_putchar('\n');
}

19
libft/ft_putendl_fd.c Normal file
View File

@@ -0,0 +1,19 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putendl_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:14:47 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:14:48 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putendl_fd(char const *s, int fd)
{
ft_putstr_fd(s, fd);
ft_putchar_fd('\n', fd);
}

18
libft/ft_putnbr.c Normal file
View File

@@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putnbr.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:14:57 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:14:58 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putnbr(int n)
{
ft_putnbr_fd(n, 1);
}

28
libft/ft_putnbr_fd.c Normal file
View File

@@ -0,0 +1,28 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putnbr_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:15:09 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:15:10 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putnbr_fd(int n, int fd)
{
long l;
l = n;
if (l < 0)
{
ft_putchar_fd('-', fd);
l *= -1;
}
if (l >= 10)
ft_putnbr_fd(l / 10, fd);
ft_putchar_fd((l % 10) + '0', fd);
}

59
libft/ft_putnbrbase.c Normal file
View File

@@ -0,0 +1,59 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putnbrbase.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/16 15:17:00 by hulamy #+# #+# */
/* Updated: 2018/11/16 15:23:43 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
static int check(char *base)
{
int i;
int j;
i = 0;
while (base[i])
{
j = i + 1;
while (base[j])
{
if (base[i] == base[j])
return (0);
j++;
}
if (base[i] == '-' || base[i] == '+')
return (0);
i++;
}
if (i >= 2)
return (1);
return (0);
}
void ft_putnbrbase(int nbr, char *base)
{
int i;
long n;
i = 0;
n = nbr;
if (check(base))
{
if (n < 0)
{
ft_putchar('-');
n = -n;
}
while (base[i])
i++;
if (n >= i)
ft_putnbrbase(n / i, base);
ft_putchar(base[n % i]);
}
}

18
libft/ft_putnbrendl.c Normal file
View File

@@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putnbrendl.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/19 10:38:07 by hulamy #+# #+# */
/* Updated: 2019/02/19 10:42:46 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putnbrendl(int n)
{
ft_putnbrendl_fd(n, 1);
}

29
libft/ft_putnbrendl_fd.c Normal file
View File

@@ -0,0 +1,29 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putnbrendl_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/19 10:37:58 by hulamy #+# #+# */
/* Updated: 2019/02/19 10:42:48 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putnbrendl_fd(int n, int fd)
{
long l;
l = n;
if (l < 0)
{
ft_putchar_fd('-', fd);
l *= -1;
}
if (l >= 10)
ft_putnbr_fd(l / 10, fd);
ft_putchar_fd((l % 10) + '0', fd);
ft_putchar_fd('\n', fd);
}

22
libft/ft_putstr.c Normal file
View File

@@ -0,0 +1,22 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putstr.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:15:19 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:15:19 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putstr(char const *s)
{
int i;
i = 0;
while (s && s[i])
ft_putchar(s[i++]);
}

19
libft/ft_putstr_fd.c Normal file
View File

@@ -0,0 +1,19 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_putstr_fd.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:15:31 by hulamy #+# #+# */
/* Updated: 2018/11/14 21:15:32 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "libft.h"
void ft_putstr_fd(char const *s, int fd)
{
while (s && *s)
ft_putchar_fd(*s++, fd);
}

32
libft/ft_strcat.c Normal file
View File

@@ -0,0 +1,32 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_strcat.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:15:40 by hulamy #+# #+# */
/* Updated: 2019/03/25 15:12:58 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** append src to dest (dest must have sufficient space) and return dest
*/
#include "libft.h"
char *ft_strcat(char *dest, const char *src)
{
int i;
int j;
i = 0;
j = 0;
while (dest[i])
i++;
while (src[j])
dest[i++] = src[j++];
dest[i] = '\0';
return (dest);
}

33
libft/ft_strchr.c Normal file
View File

@@ -0,0 +1,33 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_strchr.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:15:48 by hulamy #+# #+# */
/* Updated: 2019/04/16 17:28:46 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** locate the first occurence of character c in string s
** and return pointer to its location
*/
#include "libft.h"
char *ft_strchr(const char *s, int c)
{
int i;
int j;
i = 0;
j = -1;
while (s[i])
i++;
while (++j < i + 1)
if (s[j] == c)
return ((char *)s + j);
return (NULL);
}

23
libft/ft_strclr.c Normal file
View File

@@ -0,0 +1,23 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_strclr.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:15:58 by hulamy #+# #+# */
/* Updated: 2019/03/25 15:17:42 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** fill string with zeros
*/
#include "libft.h"
void ft_strclr(char *s)
{
if (s)
ft_bzero(s, ft_strlen(s));
}

28
libft/ft_strcmp.c Normal file
View File

@@ -0,0 +1,28 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_strcmp.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2018/11/14 21:16:08 by hulamy #+# #+# */
/* Updated: 2019/03/25 15:18:30 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
/*
** compare two null terminated strings and return value
** of difference between first two different character
*/
#include "libft.h"
int ft_strcmp(const char *s1, const char *s2)
{
int i;
i = 0;
while (s1[i] && s1[i] == s2[i])
i++;
return ((unsigned char)s1[i] - (unsigned char)s2[i]);
}

Some files were not shown because too many files have changed in this diff Show More