From 1ff7abafd6c7e828760b8f8ffefbd1c782d51d6f Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Wed, 8 May 2019 17:55:38 +0200 Subject: [PATCH 1/2] rajout d'un if dans add_remove pour resoudre la superposition des ints --- .DS_Store | Bin 0 -> 6148 bytes fillit.h | 2 +- print.c | 2 +- search_map.c | 30 ++++++++++++++++++++++++------ 4 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6c438ddf1a8404debe87bea631fd2e49de06cf1d GIT binary patch literal 6148 zcmeHKJ5Iwu5PfTm2!bL-3h1_>MWmy&BGV&<1At-_kYd?V9EpO$2jEUzgA;HAl$JNU zE6a}K77&_|X5M-}JG;-3Hw(bbHrW&y0~k>Sqhp#qB5~24M8R`PG&09(Ih`+xyzFJF z%JGZ{qG&3XibH19FsD z;SuXjS4>{|8Li%5+Y8rwXO7ki1~NM9h^}OkLsZhAc4rN)Lo3?q|9L*?N1NU6iFW$B zQZ>qeGN26nIs-hjMMftc)hYwZfHKf9Am0Z|6-)xw9^I#d#$5r3G2Ko$mb--1*nmmE z+9M+r<4cLY)PyUB@#XZ}ke39kJ^FH(aQQHyvk5m8(XHok7|_xWuVKzfqxv! z`F}Hf|L+#*lQN(T{3`}boX*o3w-nCS-sa@2wbXm6h~(8Cn-UJ(QOsO9iqEJ{=(jQ; VCIM@Y^icGVfTKZ;GVr4ed;^z_UnT$m literal 0 HcmV?d00001 diff --git a/fillit.h b/fillit.h index abcea4d..9900eb5 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/06 16:31:11 by hulamy ### ########.fr */ +/* Updated: 2019/05/08 17:52:19 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/print.c b/print.c index 7872edd..ce77edd 100644 --- a/print.c +++ b/print.c @@ -6,7 +6,7 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/30 13:24:28 by hulamy #+# #+# */ -/* Updated: 2019/05/06 23:28:36 by hulamy ### ########.fr */ +/* Updated: 2019/05/08 17:52:14 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/search_map.c b/search_map.c index dab4fc8..5834a42 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/06 23:28:01 by hulamy ### ########.fr */ +/* Updated: 2019/05/08 17:54:32 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -71,8 +71,20 @@ void add_remove(unsigned int *map, t_fillist *list, int size, int pos) // change les bits du tetri sur la map a la position donnee while (j >= pos) { - map[j / 32] ^= (mask & tetri << (16 + i)) >> (j - 1); - map[(j + size) / 32] ^= (mask & tetri << (16 + i)) << (32 - j); + ft_putstr("j: "); ft_putnbrendl(j); +// ft_putstr("map[(j - 1) / 32] :"); print_bits(map[(j - 1) / 32], 32); +// ft_putstr("(mask & tetri << (16 + i)) >> (j - 1) :"); print_bits((mask & tetri << (16 + i)) >> (j - 1), 32); + map[(j - 1) / 32] ^= (mask & tetri << (16 + i)) >> (j - 1); +// ft_putstr("map[(j - 1) / 32] ^ mask... :"); print_bits(map[j / 32], 32); + if (j % 32 != 1) + { +// ft_putendl("if (j % 32 != 1) :"); + ft_putstr("map[(j + size) / 32] :"); print_bits(map[(j + size) / 32], 32); + ft_putstr("(mask & tetri << (16 + i)) :"); print_bits((mask & tetri << (16 + i)), 32); + ft_putstr("(mask & tetri << (16 + i)) << (32 - j + 1):"); print_bits((mask & tetri << (16 + i)) << (32 - j + 1), 32); + map[(j + size) / 32] ^= (mask & tetri << (16 + i)) << (32 - j + 1); + ft_putstr("map[(j + size) / 32] ^ mask... :"); print_bits(map[(j + size) / 32], 32); + } j -= size; i -= list->width; } @@ -82,20 +94,26 @@ void add_remove(unsigned int *map, t_fillist *list, int size, int pos) ** function that recursively try to fill the map with the tetris */ -int fill_map(unsigned int *map, t_fillist *list, int size, t_fillist *link) +int fill_map(unsigned int *map, t_fillist *list, int size, t_fillist *link) // DEBUG "link" { int pos; pos = 0; if (!list) return (1); + unsigned int tmp = list->tetribit << 16; print_map(&tmp, list->width, list->height, list->letter); // DEBUG while ((pos = find_place(map, list, size, pos))) { add_remove(map, list, size, pos); list->position = pos; + print_final_map(link, size); // DEBUG + ft_putnbrendl(pos); + print_map(map, size, size, '#'); // DEBUG + ft_putchar('\n'); if (fill_map(map, list->next, size, link)) return (1); add_remove(map, list, size, pos); + list->position = -1; // DEBUG } return (0); } @@ -157,6 +175,6 @@ void search_map(t_fillist *list) // lance la recursive fill_map en augmentant la taille de la map tant qu'il n'y a pas de solution while (!fill_map(map, list, size, list)) map = init_map(size++); - print_final_map(list, size); // DEBUG - print_map(map, size, size, '#'); + print_final_map(list, size); // DEBUG + print_map(map, size, size, '#'); // DEBUG } From 2738a5e24bca48e43a6e5fd68c8e53dc7d10c588 Mon Sep 17 00:00:00 2001 From: Hugo LAMY Date: Wed, 8 May 2019 18:43:34 +0200 Subject: [PATCH 2/2] plus de decalage a gauche mais bcp plus lent --- search_map.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/search_map.c b/search_map.c index 5834a42..b1176eb 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/08 17:54:32 by hulamy ### ########.fr */ +/* Updated: 2019/05/08 18:38:47 by hulamy ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,7 +32,7 @@ int find_place(unsigned int *tab, t_fillist *list, int size, int pos) { // pour ne pas deborder a droite de la map if (i % size == size - list->width + 1) - i += list->width; + i += list->width - 1; else { tmp = 0; @@ -71,20 +71,9 @@ void add_remove(unsigned int *map, t_fillist *list, int size, int pos) // change les bits du tetri sur la map a la position donnee while (j >= pos) { - ft_putstr("j: "); ft_putnbrendl(j); -// ft_putstr("map[(j - 1) / 32] :"); print_bits(map[(j - 1) / 32], 32); -// ft_putstr("(mask & tetri << (16 + i)) >> (j - 1) :"); print_bits((mask & tetri << (16 + i)) >> (j - 1), 32); map[(j - 1) / 32] ^= (mask & tetri << (16 + i)) >> (j - 1); -// ft_putstr("map[(j - 1) / 32] ^ mask... :"); print_bits(map[j / 32], 32); if (j % 32 != 1) - { -// ft_putendl("if (j % 32 != 1) :"); - ft_putstr("map[(j + size) / 32] :"); print_bits(map[(j + size) / 32], 32); - ft_putstr("(mask & tetri << (16 + i)) :"); print_bits((mask & tetri << (16 + i)), 32); - ft_putstr("(mask & tetri << (16 + i)) << (32 - j + 1):"); print_bits((mask & tetri << (16 + i)) << (32 - j + 1), 32); map[(j + size) / 32] ^= (mask & tetri << (16 + i)) << (32 - j + 1); - ft_putstr("map[(j + size) / 32] ^ mask... :"); print_bits(map[(j + size) / 32], 32); - } j -= size; i -= list->width; } @@ -101,19 +90,19 @@ int fill_map(unsigned int *map, t_fillist *list, int size, t_fillist *link) // pos = 0; if (!list) return (1); - unsigned int tmp = list->tetribit << 16; print_map(&tmp, list->width, list->height, list->letter); // DEBUG +// unsigned int tmp = list->tetribit << 16; print_map(&tmp, list->width, list->height, list->letter); // DEBUG while ((pos = find_place(map, list, size, pos))) { add_remove(map, list, size, pos); list->position = pos; - print_final_map(link, size); // DEBUG - ft_putnbrendl(pos); - print_map(map, size, size, '#'); // DEBUG - ft_putchar('\n'); +// print_final_map(link, size); // DEBUG +// ft_putnbrendl(pos); +// print_map(map, size, size, '#'); // DEBUG +// ft_putchar('\n'); if (fill_map(map, list->next, size, link)) return (1); add_remove(map, list, size, pos); - list->position = -1; // DEBUG +// list->position = -1; // DEBUG } return (0); }