tentative de mettre toutes les divisions et modulo dans la structure

Makefile

@@ -6,7 +6,7 @@
 #    By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2019/03/01 13:24:35 by vmanzoni          #+#    #+#              #
-#    Updated: 2019/05/17 17:11:53 by hulamy           ###   ########.fr        #
+#    Updated: 2019/05/06 16:37:52 by hulamy           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -25,7 +25,7 @@ LDLIBS = -lft
 
 SRCS = $(shell find . -depth 1 -type f -not -name '.*' -not -name 'test*' -name '*.c')
 
-TRASH = $(shell find . -depth 1 -name '*.dSYM')
+TRASH = $(shell find . -depth 1 -type f -name '*.dSYM')
 TRASH += $(shell find . -depth 1 -type f -name '*.o')
 TRASH += $(shell find . -depth 1 -type f -name '*.swp')
 TRASH += $(shell find . -depth 1 -type f -name '*.swo')

fillit.dSYM/Contents/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.fillit</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>

fillit.h

@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/01 13:34:46 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/17 17:03:35 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/17 15:33:01 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -44,9 +44,10 @@ typedef struct			s_fillist
 	int					width;
 	int					height;
 	int					position;
-	int					place;
+	int					posx;
-	int					rank;
+	int					int_number;
-	int					num;
+	int					pos_in_int;
+	int					limit;
 	int					test;
 	char				letter;
 	struct s_fillist	*next;
@@ -67,7 +68,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    print_tetri(unsigned int bits, int size); //TO DELETE BEFORE EVAL
-int		search_map(t_fillist *list);
+void	search_map(t_fillist *list);
 void	print_map(unsigned int *tab, int width, int height, char letter);
 void    print_final_map(t_fillist *list, int size);
 void	ft_put_tetri_color(char c);

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/16 15:30:57 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/17 15:32:59 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -89,8 +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;
-	list->test = 0;	// DEBUG pour que print_final_map puisse imprimer correctement au fur et a mesure
 }
 
 /*

search_map.c

@@ -6,7 +6,7 @@
 /*   By: hulamy <hulamy@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/04/27 20:47:22 by hulamy            #+#    #+#             */
-/*   Updated: 2019/05/17 17:06:41 by hulamy           ###   ########.fr       */
+/*   Updated: 2019/05/17 15:55:04 by hulamy           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,20 +16,21 @@
 ** function that look if a tretri fit in a place
 */
 
-unsigned int	fit_in_place(unsigned int *map, t_fillist *lst, int size, int i)
+unsigned int	fit_in_place(unsigned int *map, t_fillist *list, int size)
 {
 	unsigned int	tmp;
 	unsigned int	mask;
-	unsigned int	tetri;
+	int				i;
 	int				n;
 	int				r;
 
-	n = lst->num;
+	n = list->int_number;
-	r = lst->rank;
+	r = list->pos_in_int;
-	i = lst->height;
+	unsigned int	tetri;
-	tetri = lst->tetribit << 16 >> lst->width;
+	i = list->height;
+	tetri = list->tetribit << 16 >> list->width;
 	tmp = 0;
-	mask = ~0u << (32 - lst->width);
+	mask = ~0u << (32 - list->width);
 	while (i--)
 	{
 		if (tmp & tetri)
@@ -37,45 +38,12 @@ unsigned int	fit_in_place(unsigned int *map, t_fillist *lst, int size, int i)
 		if (r >= 32 && ++n)
 			r -= 32;
 		tmp = (mask & (map[n] << r)) | (mask & (map[n + 1] >> (32 - r)));
-		tetri <<= lst->width;
+		tetri <<= list->width;
 		r += size;
 	}
 	return (!(tmp & tetri));
 }
 
-/*
-** function that look for the first place in the map for a tetri
-*/
-
-int		find_place(unsigned int *map, t_fillist *list, int size)
-{
-	int	limit;
-	int pos;
-
-	pos = list->position;
-	list->place = pos % size;
-	list->rank = pos % 32;
-	list->num = pos / 32;
-	limit = (size - list->height + 1) * size;
-	while (pos < limit)
-	{
-		if (list->rank >= 32 && ++list->num)
-			list->rank -= 32;
-		if (list->place > size - list->width)
-		{
-			list->place = -1;
-			pos += list->width - 2;
-			list->rank += list->width - 2;
-		}
-		else if (fit_in_place(map, list, size, 0))
-			return ((list->position = pos + 1));
-		pos++;
-		list->place++;
-		list->rank++;
-	}
-	return (0);
-}
-
 /*
 ** function that add or remove a tetri on the map
 */
@@ -101,38 +69,118 @@ void	add_remove(unsigned int *map, t_fillist *list, int size)
 	}
 }
 
