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

Compare commits

merge into: 42:opti
Branches Tags
42:master 42:test_opti 42:ralentit 42:clean 42:opti 42:add_to_list
...
pull from: 42:clean
Branches Tags
42:test_opti 42:master 42:ralentit 42:clean 42:opti 42:add_to_list

1 Commits
opti ... clean

Author SHA1 Message Date
Hugo LAMY
94c0e5d57f search_map a la norme 2019-05-17 17:13:31 +02:00
4 changed files with 59 additions and 118 deletions
Expand all files Collapse all files

4
Makefile
View File

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

20
fillit.dSYM/Contents/Info.plist
View File

@@ -1,20 +0,0 @@
<?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>

7
fillit.h
View File

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

146
search_map.c
View File

@@ -6,7 +6,7 @@
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */ /* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */ /* Created: 2019/04/27 20:47:22 by hulamy #+# #+# */
/* Updated: 2019/05/16 16:50:29 by hulamy ### ########.fr */ /* Updated: 2019/05/17 17:06:41 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -16,17 +16,20 @@
** function that look if a tretri fit in a place ** function that look if a tretri fit in a place
*/ */
unsigned int fit_in_place(unsigned int *map, t_fillist *list, int size, int n, int r) unsigned int fit_in_place(unsigned int *map, t_fillist *lst, int size, int i)
{ {
unsigned int tmp; unsigned int tmp;
unsigned int mask; unsigned int mask;
int i;
unsigned int tetri; unsigned int tetri;
i = list->height; int n;
tetri = list->tetribit << 16 >> list->width; int r;
n = lst->num;
r = lst->rank;
i = lst->height;
tetri = lst->tetribit << 16 >> lst->width;
tmp = 0; tmp = 0;
mask = ~0u << (32 - list->width); mask = ~0u << (32 - lst->width);
while (i--) while (i--)
{ {
if (tmp & tetri) if (tmp & tetri)
@@ -34,7 +37,7 @@ unsigned int fit_in_place(unsigned int *map, t_fillist *list, int size, int n, i
if (r >= 32 && ++n) if (r >= 32 && ++n)
r -= 32; r -= 32;
tmp = (mask & (map[n] << r)) | (mask & (map[n + 1] >> (32 - r))); tmp = (mask & (map[n] << r)) | (mask & (map[n + 1] >> (32 - r)));
tetri <<= list->width; tetri <<= lst->width;
r += size; r += size;
} }
return (!(tmp & tetri)); return (!(tmp & tetri));
@@ -44,34 +47,31 @@ unsigned int fit_in_place(unsigned int *map, t_fillist *list, int size, int n, i
** function that look for the first place in the map for a tetri ** 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 *map, t_fillist *list, int size)
{ {
int place; // designe la position sur la ligne du tableau de size*size int limit;
int r; // designe la position de pos dans l'int du tableau
int n; // designe dans quel int tu tableau pos se trouve
int limit; // limit en hauteur du tableau a chercher pour la position du tetri
int pos; int pos;
pos = list->position; pos = list->position;
place = pos % size; list->place = pos % size;
r = pos % 32; list->rank = pos % 32;
n = pos / 32; list->num = pos / 32;
limit = (size - list->height + 1) * size; limit = (size - list->height + 1) * size;
while (pos < limit) while (pos < limit)
{ {
if (r >= 32 && ++n) if (list->rank >= 32 && ++list->num)
r -= 32; list->rank -= 32;
if (place > size - list->width && (place = -1)) if (list->place > size - list->width)
{ {
list->place = -1;
pos += list->width - 2; pos += list->width - 2;
r += list->width - 2; list->rank += list->width - 2;
} }
else if (fit_in_place(tab, list, size, n, r)) else if (fit_in_place(map, list, size, 0))
return ((list->position = pos + 1)); return ((list->position = pos + 1));
// return (pos + 1);
pos++; pos++;
place++; list->place++;
r++; list->rank++;
} }
return (0); return (0);
} }
@@ -105,91 +105,34 @@ void add_remove(unsigned int *map, t_fillist *list, int size)
** function that recursively try to fill the map with the tetris ** 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) // DEBUG link sert uniquement pour afficher le debug int fill_map(unsigned int *map, t_fillist *list, int size)
{ {
// /*
// int posx;
// int posy;
// posx = list->posx;
// posy = list->posy;
if (!list) if (!list)
return (1); return (1);
list->position = 0; // comme les positions sont marquees en dure dans la liste et non plus dans une petite variable list->position = 0;
// au sein de la fonction, il faut remettre a zero la position a chaque nouveau tour de map
while (find_place(map, list, size)) while (find_place(map, list, size))
{ {
// pos = list->position;
// list->test = 1; // DEBUG pour afficher la map a chaque etape
add_remove(map, list, size); add_remove(map, list, size);
// print_final_map(link, size); ft_putnbrendl(pos); print_map(map, size, size, '#'); ft_putchar('\n'); // DEBUG if (fill_map(map, list->next, size))
if (fill_map(map, list->next, size, link))
return (1); return (1);
add_remove(map, list, size); add_remove(map, list, size);
// list->test = 0; // DEBUG pour afficher la map a chaque etape
} }
// */
/*
int pos;
pos = 0;
if (!list)
return (1);
while ((pos = find_place(map, list, size, pos)))
{
add_remove(map, list, size, pos);
list->position = pos;
if (fill_map(map, list->next, size, link))
return (1);
add_remove(map, list, size, pos);
}
*/
return (0); 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 send to "fill_map" a map of a certain size and increment its size untill it's solved ** function that send to "fill_map" a map of a certain size and increment its size untill it's solved
*/ */
void search_map(t_fillist *list) int search_map(t_fillist *list)
{ {
t_fillist *tmp; t_fillist *tmp;
unsigned int *map; unsigned int *map;
int size; int size;
int num; int num;
int i;
size = 2; /////////////////////////////////////////////////// TEST
num = 1;
tmp = list;
// trouve le nombre de tetri en parcourant la liste chainee
while ((tmp = tmp->next))
num++;
// trouve la taille minimale de la map
while (size * size < num * 4)
size++;
map = init_map(size);
unsigned int print; unsigned int print;
tmp = list; tmp = list;
while (tmp) while (tmp)
@@ -197,15 +140,30 @@ void search_map(t_fillist *list)
// imression pour tests // imression pour tests
print = tmp->tetribit; print = tmp->tetribit;
print <<= 16; print <<= 16;
print_map(&print, tmp->width, tmp->height, tmp->letter); // test, imprime le tetri print_map(&print, tmp->width, tmp->height, tmp->letter);
ft_putchar('\n'); ft_putchar('\n');
tmp = tmp->next; tmp = tmp->next;
} }
/////////////////////////////////////////////////// TEST
size = 2;
// lance la recursive fill_map en augmentant la taille de la map tant qu'il n'y a pas de solution num = 1;
while (!fill_map(map, list, size, list)) tmp = list;
map = init_map(size++); while ((tmp = tmp->next))
print_final_map(list, size); // DEBUG num++;
print_map(map, size, size, '#'); // DEBUG while (size * size < num * 4)
size++;
i = 0;
while (!i)
{
num = (size * size) / 32 + 1;
if (!(map = (unsigned int *)malloc(sizeof(*map) * num)))
return (0);
while (num)
map[num--] = 0;
i = fill_map(map, list, size++);
}
print_final_map(list, size - 1); // DEBUG
print_map(map, size - 1, size - 1, '#'); // DEBUG
return (--size);
} }