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

add_remove decidement.. semble fonctionner mieux mais avec deux modulo a chaque boucles

Browse Source
This commit is contained in:
Hugo LAMY
2019-05-06 20:04:27 +02:00
parent e784b96efe
commit 60d1d87b76
2 changed files with 93 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -6,7 +6,7 @@
# By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2019/03/01 13:24:35 by vmanzoni #+# #+# #
# Updated: 2019/05/03 13:50:34 by hulamy ### ########.fr #
# Updated: 2019/05/06 16:37:52 by hulamy ### ########.fr #
# #
# **************************************************************************** #
@@ -52,4 +52,4 @@ clean:
fclean: clean
/bin/rm -rf $(NAME)
re: clean all
re: fclean all

98
search_map.c
View File

@@ -6,7 +6,7 @@
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */
/* Updated: 2019/05/06 16:25:03 by hulamy ### ########.fr */
/* Updated: 2019/05/06 20:03:20 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -68,8 +68,39 @@ 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)
{
// /* tests pour trouver la nouvelle equation
ft_putstr("[j:"); ft_putnbr(j); ft_putstr("] [(32-j%32+1) % 32:"); ft_putnbr((32 - j % 32 + 1) % 32); ft_putstr("] [i:"); ft_putnbr(i); ft_putstr("] [pos:"); ft_putnbr(pos); ft_putendl("]");
print_bits(map[j / 32], 32);
print_bits(list->tetribit << 16, 32);
print_bits(mask, 32);
print_bits(list->tetribit << (16 + i), 32);
print_bits((mask & list->tetribit << (16 + i)), 32);
print_bits((mask & list->tetribit << (16 + i)) >> (j - 1), 32);
print_bits((map[j / 32] | (mask & list->tetribit << (16 + i)) >> (j - 1)), 32);
ft_putchar('\n');
print_bits(map[(j + size) / 32], 32);
print_bits((mask & list->tetribit << (16 + i)), 32);
print_bits((mask & list->tetribit << (16 + i)) << ((32 - j % 32 + 1) % 32), 32);
print_bits(map[(j + size) / 32] | (mask & list->tetribit << (16 + i)) << ((32 - j % 32 + 1) % 32), 32);
// */
// ft_putstr(" map[j/32] :"); print_bits(map[j/32], 32);
// ft_putstr("j :"); ft_putnbrendl(j);
// ft_putstr("mask :"); print_bits((mask), 32);
// ft_putstr("tetri :"); print_bits((tetri), 32);
// ft_putstr("tetri<<(16+i) :"); print_bits((tetri << (16 + i)), 32);
// ft_putstr("mask&tetri<<(16+i) :"); print_bits((mask & tetri << (16 + i)), 32);
// ft_putstr("[prev]>>j-1 :"); print_bits((mask & tetri << (16 + i)) >> (j - 1), 32);
// ft_putstr(" map[(j+size)/32]:"); print_bits(map[(j+size)/32], 32);
// ft_putstr("tetri<<(16+i) :"); print_bits((tetri << (16 + i)), 32);
// ft_putstr("mask&tetri<<(16+i) :"); print_bits((mask & tetri << (16 + i)), 32);
// ft_putstr("[prev]<<j%32+1 :"); print_bits((mask & tetri << (16 + i)) << (j % 32 + 1), 32);
// ft_putstr("j % 32 + 1 :"); ft_putnbrendl(j % 32 + 1);
map[j / 32] ^= (mask & tetri << (16 + i)) >> (j - 1);
map[(j + size) / 32] ^= (mask & tetri << (16 + i)) << (j % 32 + 1);
// ft_putstr("-> map[j/32] :"); print_bits(map[j/32], 32);
map[(j + size) / 32] ^= (mask & tetri << (16 + i)) << ((32 - j % 32 + 1) % 32);
// ft_putstr("-> map[(j+size)/32]:"); print_bits(map[(j+size)/32], 32);
j -= size;
i -= list->width;
}
@@ -139,10 +170,63 @@ void search_map(t_fillist *list)
size++;
map = init_map(size);
//////////////////////////// TEST ////////////////////////////
// ce tableau permet de monter jusqu'a une map de 16*16
unsigned int print;
unsigned int tab[8];
tab[0] = 2656554334;
tab[1] = 1394456818 ^ (1 << 11 | 1 << 22 | 1 << 4);
tab[2] = 1494256918;
tab[3] = 2656554334;
tab[4] = 1592453883;
tab[5] = 1444352908;
tab[6] = 2154339230;
tab[7] = 1576493154;
print_map(tab, 10, 10, '#');
tmp = list;
while (tmp)
{
// imression pour tests
print = tmp->tetribit;
print <<= 16;
print_map(&print, tmp->width, tmp->height, '#'); // test, imprime le tetri
ft_putchar('\n');
tmp = tmp->next;
}
// quand add_remove_marchera la ligne d'apres imprimera la map avec les pixels du tetri rajoutes a la bonne place
tmp = list;
while (tmp)
{
print = tmp->tetribit;
print <<= 16;
print_map(&print, tmp->width, tmp->height, '#'); // test, imprime le tetri
ft_putnbrendl(find_place(tab, tmp, 10, 0));
add_remove(tab, tmp, 10, find_place(tab, tmp, 10, 0));
ft_putchar('\n'); // DEBUG
print_map(tab, 10, 10, '#');
ft_putchar('\n'); // DEBUG
tmp = tmp->next;
}
// tab[0] = 2656554334;
// tab[1] = 1394456818;
// tab[2] = 1494256918;
// tab[3] = 2656554334;
// tab[4] = 1592453883;
// tab[5] = 1444352908;
// tab[6] = 2154339230;
// tab[7] = 1576493154;
// ft_putchar('\n');
// print_map(tab, 10, 10, '#');
// tab[1] = 1394456818 ^ (1 << 11 | 1 << 22 | 1 << 4);
// ft_putchar('\n');
// print_map(tab, 10, 10, '#');
//////////////////////////// TEST ////////////////////////////
// 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
ft_putchar('\n'); // DEBUG
print_map(map, size, size, '#');
// while (!fill_map(map, list, size, list))
// map = init_map(size++);
// print_final_map(list, size); // DEBUG
// ft_putchar('\n'); // DEBUG
// print_map(map, size, size, '#');
}