From c8570a26f13a138ce0e156d4779b827b016c0294 Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r10p21.42.fr>
Date: Wed, 1 May 2019 22:50:46 +0200
Subject: [PATCH 1/8] add_remove fonctionne vraiment cette fois

---
 samples/4tetribis | 19 ++++++++++
 search_map.c      | 89 ++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 samples/4tetribis

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/search_map.c b/search_map.c
index cfb4c0d..b01d30e 100644
--- a/search_map.c
+++ b/search_map.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/01 14:21:49 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/01 22:50:17 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -67,14 +67,42 @@ 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)
 	{
-		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));
+//		/* tests pour trouver la nouvelle equation
+		ft_putstr("j:"); ft_putnbr(j); ft_putstr(" (32 - j):"); ft_putnbr(32 - j); ft_putstr(" i:"); ft_putnbr(i); ft_putstr(" pos:"); ft_putnbrendl(pos);
+		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);
+
+		print_bits(map[(j + list->width) / 32], 32);
+		print_bits((mask & list->tetribit << (16 + i)), 32);
+		print_bits((mask & list->tetribit << (16 + i)) << ((33 - j % 32) % 32), 32);
+		print_bits(map[(j + list->width) / 32] | (mask & list->tetribit << (16 + i)) << ((33 - j % 32) % 32), 32);
+//		*/
+
+//		ancienne version avec ancienne equation
+		/*
+								print_map(map, size, size);																						// POUR DEBUG
+								ft_putstr("map[j / 32]    : "); print_bits(map[j / 32], 32);													// POUR DEBUG
+								ft_putstr("mask           : "); print_bits((mask >> i & list->tetribit << 16) >> (j - i - 1), 32);				// POUR DEBUG
+		*/
+//		map[j / 32] ^= (mask >> i & list->tetribit << 16) >> (j - i - 1);
+		/*
+								ft_putstr("map[j / 32]    : "); print_bits(map[j / 32], 32);													// POUR DEBUG
+								ft_putstr("map[(j+s) / 32]: "); print_bits(map[(j + size) / 32], 32);											// POUR DEBUG
+								ft_putstr("mask 2         : "); print_bits((mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32)), 32);				// POUR DEBUG
+		*/
+//		map[(j + size) / 32] ^= (mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32));
+		/*
+								ft_putstr("map[(j+s) / 32]: "); print_bits(map[(j + size) / 32], 32);											// POUR DEBUG
+		*/
 		j -= size;
 		i -= list->width;
 	}
-	print_map(map, size, size);				// POUR DEBUG
+//	print_map(map, size, size);				// POUR DEBUG
 	ft_putchar('\n');
 }
 
@@ -137,9 +165,52 @@ void	search_map(t_fillist *list)
 	while (size * size < i * 4)
 		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);
+	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_putnbrendl(find_place(tab, tmp, 10));
+		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
+	add_remove(tab, list, 10, find_place(tab, list, 10));
+//	print_map(tab, 10, 10);
+//	add_remove(tab, list, 10, list->position);
+//	print_map(tab, 10, 10);
+
+	add_remove(tab, list->next, 10, find_place(tab, list->next, 10));
+//	print_map(tab, 10, 10);
+//	add_remove(tab, list->next, 10, list->next->position);
+//	print_map(tab, 10, 10);
+
+	add_remove(tab, list->next->next, 10, find_place(tab, list->next->next, 10));
+//	print_map(tab, 10, 10);
+//	add_remove(tab, list->next->next, 10, list->next->next->position);
+//	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
-	ft_putstr("test "); ft_putnbrendl(size);	// POUR DEBUG
-	while (!fill_map(map, list, size))
-		map = init_map(size++);
+//	ft_putstr("test "); ft_putnbrendl(size);	// POUR DEBUG
+//	while (!fill_map(map, list, size))
+//		map = init_map(size++);
 }
 

From f035f37607f5bb88e4a4ea022eba2d2c2a8d456f Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r10p21.42.fr>
Date: Wed, 1 May 2019 23:13:24 +0200
Subject: [PATCH 2/8] this time add_remove really fucking works

