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

derniere erreur de valgrind resolu mais a tester sur les mauvais tetri

Browse Source
This commit is contained in:
Hugo LAMY
2019-05-29 15:53:08 +02:00
parent 819a14407d 2bc1f50b46
commit e7e944f1ac
20 changed files with 38 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
.gitignore vendored
View File

@@ -13,3 +13,7 @@ a\.out
fillit fillit
test_fillit\.c test_fillit\.c
libft
\.DS_Store

2
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/17 17:11:53 by hulamy ### ########.fr # # Updated: 2019/05/29 14:03:03 by vmanzoni ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #

6
README.md
View File

@@ -18,5 +18,7 @@ Le but de ce projet est d’agencer les Tetriminos entre eux pour former le plus
## BONUS ## BONUS
- [x] Best error handler (more details on why there is an error.) - [x] Best error handler (more details on why there is an error.)
- [ ] Optimisation - [x] Optimisation (skip when tetri with same shape was already tested on map)
- [ ] Add colors to tetri when printing result map - [x] Add colors to tetri when printing result map
- [x] Flag for debbuging (print every step in backtracking)
- [x] Adding flags (and password for blocking more args on moulinette)

4
f_handle_errors.c
View File

@@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* handle_errors.c :+: :+: :+: */ /* f_handle_errors.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */
/* Updated: 2019/05/29 15:51:12 by hulamy ### ########.fr */ /* Updated: 2019/05/29 15:52:44 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

10
f_read_file.c
View File

@@ -18,11 +18,11 @@
char *read_file(char *file) char *read_file(char *file)
{ {
char buf[BUFF_SIZE]; char buf[BUFF_SIZE];
int fd; int fd;
int rv; size_t rv;
int i; int i;
char *result; char *result;
if (((fd = open(file, O_RDONLY)) < 0) \ if (((fd = open(file, O_RDONLY)) < 0) \
|| ((rv = read(fd, &buf, BUFF_SIZE)) < 0) \ || ((rv = read(fd, &buf, BUFF_SIZE)) < 0) \

8
f_search_map.c
View File

@@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* search_map.c :+: :+: :+: */ /* f_search_map.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* 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/28 18:19:15 by hulamy ### ########.fr */ /* Updated: 2019/05/29 13:37:51 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -135,14 +135,14 @@ int fill_map(unsigned int *map, t_fillist *list, int size)
} }
/* /*
** function that send to "fill_map" a map of a certain size ** Function that send to "fill_map" a map of a certain size
** and increment its size untill it's solved ** and increment its size untill it's solved
*/ */
int search_map(t_fillist *list) int search_map(t_fillist *list)
{ {
t_fillist *tmp; t_fillist *tmp;
unsigned int *map; unsigned int *map = NULL;
int size; int size;
int num; int num;
int i; int i;

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>

25
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/28 16:51:44 by hulamy ### ########.fr */ /* Updated: 2019/05/29 13:31:37 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -14,10 +14,9 @@
# define FILLIT_H # define FILLIT_H
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> // for system call write #include <unistd.h>
#include <fcntl.h> // for system call open #include <fcntl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> // for printf (DELETE BEFORE EVAL)
#include "libft/includes/libft.h" #include "libft/includes/libft.h"
@@ -35,6 +34,10 @@
#define CYN "\x1B[36m" #define CYN "\x1B[36m"
#define RESET "\x1B[0m" #define RESET "\x1B[0m"
/*
** Color for full block tetriminos when printing colored map
** (don't forget to comment all #define COLOR above)
*/
//#define RED "\e[41m" //#define RED "\e[41m"
//#define GRN "\e[42m" //#define GRN "\e[42m"
//#define YEL "\e[43m" //#define YEL "\e[43m"
@@ -53,12 +56,12 @@
** rank : position de 1 a 32 dans l'int du tableau d'int (position % 32) ** rank : position de 1 a 32 dans l'int du tableau d'int (position % 32)
** num : memorise dans quel int du tableau on se trouve (position / 32) ** num : memorise dans quel int du tableau on se trouve (position / 32)
** test : ** test :
** letter : ** letter : letter of the tetrimino for printing final map
** dope : ** dope : flags for details, optimisation, printing and error
** memory : ** memory : positions already tested by a tetrimino in bitwise
** same : ** same : pointer to previous identical tetrimino
** next : ** next : pointer to next tetrimino
** start : ** start : pointer to first tetrimino of input file
*/ */
typedef struct s_fillist typedef struct s_fillist
{ {
@@ -140,6 +143,6 @@ char *init_print_map(t_fillist *list, int size);
void print_letter_map(t_fillist *list, int size, int flag); void print_letter_map(t_fillist *list, int size, int flag);
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);
#endif #endif

1
libft
View File

@@ -1 +0,0 @@
../03_libft

8
main.c
View File

@@ -6,14 +6,14 @@
/* 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/28 17:26:07 by hulamy ### ########.fr */ /* Updated: 2019/05/29 13:27:14 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "fillit.h" #include "fillit.h"
/* /*
** function that put the flags for bonus into a tab of int ** Function that put the flags for bonus into a tab of int
** **
** d : debug print (print the map during the backtracking) ** d : debug print (print the map during the backtracking)
** o : optimisation ultra fast but with some errors still ** o : optimisation ultra fast but with some errors still
@@ -45,7 +45,7 @@ int *create_dope(char *av, int mdp)
} }
/* /*
** function that check if the password is good to unlock the flags ** Function that check if the password is good to unlock the flags
*/ */
int is_mdp(int ac, char **av) int is_mdp(int ac, char **av)
@@ -67,7 +67,7 @@ int is_mdp(int ac, char **av)
} }
/* /*
** main function ** Main function
*/ */
int main(int ac, char **av) int main(int ac, char **av)

40
samples/map_hard
View File

@@ -47,43 +47,3 @@
.#.. .#..
##.. ##..
.... ....
.#..
.#..
##..
....
...#
...#
..##
....
#...
###.
....
....
.#..
.#..
##..
....
.#..
.#..
##..
....
...#
...#
..##
....
#...
###.
....
....
.#..
.#..
##..
....

0
test_add_to_list.c → test_files/test_add_to_list.c
View File

0
test_big_map.c → test_files/test_big_map.c
View File

0
test_big_tetri.c → test_files/test_big_tetri.c
View File

0
test_get_smallest_square.c → test_files/test_get_smallest_square.c
View File

0
test_mask.c → test_files/test_mask.c
View File

0
test_othermethod_fillit.c → test_files/test_othermethod_fillit.c
View File

0
test_print_fillit.c → test_files/test_print_fillit.c
View File

0
test_search_map2.c → test_files/test_search_map2.c
View File