diff --git a/main.c b/main.c index 8d39b57..9afa677 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* 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_extended(check_file_errors(input)); size = parse_input(input, &list); - ft_putnbrendl(size); + ft_putchar('\n'); + ft_putendl("result for humans :"); print_final_map(list, size, 1); // DEBUG + ft_putchar('\n'); + ft_putendl("result for moulinette :"); print_final_map(list, size, 0); // DEBUG } else diff --git a/parse_input.c b/parse_input.c index 933983b..892750b 100644 --- a/parse_input.c +++ b/parse_input.c @@ -6,7 +6,7 @@ /* 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++; list->height = i; 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 } diff --git a/samples/map_slack b/samples/map_slack new file mode 100644 index 0000000..6f6a1e5 --- /dev/null +++ b/samples/map_slack @@ -0,0 +1,99 @@ +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... + +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... + +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... + +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... + +...# +...# +..## +.... + +#... +###. +.... +.... + +.#.. +.#.. +##.. +.... + +...# +...# +..## +.... diff --git a/search_map.c b/search_map.c index eb0cfba..fb36681 100644 --- a/search_map.c +++ b/search_map.c @@ -6,7 +6,7 @@ /* 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; while (curr_tetri != NULL) { - curr_tetri->same = NULL; i = 0; if (!(curr_tetri->memory = (unsigned int *)malloc(sizeof(*curr_tetri->memory) * num))) return (0); @@ -342,6 +341,7 @@ int search_map(t_fillist *list) map[num--] = 0; i = fill_map(map, list, size++); } + ft_putendl("result in binary :"); print_map(map, size - 1, size - 1, '#'); // DEBUG return (--size); }