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

basic corrections

Browse Source
This commit is contained in:
Manzovince
2019-04-14 14:24:50 +02:00
parent fde6674fd5
commit b4c1857d88
11 changed files with 315 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -6,7 +6,7 @@
# By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2019/03/01 13:24:35 by vmanzoni #+# #+# #
# Updated: 2019/04/12 22:33:31 by vmanzoni ### ########.fr #
# Updated: 2019/04/14 14:21:26 by vmanzoni ### ########.fr #
# #
# **************************************************************************** #
@@ -28,18 +28,18 @@ CC = gcc
CFLAGS = -Wall -Werror -Wextra
RM = rm -f
RM = rm -rf
all: $(NAME)
$(NAME)
$(NAME):
$(CC) $(CFLAGS) -I$(HEADER) -c $(addprefix $(SRC_DIR), $(SRCS))
$(CC) $(OBJS) -o $(NAME)
mkdir $(OBJ_DIR)
mv *.o $(OBJ_DIR)
mv $(OBJS) $(OBJ_DIR)
clean:
$(RM) $(OBJS)
$(RM) $(OBJ_DIR)
fclean: clean
$(RM) $(NAME)

1
author
View File

@@ -1 +1,2 @@
hulamy
vmanzoni

129
samples/26tetri Normal file
View File

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

134
samples/27tetri Normal file
View File

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

10
samples/2nl Normal file
View File

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

19
samples/Valide1
View File

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

8
srcs/get_smallest_square.c
View File

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

16
srcs/handle_errors.c
View File

@@ -6,17 +6,28 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/01 13:29:05 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 12:35:46 by vmanzoni ### ########.fr */
/* Updated: 2019/04/14 14:16:01 by vmanzoni ### ########.fr */
/* */
/* ************************************************************************** */
#include "../includes/fillit.h"
/*
** Function that display error message *s on fd
*/
void ft_display_error(char *s, int fd)
{
write(fd, s, strlen(s));
}
/*
** Function to see if there if an error if the file
** - less than 4 lines
** - more than 104 (26 tetri) + 25 (\n) = 129 lines
** - two \n in a row
*/
int ft_file_errors(char *file)
{
int line_nbr;
@@ -27,8 +38,9 @@ int ft_file_errors(char *file)
if (*file == '\n')
line_nbr++;
file++;
if (*file == '\n')
return (1);
}
/*less than 4 lines or more than 104 (26 tetri) + 25 = 129 lines*/
if (line_nbr < 4 || line_nbr > 129)
return (1);
return (0);

39
srcs/main.c
View File

@@ -6,7 +6,7 @@
/* By: vmanzoni <vmanzoni@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */
/* Updated: 2019/04/14 12:44:14 by vmanzoni ### ########.fr */
/* Updated: 2019/04/14 14:17:22 by vmanzoni ### ########.fr */
/* */
/* ************************************************************************** */
@@ -15,30 +15,23 @@
int main(int argc, char **argv)
{
char *input;
short i;
if (argc != 2)
if (argc == 2)
{
if (!(input = read_file(argv[1])))
ft_display_error("Error: Could not read file.\n", 2);
if (ft_file_errors(input))
ft_display_error("Error: Invalid file.\n", 2);
/*
Check if every tetrimino is valid
Transform input to tetriminos
Backtracking for smallest square
Transform tetriminos with letters
Print result
*/
}
else
ft_display_error("Error: Please submit a file.\n", 2);
return (0);
}
else if (!(input = read_file(argv[1])))
{
ft_display_error("Error: Could not read file.\n", 2);
return (0);
}
else if (ft_file_errors(input))
{
ft_display_error("Error: Invalid file.\n", 2);
return (0);
}
/*
Check if every tetrimino is valid
Transform input to tetriminos
Backtracking for smallest square
Transform tetriminos with letters
Print result
*/
print_test(input);
return (0);
print_test(input);
}

2
srcs/read_file.c
View File

@@ -6,7 +6,7 @@
/* 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 */
/* Updated: 2019/04/14 14:23:24 by vmanzoni ### ########.fr */
/* */
/* ************************************************************************** */

18
srcs/tetri_to_letters.c
View File

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