diff --git a/Makefile b/Makefile index e6b8ac7..6a418a9 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # 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 # # # # **************************************************************************** # diff --git a/fillit.h b/fillit.h index 30d8395..429050e 100644 --- a/fillit.h +++ b/fillit.h @@ -6,7 +6,7 @@ /* 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 height; int position; + char letter; struct s_fillist *next; } t_fillist; @@ -44,11 +45,12 @@ void parse_input(char *input); int check_file_errors(char *file); int check_tetri_errors(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 print_bits(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 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 diff --git a/parse_input.c b/parse_input.c index 33cc039..0e42162 100644 --- a/parse_input.c +++ b/parse_input.c @@ -6,7 +6,7 @@ /* 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; // fabrique la ligne pour le tetriminos de la bonne largeur 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 */ -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 *test; @@ -122,6 +115,7 @@ int add_to_list(char *line, t_fillist **list) test->next = tmp; } fill_list(line, tmp); + tmp->letter = letter; return (1); } @@ -135,8 +129,10 @@ void parse_input(char *input) char tetri[20]; int i; int j; + int letter; i = 0; + letter = 'A'; while (input[i]) { j = 0; @@ -148,7 +144,7 @@ void parse_input(char *input) ft_putstr(tetri); 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] != '#') i++; } diff --git a/print.c b/print.c index 4e8ceae..01d56f7 100644 --- a/print.c +++ b/print.c @@ -6,7 +6,7 @@ /* 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 */ /* */ /* ************************************************************************** */ @@ -17,18 +17,18 @@ ** Prints a ligne of size bits */ -void print_bits(unsigned int bits, int size) +void print_bits(unsigned int bits, int size) { - unsigned int mask; + unsigned int mask; - mask = 1 << (size - 1); - while (mask) - { - (bits & mask) ? write(1, "#", 1) : write(1, ".", 1); - write(1, " ", 1); - mask >>= 1; - } - write(1, "\n", 1); + mask = 1 << (size - 1); + while (mask) + { + (bits & mask) ? write(1, "#", 1) : write(1, ".", 1); + write(1, " ", 1); + mask >>= 1; + } + write(1, "\n", 1); } /* @@ -60,23 +60,69 @@ void print_tetri(unsigned int bits, int size) ** 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; - unsigned int mask; + 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'); - tab[i / 32] & (1 << (31 - i % 32)) ? ft_putchar('#') : ft_putchar('.'); - ft_putchar(' '); - i++; - } - write(1, "\n", 1); + 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'); + tab[i / 32] & (1 << (31 - i % 32)) ? ft_putchar(letter) : ft_putchar('.'); + ft_putchar(' '); + i++; + } + 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'); } diff --git a/samples/4tetribis b/samples/4tetribis new file mode 100644 index 0000000..bac821b --- /dev/null +++ b/samples/4tetribis @@ -0,0 +1,19 @@ +.... +##.. +.##. +.... + +...# +...# +...# +...# + +.... +###. +..#. +.... + +.... +.##. +.##. +.... diff --git a/samples/test_ultra_lent b/samples/test_ultra_lent new file mode 100644 index 0000000..6f6a1e5 --- /dev/null +++ b/samples/test_ultra_lent @@ -0,0 +1,99 @@ +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... + +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... + +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... + +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... + +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... diff --git a/search_map.c b/search_map.c index cfb4c0d..0eac674 100644 --- a/search_map.c +++ b/search_map.c @@ -6,7 +6,7 @@ /* 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 */ -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 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) mask = ~0u << (32 - list->width); 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 while (i < (size - list->height + 1) * size) { @@ -41,8 +41,9 @@ int find_place(unsigned int *tab, t_fillist *list, int size) j -= size; } if (!((tmp >> 16) & list->tetribit)) - return ((list->position = i + 1)); - if (i % size == size - list->width) + return (i + 1); + // pour ne pas deborder a droite de la map + if (i % size == size - list->width + 1) i += list->width - 1; 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) { unsigned int mask; - unsigned int tmp; - int j; + unsigned short tetri; int i; + int j; + tetri = list->tetribit; mask = ~0u << (32 - list->width); - tmp = 0; i = (list->height - 1) * list->width; j = (list->height - 1) * size + pos; // change les bits du tetri sur la map a la position donnee while (j >= pos) { - print_map(map, size, size); // POUR DEBUG - map[j / 32] ^= (mask >> i & list->tetribit << 16) >> (j - i - 1); - map[(j + size) / 32] ^= (mask >> i & list->tetribit << 16) - << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32)); + map[j / 32] ^= (mask & tetri << (16 + i)) >> (j - 1); + map[(j + size) / 32] ^= (mask & tetri << (16 + i)) << (j % 32 + 1); j -= size; 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 pos; + + pos = 0; if (!list) return (1); - while (find_place(map, list, size)) + while ((pos = find_place(map, list, size, pos))) { - add_remove(map, list, size, list->position); - // print_map(map, size, size); // POUR DEBUG - ft_putendl("add_remove"); // POUR DEBUG + add_remove(map, list, size, pos); if (fill_map(map, list->next, size)) - return (1); - add_remove(map, list, size, list->position); - list->position++; + return (list->position = pos); + add_remove(map, list, size, pos); } return (0); } @@ -137,9 +134,12 @@ void search_map(t_fillist *list) while (size * size < i * 4) 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 - ft_putstr("test "); ft_putnbrendl(size); // POUR DEBUG while (!fill_map(map, list, size)) map = init_map(size++); + print_final_map(list, size); // DEBUG + ft_putchar('\n'); // DEBUG + print_map(map, size, size, '#'); } diff --git a/testmap b/testmap new file mode 100755 index 0000000..249f914 Binary files /dev/null and b/testmap differ