---
 search_map.c | 87 ++++++++--------------------------------------------
 1 file changed, 12 insertions(+), 75 deletions(-)

diff --git a/search_map.c b/search_map.c
index b01d30e..bed0874 100644
--- a/search_map.c
+++ b/search_map.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/01 22:50:17 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/01 23:12:57 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -67,42 +67,21 @@ 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):"); ft_putnbr(32 - j); ft_putstr(" i:"); ft_putnbr(i); ft_putstr(" pos:"); ft_putnbrendl(pos);
-		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);
-
-		print_bits(map[(j + list->width) / 32], 32);
-		print_bits((mask & list->tetribit << (16 + i)), 32);
-		print_bits((mask & list->tetribit << (16 + i)) << ((33 - j % 32) % 32), 32);
-		print_bits(map[(j + list->width) / 32] | (mask & list->tetribit << (16 + i)) << ((33 - j % 32) % 32), 32);
-//		*/
-
-//		ancienne version avec ancienne equation
-		/*
 								print_map(map, size, size);																						// POUR DEBUG
 								ft_putstr("map[j / 32]    : "); print_bits(map[j / 32], 32);													// POUR DEBUG
-								ft_putstr("mask           : "); print_bits((mask >> i & list->tetribit << 16) >> (j - i - 1), 32);				// POUR DEBUG
-		*/
-//		map[j / 32] ^= (mask >> i & list->tetribit << 16) >> (j - i - 1);
-		/*
+								ft_putstr("mask           : "); print_bits((mask & list->tetribit << (16 + i)) >> (j - 1), 32);					// POUR DEBUG
+		map[j / 32] ^= (mask & list->tetribit << (16 + i)) >> (j - 1);
 								ft_putstr("map[j / 32]    : "); print_bits(map[j / 32], 32);													// POUR DEBUG
 								ft_putstr("map[(j+s) / 32]: "); print_bits(map[(j + size) / 32], 32);											// POUR DEBUG
-								ft_putstr("mask 2         : "); print_bits((mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32)), 32);				// POUR DEBUG
-		*/
-//		map[(j + size) / 32] ^= (mask >> i & list->tetribit << 16) << (list->width * (list->height - 1) + ((33 - (j % 32)) % 32));
-		/*
+								ft_putstr("mask 2         : "); print_bits((mask & list->tetribit << (16 + i)) << ((j % 32) + 1), 32);			// POUR DEBUG
+								ft_putstr("(j % 32) + 1   : "); ft_putnbrendl((j % 32) + 1);													// POUR DEBUG
+								ft_putstr("j              : "); ft_putnbrendl(j);																// POUR DEBUG
+		map[(j + size) / 32] ^= (mask & list->tetribit << (16 + i)) << ((j % 32) + 1);
 								ft_putstr("map[(j+s) / 32]: "); print_bits(map[(j + size) / 32], 32);											// POUR DEBUG
-		*/
 		j -= size;
 		i -= list->width;
 	}
-//	print_map(map, size, size);				// POUR DEBUG
+								print_map(map, size, size);																						// POUR DEBUG
 	ft_putchar('\n');
 }
 
@@ -117,7 +96,7 @@ int		fill_map(unsigned int *map, t_fillist *list, int size)
 	while (find_place(map, list, size))
 	{
 		add_remove(map, list, size, list->position);
-	//	print_map(map, size, size);			// POUR DEBUG
+		print_map(map, size, size);			// POUR DEBUG
 		ft_putendl("add_remove");			// POUR DEBUG
 		if (fill_map(map, list->next, size))
 				return (1);
@@ -166,51 +145,9 @@ 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);
-	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_putnbrendl(find_place(tab, tmp, 10));
-		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
-	add_remove(tab, list, 10, find_place(tab, list, 10));
-//	print_map(tab, 10, 10);
-//	add_remove(tab, list, 10, list->position);
-//	print_map(tab, 10, 10);
-
-	add_remove(tab, list->next, 10, find_place(tab, list->next, 10));
-//	print_map(tab, 10, 10);
-//	add_remove(tab, list->next, 10, list->next->position);
-//	print_map(tab, 10, 10);
-
-	add_remove(tab, list->next->next, 10, find_place(tab, list->next->next, 10));
-//	print_map(tab, 10, 10);
-//	add_remove(tab, list->next->next, 10, list->next->next->position);
-//	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
-//	ft_putstr("test "); ft_putnbrendl(size);	// POUR DEBUG
-//	while (!fill_map(map, list, size))
-//		map = init_map(size++);
+	ft_putstr("test "); ft_putnbrendl(size);	// POUR DEBUG
+	while (!fill_map(map, list, size))
+		map = init_map(size++);
 }
 

