42/42_old_fillit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

affiche correctement la map avec les lettres mais la map est fausse donc erreur dans backtracking

Browse Source
This commit is contained in:
Hugo LAMY
2019-05-03 16:11:15 +02:00
parent 37b565f3da 671585098f
commit 60b970e901
8 changed files with 226 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -6,7 +6,7 @@
# 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/04/30 14:20:52 by hulamy ### ########.fr # # Updated: 2019/05/03 13:50:34 by hulamy ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #

8
fillit.h
View File

@@ -6,7 +6,7 @@
/* 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/01 14:22:58 by hulamy ### ########.fr */ /* Updated: 2019/05/03 16:10:34 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -31,6 +31,7 @@ typedef struct s_fillist
int width; int width;
int height; int height;
int position; int position;
char letter;
struct s_fillist *next; struct s_fillist *next;
} t_fillist; } t_fillist;
@@ -44,11 +45,12 @@ void parse_input(char *input);
int check_file_errors(char *file); int check_file_errors(char *file);
int check_tetri_errors(char *tetri); int check_tetri_errors(char *tetri);
int check_tetri_errors_proxy(char *tetri); int check_tetri_errors_proxy(char *tetri);
int add_to_list(char *square, t_fillist **list); int add_to_list(char *square, t_fillist **list, char letter);
void fill_list(char line[], t_fillist *list); void fill_list(char line[], t_fillist *list);
void print_bits(unsigned int bits, int size); //TO DELETE BEFORE EVAL void print_bits(unsigned int bits, int size); //TO DELETE BEFORE EVAL
void print_tetri(unsigned int bits, int size); //TO DELETE BEFORE EVAL void print_tetri(unsigned int bits, int size); //TO DELETE BEFORE EVAL
void search_map(t_fillist *list); void search_map(t_fillist *list);
void print_map(unsigned int *tab, int width, int height); void print_map(unsigned int *tab, int width, int height, char letter);
void print_final_map(t_fillist *list, int size);
#endif #endif

16
parse_input.c
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/04/30 19:30:54 by vmanzoni ### ########.fr */ /* Updated: 2019/05/03 16:10:12 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -90,13 +90,6 @@ void fill_list(char line[], t_fillist *list)
list->height = i; list->height = i;
// fabrique la ligne pour le tetriminos de la bonne largeur // 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);
// impression pour tests
tmp = list->tetribit;
tmp <<= 16;
// ft_putstr("\n");
// print_map(&tmp, list->width, list->height);
tmp >>= 16;
} }
/* /*
@@ -104,7 +97,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) int add_to_list(char *line, t_fillist **list, char letter)
{ {
t_fillist *tmp; t_fillist *tmp;
t_fillist *test; t_fillist *test;
@@ -122,6 +115,7 @@ int add_to_list(char *line, t_fillist **list)
test->next = tmp; test->next = tmp;
} }
fill_list(line, tmp); fill_list(line, tmp);
tmp->letter = letter;
return (1); return (1);
} }
@@ -135,8 +129,10 @@ void parse_input(char *input)
char tetri[20]; char tetri[20];
int i; int i;
int j; int j;
int letter;
i = 0; i = 0;
letter = 'A';
while (input[i]) while (input[i])
{ {
j = 0; j = 0;
@@ -148,7 +144,7 @@ void parse_input(char *input)
ft_putstr(tetri); ft_putstr(tetri);
print_error("\n\nerror: This tetrimino is not valid.\n"); print_error("\n\nerror: This tetrimino is not valid.\n");
} }
add_to_list(tetri, &list); add_to_list(tetri, &list, letter++);
while (input[i] && input[i] != '.' && input[i] != '#') while (input[i] && input[i] != '.' && input[i] != '#')
i++; i++;
} }

52
print.c
View File

@@ -6,7 +6,7 @@
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */ /* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/30 13:24:28 by hulamy #+# #+# */ /* Created: 2019/04/30 13:24:28 by hulamy #+# #+# */
/* Updated: 2019/04/30 19:26:01 by vmanzoni ### ########.fr */ /* Updated: 2019/05/03 16:07:51 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -60,7 +60,7 @@ void print_tetri(unsigned int bits, int size)
** Print a map of height and width ** Print a map of height and width
*/ */
void print_map(unsigned int *tab, int width, int height) void print_map(unsigned int *tab, int width, int height, char letter)
{ {
int i; int i;
unsigned int mask; unsigned int mask;
@@ -74,9 +74,55 @@ void print_map(unsigned int *tab, int width, int height)
{ {
if (i && !(i % width)) if (i && !(i % width))
ft_putchar('\n'); ft_putchar('\n');
tab[i / 32] & (1 << (31 - i % 32)) ? ft_putchar('#') : ft_putchar('.'); tab[i / 32] & (1 << (31 - i % 32)) ? ft_putchar(letter) : ft_putchar('.');
ft_putchar(' '); ft_putchar(' ');
i++; i++;
} }
write(1, "\n", 1); write(1, "\n", 1);
} }
/*
** Print the final map with the letters
*/
void print_final_map(t_fillist *list, int size)
{
unsigned int print; // DEBUG
t_fillist *tmp;
char *map;
int i;
int j;
map = (char *)malloc(sizeof(*map) * (size * size + 1));
map[size*size] = '\0';
i = -1;
while (++i < size * size)
map[i] = '.';
tmp = list;
while (tmp)
{
j = 0;
i = -1;
while (++i < tmp->width * tmp->height)
{
if (i && i % tmp->width == 0)
j += size - tmp->width;
if (1 << (15 - i) & tmp->tetribit)
map[tmp->position + i + j - 1] = tmp->letter;
}
ft_putstr("position: "); ft_putnbrendl(tmp->position); // DEBUG
print = tmp->tetribit << 16; // DEBUG
print_map(&print, tmp->width, tmp->height, tmp->letter); // DEBUG
ft_putchar('\n'); // DEBUG
tmp = tmp->next;
}
i = -1;
while (++i < size * size)
{
if (i && i % size == 0)
ft_putchar('\n');
ft_putchar(map[i]);
ft_putchar(' ');
}
ft_putchar('\n');
}

