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

First version with working test (read and print file)

Browse Source
This commit is contained in:
Manzovince
2019-04-14 12:15:25 +02:00
parent 1ce59774b8
commit 481d683467
28 changed files with 637 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
includes/fillit.h
View File

@@ -6,10 +6,13 @@
/* 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/03/01 13:35:08 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:13:35 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef FILLIT_H
# define FILLIT_H
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> // for system call write #include <unistd.h> // for system call write
#include <fcntl.h> // for system call open #include <fcntl.h> // for system call open
@@ -18,3 +21,18 @@
#include <stdbool.h> // to use bool type #include <stdbool.h> // to use bool type
# define BUFFER_SIZE 1024 # define BUFFER_SIZE 1024
/*
** DELETE BEFORE EVALUATION
*/
void print_test(char *test);
/*
** FUNCTIONS
*/
char *read_file(char *file);
void ft_display_error(char *s, int fd);
#endif

4
samples/42 Normal file
View File

@@ -0,0 +1,4 @@
4242
4242
4242
4242

19
samples/Non_valide Normal file
View File

@@ -0,0 +1,19 @@
...#
...#
...#
...#
....
....
....
####
.###
...E
....
....
####
####
####
####

19
samples/Valide1 Normal file
View File

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

BIN
samples/backslash_0 Normal file
View File

Binary file not shown.

4
samples/bad_test Normal file
View File

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

114
samples/difficile Normal file
View File

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

114
samples/difficile_ou_pas Normal file
View File

@@ -0,0 +1,114 @@
....
....
..##
.##.
....
.##.
..#.
..#.
....
....
..##
.##.
....
....
..##
.##.
....
....
..##
.##.
....
....
..##
.##.
....
....
..##
.##.
....
....
..##
.##.
....
....
###.
.#..
....
....
..##
.##.
....
....
..##
.##.
....
....
..##
.##.
....
....
..##
.##.
....
.###
..#.
....
....
....
..##
.##.
....
....
..##
.##.
..#.
..#.
..#.
..#.
....
....
..##
.##.
....
....
..##
.##.
....
..#.
..#.
..##
....
....
..##
.##.
....
....
..##
.##.
....
....
####
....iskjdslkfsljklfdjk

0
samples/empty Normal file
View File

19
samples/full Normal file
View File

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

20
samples/invalid_sample Normal file
View File

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

1
samples/newline Normal file
View File

@@ -0,0 +1 @@

4
samples/one Normal file
View File

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

4
samples/square Normal file
View File

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

19
samples/sujet_1 Normal file
View File

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

39
samples/sujet_2 Normal file
View File

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

34
samples/test7 Normal file
View File

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

54
samples/test_11 Normal file
View File

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

39
samples/test_8 Normal file
View File

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

4
samples/two Normal file
View File

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

19
samples/valid_sample Normal file
View File

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

20
samples/valid_sample_with_newline Normal file
View File

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

4
srcs/get_smallest_square.c
View File

@@ -6,10 +6,12 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/12 22:29:45 by vmanzoni #+# #+# */ /* Created: 2019/04/12 22:29:45 by vmanzoni #+# #+# */
/* Updated: 2019/04/12 22:30:32 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:02:22 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../includes/fillit.h"
char *get_smallest_square(/*args*/) char *get_smallest_square(/*args*/)
{ {
/*backtracking*/ /*backtracking*/

8
srcs/handle_errors.c
View File

@@ -6,16 +6,20 @@
/* 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/04/12 22:27:28 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:06:40 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../includes/fillit.h"
void ft_display_error(char *s, int fd) void ft_display_error(char *s, int fd)
{ {
write(fd, s, strlen(s)); write(fd, s, strlen(s));
} }
int ft_tetri_erros(/*args*/) /*
int ft_tetri_erros()
{ {
} }
*/

9
srcs/main.c
View File

@@ -6,10 +6,12 @@
/* 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/04/12 22:27:42 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:13:42 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../includes/fillit.h"
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
char *input; char *input;
@@ -19,8 +21,8 @@ int main(int argc, char **argv)
{ {
if (!(input = read_file(argv[1]))) if (!(input = read_file(argv[1])))
ft_display_error("Error: Could not read file.\n", 2); ft_display_error("Error: Could not read file.\n", 2);
else if (/*Elements in file not valid*/) // else if (/*Elements in file not valid*/)
ft_display_error("Error: Invalid file.\n", 2); // ft_display_error("Error: Invalid file.\n", 2);
/* /*
Transform input to tetriminos Transform input to tetriminos
Check if every tetrimino is valid Check if every tetrimino is valid
@@ -28,6 +30,7 @@ int main(int argc, char **argv)
Transform tetriminos with letters Transform tetriminos with letters
Print result Print result
*/ */
print_test(input);
} }
else else
ft_display_error("Error: Please submit a file.\n", 2); ft_display_error("Error: Please submit a file.\n", 2);

13
srcs/print_fillit.c
View File

@@ -6,11 +6,20 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:35:48 by vmanzoni #+# #+# */ /* Created: 2019/03/01 13:35:48 by vmanzoni #+# #+# */
/* Updated: 2019/04/12 22:26:27 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:13:16 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
void ft_print_fillit(/*args*/) #include "../includes/fillit.h"
/*
void ft_print_fillit()
{ {
} }
*/
void print_test(char *test)
{
write(1, test, strlen(test));
}

36
srcs/read_file.c Normal file
View File

@@ -0,0 +1,36 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* read_file.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/13 12:09:46 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 12:08:12 by vmanzoni ### ########.fr */
/* */
/* ************************************************************************** */
#include "../includes/fillit.h"
char *read_file(char *file)
{
char buf[BUFFER_SIZE];
int fd;
int rv;
int i;
char *result;
if (((fd = open(file, O_RDONLY)) < 0) \
|| ((rv = read(fd, &buf, BUFFER_SIZE)) < 0) \
|| !(result = malloc(sizeof(char))))
return (NULL);
buf[rv] = '\0';
i = 0;
while (rv--)
{
result[i] = buf[i];
i++;
}
close(fd);
return (result);
}

6
srcs/tetri_to_letters.c
View File

@@ -6,11 +6,13 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */ /* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/12 22:31:30 by vmanzoni #+# #+# */ /* Created: 2019/04/12 22:31:30 by vmanzoni #+# #+# */
/* Updated: 2019/04/12 22:31:51 by vmanzoni ### ########.fr */ /* Updated: 2019/04/14 12:08:58 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
char *tetri_to_letters(/*args*/) #include "../includes/fillit.h"
char *tetri_to_letters()
{ {
} }