From 929e070fb02f444e92d69977c2e7b55f62a1ad50 Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r10p21.42.fr>
Date: Wed, 1 May 2019 23:22:14 +0200
Subject: [PATCH 3/8] nettoyage et mise a la norme de add_remove

---
 search_map.c | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/search_map.c b/search_map.c
index bed0874..2e92cb9 100644
--- a/search_map.c
+++ b/search_map.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/01 23:12:57 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/01 23:21:27 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -53,35 +53,26 @@ int		find_place(unsigned int *tab, t_fillist *list, int size)
 ** function that add or remove a tetri on the map
 */
 
-void	add_remove(unsigned int *map, t_fillist *list, int size, int pos)
+void	add_remove(unsigned int *map, t_fillist *list, int size)
 {
 	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;
+	j = (list->height - 1) * size + list->position;
 	// change les bits du tetri sur la map a la position donnee
-	while (j >= pos)
+	while (j >= list->position)
 	{
-								print_map(map, size, size);																						// POUR DEBUG
-								ft_putstr("map[j / 32]    : "); print_bits(map[j / 32], 32);													// POUR DEBUG
-								ft_putstr("mask           : "); print_bits((mask & list->tetribit << (16 + i)) >> (j - 1), 32);					// POUR DEBUG
-		map[j / 32] ^= (mask & list->tetribit << (16 + i)) >> (j - 1);
-								ft_putstr("map[j / 32]    : "); print_bits(map[j / 32], 32);													// POUR DEBUG
-								ft_putstr("map[(j+s) / 32]: "); print_bits(map[(j + size) / 32], 32);											// POUR DEBUG
-								ft_putstr("mask 2         : "); print_bits((mask & list->tetribit << (16 + i)) << ((j % 32) + 1), 32);			// POUR DEBUG
-								ft_putstr("(j % 32) + 1   : "); ft_putnbrendl((j % 32) + 1);													// POUR DEBUG
-								ft_putstr("j              : "); ft_putnbrendl(j);																// POUR DEBUG
-		map[(j + size) / 32] ^= (mask & list->tetribit << (16 + i)) << ((j % 32) + 1);
-								ft_putstr("map[(j+s) / 32]: "); print_bits(map[(j + size) / 32], 32);											// POUR DEBUG
+		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
+	print_map(map, size, size);								// POUR DEBUG
 	ft_putchar('\n');
 }
 
@@ -95,12 +86,11 @@ int		fill_map(unsigned int *map, t_fillist *list, int size)
 		return (1);
 	while (find_place(map, list, size))
 	{
-		add_remove(map, list, size, list->position);
-		print_map(map, size, size);			// POUR DEBUG
-		ft_putendl("add_remove");			// POUR DEBUG
+		ft_putchar('\n'); ft_putendl("add_remove");			// POUR DEBUG
+		add_remove(map, list, size);
 		if (fill_map(map, list->next, size))
 				return (1);
-		add_remove(map, list, size, list->position);
+		add_remove(map, list, size);
 		list->position++;
 	}
 	return (0);

From 05e265b3b14bbb06fb8e838367816ca304c5b2fb Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r10p21.42.fr>
Date: Wed, 1 May 2019 23:46:43 +0200
Subject: [PATCH 4/8] la position des tetri dans la recursive est mtn garde en
 memoire

---
 parse_input.c |  3 ++-
 search_map.c  | 35 ++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/parse_input.c b/parse_input.c
index 7a0c77c..d69ac65 100644
--- a/parse_input.c
+++ b/parse_input.c
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/15 14:48:14 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/04/30 14:19:32 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/01 23:35:16 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -89,6 +89,7 @@ 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);
+	list->position = 0;
 
 	// imression pour tests
 //	ft_putchar('\n');