+/*
+** function that look for the first place in the map for a tetri
+*/
+
+int		find_place(unsigned int *tab, t_fillist *list, int size)
+{
+	t_fillist	tmp;
+
+
+	tmp = *list;
+	while (list->position < list->limit)
+	{
+		if (list->pos_in_int >= 32 && ++list->int_number)
+			list->pos_in_int -= 32;
+		if (list->posx > size - list->width && (list->posx = -1))
+		{
+			list->position += list->width - 2;
+			list->pos_in_int += list->width - 2;
+		}
+		else if (fit_in_place(tab, list, size))
+		{
+			list->pos_in_int++;
+			list->position++;
+			list->posx++;
+			return (1);
+		}
+		list->position++;
+		list->posx++;
+		list->pos_in_int++;
+	}
+	list = &tmp;
+	return (0);
+}
+
 /*
 ** function that recursively try to fill the map with the tetris
 */
 
-int		fill_map(unsigned int *map, t_fillist *list, int size)
+int		fill_map(unsigned int *map, t_fillist *list, int size, t_fillist *link)	// DEBUG link sert uniquement pour afficher le debug
 {
 	if (!list)
 		return (1);
 	list->position = 0;
+	list->int_number = 0;
+	list->pos_in_int = 0;
+	list->posx = 0;
 	while (find_place(map, list, size))
 	{
 		add_remove(map, list, size);
-		if (fill_map(map, list->next, size))
+		if (fill_map(map, list->next, size, link))
 			return (1);
 		add_remove(map, list, size);
 	}
 	return (0);
 }
 
+/*
+** function that init the map to the right size fill with int equal to zeros
+*/
+
+unsigned int	*init_map(int i)
+{
+	unsigned int	*new;
+	int				size;
+
+	size = (i * i) / 32 + 1;
+	new = (unsigned int *)malloc(sizeof(*new) * size);
+	while (size)
+		new[size--] = 0;
+	return (new);
+}
+
+/*
+** function that init the list with the new values for each map size
+*/
+
+void	init_list(t_fillist *list, int size)
+{
+	t_fillist		*tmp;
+
+	tmp = list;
+	while (tmp)
+	{
+		list->posx = 0;
+		list->int_number = 0;
+		list->pos_in_int = 0;
+		list->test = 0;	// DEBUG pour que print_final_map puisse imprimer correctement au fur et a mesure
+		tmp->limit = (size - tmp->height + 1) * size;
+		tmp = tmp->next;
+	}
+}
+
 /*
 ** function that send to "fill_map" a map of a certain size and increment its size untill it's solved
 */
 
-int		search_map(t_fillist *list)
+void	search_map(t_fillist *list)
 {
 	t_fillist		*tmp;
 	unsigned int	*map;
 	int				size;
 	int				num;
-	int				i;
 
-	/////////////////////////////////////////////////// TEST
+	size = 2;
+	num = 1;
+	tmp = list;
+	while ((tmp = tmp->next))		// trouve le nombre de tetri en parcourant la liste chainee
+		num++;
+	while (size * size < num * 4)	// trouve la taille minimale de la map
+		size++;
+
+	//////////////////////////////////////// TEST
 	unsigned int	print;
 	tmp = list;
 	while (tmp)
@@ -140,30 +188,19 @@ int		search_map(t_fillist *list)
 		// imression pour tests
 		print = tmp->tetribit;
 		print <<= 16;
-		print_map(&print, tmp->width, tmp->height, tmp->letter);
+		print_map(&print, tmp->width, tmp->height, tmp->letter);		// test, imprime le tetri
 		ft_putchar('\n');
 		tmp = tmp->next;
 	}
-	/////////////////////////////////////////////////// TEST
+	//////////////////////////////////////// TEST
 
-	size = 2;
+	map = init_map(size);
-	num = 1;
+	init_list(list, size);
-	tmp = list;
+	while (!fill_map(map, list, size, list))
-	while ((tmp = tmp->next))
-		num++;
-	while (size * size < num * 4)
-		size++;
-	i = 0;
-	while (!i)
 	{
-		num = (size * size) / 32 + 1;
+		map = init_map(size++);
-		if (!(map = (unsigned int *)malloc(sizeof(*map) * num)))
+		init_list(list, size);
-			return (0);
-		while (num)
-			map[num--] = 0;
-		i = fill_map(map, list, size++);
 	}
-	print_final_map(list, size - 1);		// DEBUG
+	print_final_map(list, size);		// DEBUG
-	print_map(map, size - 1, size - 1, '#');	// DEBUG
+	print_map(map, size, size, '#');	// DEBUG
-	return (--size);
 }