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

fillit ultrrrrrrra rapide ! pas encore a la norme

Browse Source
This commit is contained in:
Hugo LAMY
2019-05-20 15:58:45 +02:00
parent c2e87b7303
commit 1811268725
4 changed files with 108 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */
/* Updated: 2019/05/17 18:40:34 by hulamy ### ########.fr */ /* Updated: 2019/05/20 15:51:50 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -29,8 +29,11 @@ int main(int argc, char **argv)
// print_error("error: Invalid file.\n"); // print_error("error: Invalid file.\n");
// print_error_extended(check_file_errors(input)); // print_error_extended(check_file_errors(input));
size = parse_input(input, &list); size = parse_input(input, &list);
ft_putnbrendl(size); ft_putchar('\n');
ft_putendl("result for humans :");
print_final_map(list, size, 1); // DEBUG print_final_map(list, size, 1); // DEBUG
ft_putchar('\n');
ft_putendl("result for moulinette :");
print_final_map(list, size, 0); // DEBUG print_final_map(list, size, 0); // DEBUG
} }
else else

3
parse_input.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */ /* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */
/* Updated: 2019/05/18 14:17:14 by hulamy ### ########.fr */ /* Updated: 2019/05/20 15:43:57 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -91,6 +91,7 @@ void fill_list(char line[], t_fillist *list)
i++; i++;
list->height = i; list->height = i;
list->tetribit = reduce_tetri(list->tetribit, list->width); list->tetribit = reduce_tetri(list->tetribit, list->width);
list->same = NULL;
list->test = 0; // DEBUG pour que print_final_map puisse imprimer correctement au fur et a mesure list->test = 0; // DEBUG pour que print_final_map puisse imprimer correctement au fur et a mesure
} }

99
samples/map_slack Normal file
View File

@@ -0,0 +1,99 @@
...#
...#
..##
....
#...
###.
....
....
.#..
.#..
##..
....
...#
...#
..##
....
...#
...#
..##
....
#...
###.
....
....
.#..
.#..
##..
....
...#
...#
..##
....
...#
...#
..##
....
#...
###.
....
....
.#..
.#..
##..
....
...#
...#
..##
....
...#
...#
..##
....
#...
###.
....
....
.#..
.#..
##..
....
...#
...#
..##
....
...#
...#
..##
....
#...
###.
....
....
.#..
.#..
##..
....
...#
...#
..##
....

4
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/20 15:41:59 by hulamy ### ########.fr */ /* Updated: 2019/05/20 15:50:12 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -279,7 +279,6 @@ int check_same_tetri(t_fillist *list, int num)
curr_tetri = list; curr_tetri = list;
while (curr_tetri != NULL) while (curr_tetri != NULL)
{ {
curr_tetri->same = NULL;
i = 0; i = 0;
if (!(curr_tetri->memory = (unsigned int *)malloc(sizeof(*curr_tetri->memory) * num))) if (!(curr_tetri->memory = (unsigned int *)malloc(sizeof(*curr_tetri->memory) * num)))
return (0); return (0);
@@ -342,6 +341,7 @@ int search_map(t_fillist *list)
map[num--] = 0; map[num--] = 0;
i = fill_map(map, list, size++); i = fill_map(map, list, size++);
} }
ft_putendl("result in binary :");
print_map(map, size - 1, size - 1, '#'); // DEBUG print_map(map, size - 1, size - 1, '#'); // DEBUG
return (--size); return (--size);
} }