diff --git a/search_map.c b/search_map.c
index 2e92cb9..f9138d1 100644
--- a/search_map.c
+++ b/search_map.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/01 23:21:27 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/01 23:46:11 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,7 +41,8 @@ int		find_place(unsigned int *tab, t_fillist *list, int size)
 			j -= size;
 		}
 		if (!((tmp >> 16) & list->tetribit))
-			return ((list->position = i + 1));
+			return (i + 1);
+		// pour ne pas deborder a droite de la map
 		if (i % size == size - list->width)
 			i += list->width - 1;
 		i++;
@@ -53,7 +54,7 @@ int		find_place(unsigned int *tab, t_fillist *list, int size)
 ** 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, int pos)
 {
 	unsigned int	mask;
 	unsigned short	tetri;
@@ -63,17 +64,15 @@ void	add_remove(unsigned int *map, t_fillist *list, int size)
 	tetri = list->tetribit;
 	mask = ~0u << (32 - list->width);
 	i = (list->height - 1) * list->width;
-	j = (list->height - 1) * size + list->position;
+	j = (list->height - 1) * size + pos;
 	// change les bits du tetri sur la map a la position donnee
-	while (j >= list->position)
+	while (j >= pos)
 	{
 		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');
 }
 
 /*
@@ -82,15 +81,25 @@ void	add_remove(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)
 		return (1);
-	while (find_place(map, list, size))
+	while ((pos = find_place(map, list, size, pos)))
 	{
 		ft_putchar('\n'); ft_putendl("add_remove");			// POUR DEBUG
-		add_remove(map, list, size);
+		add_remove(map, list, size, pos);
+		print_map(map, size, size);							// POUR DEBUG
+		ft_putchar('\n');									// POUR DEBUG
 		if (fill_map(map, list->next, size))
-				return (1);
-		add_remove(map, list, size);
+		{
+			list->position = pos;
+			return (1);
+		}
+		add_remove(map, list, size, pos);
+		print_map(map, size, size);							// POUR DEBUG
+		ft_putchar('\n');									// POUR DEBUG
 		list->position++;
 	}
 	return (0);

From 8a49caad945fa28ffd2c83b7b2a44b906ba941c9 Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r10p21.42.fr>
Date: Thu, 2 May 2019 00:13:11 +0200
Subject: [PATCH 5/8] find place ne depasse plus les bords de droite et du bas

---
 parse_input.c |  3 +--
 search_map.c  | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/parse_input.c b/parse_input.c
index d69ac65..2991b11 100644
--- a/parse_input.c
+++ b/parse_input.c
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/15 14:48:14 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/01 23:35:16 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/01 23:47:06 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -89,7 +89,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);
-	list->position = 0;
 
 	// imression pour tests
 //	ft_putchar('\n');
diff --git a/search_map.c b/search_map.c
index f9138d1..08c4aa0 100644
--- a/search_map.c
+++ b/search_map.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/01 23:46:11 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/02 00:11:48 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,8 +28,11 @@ int		find_place(unsigned int *tab, t_fillist *list, int size, int pos)
 	tmp = mask;
 	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)
+	while (i <= (size - list->height) * size)
 	{
+		// pour ne pas deborder a droite de la map
+		if (i % size == size - list->width + 1)
+			i += list->width - 1;
 		tmp = 0;
 		// construit un tmp qui est une photo de la map de la taille du tetri a un emplacement donne
 		j = (list->height - 1) * size + i;
@@ -42,9 +45,6 @@ int		find_place(unsigned int *tab, t_fillist *list, int size, int pos)
 		}
 		if (!((tmp >> 16) & list->tetribit))
 			return (i + 1);
-		// pour ne pas deborder a droite de la map
-		if (i % size == size - list->width)
-			i += list->width - 1;
 		i++;
 	}
 	return (0);
@@ -88,19 +88,15 @@ int		fill_map(unsigned int *map, t_fillist *list, int size)
 		return (1);
 	while ((pos = find_place(map, list, size, pos)))
 	{
-		ft_putchar('\n'); ft_putendl("add_remove");			// POUR DEBUG
+//		ft_putchar('\n'); ft_putendl("add_remove");			// POUR DEBUG
 		add_remove(map, list, size, pos);
 		print_map(map, size, size);							// POUR DEBUG
 		ft_putchar('\n');									// POUR DEBUG
 		if (fill_map(map, list->next, size))
-		{
-			list->position = pos;
-			return (1);
-		}
+			return (list->position = pos);
 		add_remove(map, list, size, pos);
-		print_map(map, size, size);							// POUR DEBUG
-		ft_putchar('\n');									// POUR DEBUG
-		list->position++;
+//		print_map(map, size, size);							// POUR DEBUG
+//		ft_putchar('\n');									// POUR DEBUG
 	}
 	return (0);
 }

From 192c2ba0ae179779163c8046187861b6019c318d Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r10p21.42.fr>
Date: Thu, 2 May 2019 16:45:28 +0200
Subject: [PATCH 6/8] ca semble fonctionner et c tres rapide

---
 fillit.h      |  2 +-
 parse_input.c |  9 +--------
 print.c       |  2 +-
 search_map.c  | 17 ++++++-----------
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/fillit.h b/fillit.h
index e01dca4..f2fc732 100644
--- a/fillit.h
+++ b/fillit.h
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/01 13:34:46 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/04/30 14:24:50 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/02 00:39:33 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/parse_input.c b/parse_input.c
index 2991b11..41df17b 100644
--- a/parse_input.c
+++ b/parse_input.c
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/15 14:48:14 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/01 23:47:06 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/02 00:40:23 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -89,13 +89,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);
-
-	// imression pour tests
-//	ft_putchar('\n');
-//	tmp = list->tetribit;
-//	tmp <<= 16;
-//	print_map(&tmp, list->width, list->height);
-//	tmp >>= 16;
 }
 
 /*
diff --git a/print.c b/print.c
index 5e3256e..349478e 100644
--- a/print.c
+++ b/print.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/30 13:24:28 by hulamy            #+#    #+#             */
-/*   Updated: 2019/04/30 13:25:18 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/02 00:39:56 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/search_map.c b/search_map.c
index 08c4aa0..fbb5b65 100644
--- a/search_map.c
+++ b/search_map.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/02 00:11:48 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/02 16:42:47 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,11 +28,8 @@ int		find_place(unsigned int *tab, t_fillist *list, int size, int pos)
 	tmp = mask;
 	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) * size)
+	while (i < (size - list->height + 1) * size)
 	{
-		// pour ne pas deborder a droite de la map
-		if (i % size == size - list->width + 1)
-			i += list->width - 1;
 		tmp = 0;
 		// construit un tmp qui est une photo de la map de la taille du tetri a un emplacement donne
 		j = (list->height - 1) * size + i;
@@ -45,6 +42,9 @@ int		find_place(unsigned int *tab, t_fillist *list, int size, int pos)
 		}
 		if (!((tmp >> 16) & list->tetribit))
 			return (i + 1);
+		// pour ne pas deborder a droite de la map
+		if (i % size == size - list->width + 1)
+			i += list->width - 1;
 		i++;
 	}
 	return (0);
@@ -88,15 +88,10 @@ int		fill_map(unsigned int *map, t_fillist *list, int size)
 		return (1);
 	while ((pos = find_place(map, list, size, pos)))
 	{
-//		ft_putchar('\n'); ft_putendl("add_remove");			// POUR DEBUG
 		add_remove(map, list, size, pos);
-		print_map(map, size, size);							// POUR DEBUG
-		ft_putchar('\n');									// POUR DEBUG
 		if (fill_map(map, list->next, size))
 			return (list->position = pos);
 		add_remove(map, list, size, pos);
-//		print_map(map, size, size);							// POUR DEBUG
-//		ft_putchar('\n');									// POUR DEBUG
 	}
 	return (0);
 }
@@ -141,8 +136,8 @@ void	search_map(t_fillist *list)
 	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_map(map, size, size);
 }
 

From bd38cd52ed2c9af5b426df018df3ef450ec5fde5 Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r10p21.42.fr>
Date: Fri, 3 May 2019 14:25:05 +0200
Subject: [PATCH 7/8] letter ajoute a la struct

---
 Makefile                |   2 +-
 fillit.h                |   6 ++-
 parse_input.c           |  10 ++--
 print.c                 | 106 +++++++++++++++++++++++++++++-----------
 samples/test_ultra_lent |  99 +++++++++++++++++++++++++++++++++++++
 search_map.c            |   3 +-
 testmap                 | Bin 0 -> 13908 bytes
 7 files changed, 191 insertions(+), 35 deletions(-)
 create mode 100644 samples/test_ultra_lent
 create mode 100755 testmap

diff --git a/Makefile b/Makefile
index e6b8ac7..6a418a9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    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 f2fc732..501072c 100644
--- a/fillit.h
+++ b/fillit.h
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/01 13:34:46 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/02 00:39:33 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/03 14:22:25 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,10 +45,11 @@ 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	search_map(t_fillist *list);
 void	print_map(unsigned int *tab, int width, int height);
+void    print_final_map(t_fillist *list, int size);
 
 #endif
diff --git a/parse_input.c b/parse_input.c
index 41df17b..d2cd51a 100644
--- a/parse_input.c
+++ b/parse_input.c
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/15 14:48:14 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/02 00:40:23 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/03 14:24:00 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -96,7 +96,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;
@@ -114,6 +114,7 @@ int		add_to_list(char *line, t_fillist **list)
 		test->next = tmp;
 	}
 	fill_list(line, tmp);
+	tmp->letter = letter;
 	return (1);
 }
 
@@ -127,8 +128,11 @@ void	parse_input(char *input)
 	char				tetri[20];
 	int					i;
 	int					j;
+	int					letter;
 
 	i = 0;
+	letter = 'A';
+	--letter;
 	while (input[i])
 	{
 		j = 0;
@@ -137,7 +141,7 @@ void	parse_input(char *input)
 		tetri[19] = '\0';
 		if (check_tetri_errors(tetri))
 			print_error("Error: Tetrimino not valid.");
-		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 349478e..b8e7397 100644
--- a/print.c
+++ b/print.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/30 13:24:28 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/02 00:39:56 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/03 14:19: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);
 }
 
 /*
@@ -36,24 +36,74 @@ void    print_bits(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)
 {
-    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('#') : 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;	
+	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)
+		{
+//			ft_putchar('\n');
+//			print = tmp->tetribit << 16;
+//			print_map(&print, tmp->width, tmp->height);
+//			print_bits(tmp->tetribit, 16);
+//			print_bits(1 << (15 - i), 16);
+//			(1 >> i & tmp->tetribit) ? ft_putchar('1') : ft_putchar('.');
+			if (i && i + 1 % tmp->width == 0)
+				j += size;
+			if (1 << (15 - i) & tmp->tetribit)
+				map[tmp->position + i + j] = tmp->letter;
+			else
+				map[tmp->position + i + j] = '.';
+		}
+		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/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 fbb5b65..6317db8 100644
--- a/search_map.c
+++ b/search_map.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/02 16:42:47 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/03 14:19:42 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -139,5 +139,6 @@ void	search_map(t_fillist *list)
 	while (!fill_map(map, list, size))
 		map = init_map(size++);
 	print_map(map, size, size);
+	print_final_map(list, size);
 }
 
diff --git a/testmap b/testmap
new file mode 100755
index 0000000000000000000000000000000000000000..249f914edac0f1be301078e644232c6b5432dba3
GIT binary patch
literal 13908
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
M?Z7#)b{<gv4@gIm-T(jq

literal 0
HcmV?d00001


From 671585098f6154e5218b683be0be178a49701c79 Mon Sep 17 00:00:00 2001
From: Hugo LAMY <hulamy@e2r10p21.42.fr>
Date: Fri, 3 May 2019 16:06:11 +0200
Subject: [PATCH 8/8] fonction print_final_map fonctionne mais backtracking
 bug..

---
 fillit.h      |  4 ++--
 parse_input.c |  3 +--
 print.c       | 32 ++++++++++++++------------------
 search_map.c  |  7 ++++---
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/fillit.h b/fillit.h
index 501072c..9d2f7b0 100644
--- a/fillit.h
+++ b/fillit.h
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/01 13:34:46 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/03 14:22:25 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/03 15:23:22 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -49,7 +49,7 @@ 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	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 d2cd51a..4de2907 100644
--- a/parse_input.c
+++ b/parse_input.c
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/15 14:48:14 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/03 14:24:00 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/03 15:24:28 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -132,7 +132,6 @@ void	parse_input(char *input)
 
 	i = 0;
 	letter = 'A';
-	--letter;
 	while (input[i])
 	{
 		j = 0;
diff --git a/print.c b/print.c
index b8e7397..f318fec 100644
--- a/print.c
+++ b/print.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/30 13:24:28 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/03 14:19:51 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/03 16:05:19 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,7 +36,7 @@ void	print_bits(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;
@@ -50,7 +50,7 @@ void	print_map(unsigned int *tab, int width, int height)
 	{
 		if (i && !(i % width))
 			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(' ');
 		i++;
 	}
@@ -63,7 +63,7 @@ void	print_map(unsigned int *tab, int width, int height)
 
 void	print_final_map(t_fillist *list, int size)
 {
-//	unsigned int	print;	
+	unsigned int	print;	// DEBUG
 	t_fillist	*tmp;
 	char		*map;
 	int			i;
@@ -71,9 +71,9 @@ void	print_final_map(t_fillist *list, int size)
 
 	map = (char *)malloc(sizeof(*map) * (size * size + 1));
 	map[size*size] = '\0';
-//	i = -1;
-//	while (++i < size * size)
-//		map[i] = '.';
+	i = -1;
+	while (++i < size * size)
+		map[i] = '.';
 	tmp = list;
 	while (tmp)
 	{
@@ -81,19 +81,15 @@ void	print_final_map(t_fillist *list, int size)
 		i = -1;
 		while (++i < tmp->width * tmp->height)
 		{
-//			ft_putchar('\n');
-//			print = tmp->tetribit << 16;
-//			print_map(&print, tmp->width, tmp->height);
-//			print_bits(tmp->tetribit, 16);
-//			print_bits(1 << (15 - i), 16);
-//			(1 >> i & tmp->tetribit) ? ft_putchar('1') : ft_putchar('.');
-			if (i && i + 1 % tmp->width == 0)
-				j += size;
+			if (i && i % tmp->width == 0)
+				j += size - tmp->width;
 			if (1 << (15 - i) & tmp->tetribit)
-				map[tmp->position + i + j] = tmp->letter;
-			else
-				map[tmp->position + i + j] = '.';
+				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;
diff --git a/search_map.c b/search_map.c
index 6317db8..0eac674 100644
--- a/search_map.c
+++ b/search_map.c
@@ -6,7 +6,7 @@
 /*   By: hulamy <marvin@42.fr>                      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/03 14:19:42 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/03 16:05:23 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -138,7 +138,8 @@ 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))
 		map = init_map(size++);
-	print_map(map, size, size);
-	print_final_map(list, size);
+	print_final_map(list, size);	// DEBUG
+	ft_putchar('\n');				// DEBUG
+	print_map(map, size, size, '#');
 }