19
samples/4tetribis Normal file
View File

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

99
samples/test_ultra_lent Normal file
View File

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

44
search_map.c
View File

@@ -6,7 +6,7 @@
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */ /* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */ /* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */
/* Updated: 2019/05/01 14:21:49 by hulamy ### ########.fr */ /* Updated: 2019/05/03 16:05:23 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -16,7 +16,7 @@
** 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 *tab, t_fillist *list, int size) int find_place(unsigned int *tab, t_fillist *list, int size, int pos)
{ {
int i; int i;
int j; int j;
@@ -26,7 +26,7 @@ int find_place(unsigned int *tab, t_fillist *list, int size)
// creer un mask avec les size bits de gauche a 1 (ex: 11111110000000000000000000000000) // creer un mask avec les size bits de gauche a 1 (ex: 11111110000000000000000000000000)
mask = ~0u << (32 - list->width); mask = ~0u << (32 - list->width);
tmp = mask; tmp = mask;
i = 0; i = pos;
// boucle jusqu'a la dernier place pour le tetri dans la map ou qu'il fit dans un trou // boucle jusqu'a la dernier place pour le tetri dans la map ou qu'il fit dans un trou
while (i < (size - list->height + 1) * size) while (i < (size - list->height + 1) * size)
{ {
@@ -41,8 +41,9 @@ int find_place(unsigned int *tab, t_fillist *list, int size)
j -= size; j -= size;
} }
if (!((tmp >> 16) & list->tetribit)) if (!((tmp >> 16) & list->tetribit))
return ((list->position = i + 1)); return (i + 1);
if (i % size == size - list->width) // pour ne pas deborder a droite de la map
if (i % size == size - list->width + 1)
i += list->width - 1; i += list->width - 1;
i++; i++;
} }
@@ -56,26 +57,22 @@ int find_place(unsigned int *tab, t_fillist *list, int size)
void add_remove(unsigned int *map, t_fillist *list, int size, int pos) void add_remove(unsigned int *map, t_fillist *list, int size, int pos)
{ {
unsigned int mask; unsigned int mask;
unsigned int tmp; unsigned short tetri;
int j;
int i; int i;
int j;
tetri = list->tetribit;
mask = ~0u << (32 - list->width); mask = ~0u << (32 - list->width);
tmp = 0;
i = (list->height - 1) * list->width; i = (list->height - 1) * list->width;
j = (list->height - 1) * size + pos; j = (list->height - 1) * size + pos;
// change les bits du tetri sur la map a la position donnee // change les bits du tetri sur la map a la position donnee
while (j >= pos) while (j >= pos)
{ {
print_map(map, size, size); // POUR DEBUG map[j / 32] ^= (mask & tetri << (16 + i)) >> (j - 1);
map[j / 32] ^= (mask >> i & list->tetribit << 16) >> (j - i - 1); map[(j + size) / 32] ^= (mask & tetri << (16 + i)) << (j % 32 + 1);
map[(j + size) / 32] ^= (mask >> i & list->tetribit << 16)
<< (list->width * (list->height - 1) + ((33 - (j % 32)) % 32));
j -= size; j -= size;
i -= list->width; i -= list->width;
} }
print_map(map, size, size); // POUR DEBUG
ft_putchar('\n');
} }
/* /*
@@ -84,17 +81,17 @@ void add_remove(unsigned int *map, t_fillist *list, int size, int pos)
int fill_map(unsigned int *map, t_fillist *list, int size) int fill_map(unsigned int *map, t_fillist *list, int size)
{ {
int pos;
pos = 0;
if (!list) if (!list)
return (1); return (1);
while (find_place(map, list, size)) while ((pos = find_place(map, list, size, pos)))
{ {
add_remove(map, list, size, list->position); add_remove(map, list, size, pos);
// print_map(map, size, size); // POUR DEBUG
ft_putendl("add_remove"); // POUR DEBUG
if (fill_map(map, list->next, size)) if (fill_map(map, list->next, size))
return (1); return (list->position = pos);
add_remove(map, list, size, list->position); add_remove(map, list, size, pos);
list->position++;
} }
return (0); return (0);
} }
@@ -137,9 +134,12 @@ void search_map(t_fillist *list)
while (size * size < i * 4) while (size * size < i * 4)
size++; size++;
map = init_map(size); map = init_map(size);
// lance la recursive fill_map en augmentant la taille de la map tant qu'il n'y a pas de solution // lance la recursive fill_map en augmentant la taille de la map tant qu'il n'y a pas de solution
ft_putstr("test "); ft_putnbrendl(size); // POUR DEBUG
while (!fill_map(map, list, size)) while (!fill_map(map, list, size))
map = init_map(size++); map = init_map(size++);
print_final_map(list, size); // DEBUG
ft_putchar('\n'); // DEBUG
print_map(map, size, size, '#');
} }

BIN
testmap Executable file
View File

Binary file not shown.