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

merging solve conflict

Browse Source
This commit is contained in:
Hugo LAMY
2019-04-18 10:56:55 +02:00
parent f592c3cede 4462517caf
commit 041aa6c9b5
8 changed files with 102 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.test_mask.c.swp Normal file
View File

Binary file not shown.

10
Makefile
View File

@@ -6,18 +6,18 @@
# 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/04/16 15:35:04 by hulamy ### ########.fr # # Updated: 2019/04/16 16:39:00 by vmanzoni ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
NAME = fillit NAME = fillit
OBJ_DIR = objs./ OBJ_DIR = objs./
HEADER = includes./ HEADER = fillit.h
SRCS = *.c SRCS = *.c
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
LIB = fillit.h LIB = libft/
CC = gcc CC = gcc
CFLAGS = -Wall -Werror -Wextra CFLAGS = -Wall -Werror -Wextra
@@ -29,9 +29,7 @@ all: $(NAME)
$(NAME): $(NAME):
make -C libft/ make -C libft/
$(CC) $(CFLAGS) -I$(HEADER) -c $(SRCS) $(CC) $(CFLAGS) -I$(HEADER) -c $(SRCS)
$(CC) -o $(NAME) $(OBJS) -L libft/ -lft $(CC) -o $(NAME) $(OBJS) -L $(LIB) -lft
#$(CC) $(CFLAGS) -I$(HEADER) -c $(addprefix $(SRC_DIR), $(SRCS))
#$(CC) $(OBJS) -o $(NAME)
mkdir $(OBJ_DIR) mkdir $(OBJ_DIR)
mv $(OBJS) $(OBJ_DIR) mv $(OBJS) $(OBJ_DIR)

2
add_to_list.c
View File

@@ -6,7 +6,7 @@
/* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */ /* By: hulamy <hulamy@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/14 15:20:53 by hulamy #+# #+# */ /* Created: 2019/04/14 15:20:53 by hulamy #+# #+# */
/* Updated: 2019/04/16 16:08:24 by hulamy ### ########.fr */ /* Updated: 2019/04/18 10:56:38 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

BIN
fillit Executable file
View File

Binary file not shown.

4
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/04/15 20:54:24 by vmanzoni ### ########.fr */ /* Updated: 2019/04/16 16:41:28 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -24,12 +24,10 @@ int main(int argc, char **argv)
print_error("Error: Invalid file.\n"); print_error("Error: Invalid file.\n");
parse_input(input); parse_input(input);
/* /*
Transform input to tetriminos
Backtracking for smallest square Backtracking for smallest square
Transform tetriminos with letters Transform tetriminos with letters
Print result Print result
*/ */
//print_test(input);
} }
else else
print_error("Usage: Please submit a file.\n"); print_error("Usage: Please submit a file.\n");

4
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/04/16 16:08:03 by hulamy ### ########.fr */ /* Updated: 2019/04/18 10:56:19 by hulamy ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -35,7 +35,6 @@ char **create_square(char *tetri)
square[i][k] = *(tetri++); square[i][k] = *(tetri++);
while (*tetri == '\n') while (*tetri == '\n')
tetri++; tetri++;
// printf("%s\n", square[i]);
i++; i++;
} }
return (square); return (square);
@@ -56,7 +55,6 @@ void parse_input(char *input)
while (j < 19) while (j < 19)
tetri[j++] = input[i++]; tetri[j++] = input[i++];
tetri[19] = '\0'; tetri[19] = '\0';
//printf("PRINT:\n%s\n", tetri);
if (check_tetri_errors(tetri)) if (check_tetri_errors(tetri))
print_error("Error: Tetrimino not valid."); print_error("Error: Tetrimino not valid.");
test = create_square(tetri); test = create_square(tetri);

7
print_fillit.c
View File

@@ -6,7 +6,7 @@
/* 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/15 00:11:22 by hulamy ### ########.fr */ /* Updated: 2019/04/16 16:41:46 by vmanzoni ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -18,8 +18,3 @@ void ft_print_fillit()
} }
*/ */
void print_test(char *test)
{
write(1, test, strlen(test));
}

92
test_mask.c Normal file
View File

@@ -0,0 +1,92 @@
#include "libft.h"
void print_bits(int octet)
{
int i;
int j;
i = 1 << 12;
// i = 4096;
while (i >>= 1)
(octet & i) ? ft_putnbr(1) : ft_putnbr(0);
ft_putchar('\n');
}
void compare(int initial, int compare)
{
compare ^= (1 << 3);
print_bits(compare);
ft_putchar('\n');
/*
// il faut utiliser le & car il transforme
// 0+0=0 1+0=0 0+1=0 mais 1+1=1
// donc si rien ne se superpose on obtient 0
// et si un seul bit se superpose on obtient 1
// (penser a l'utiliser a l'envers donc)
*/
while (initial & compare)
{
print_bits(initial);
print_bits(compare);
print_bits(initial & compare);
!(initial & compare) ? ft_putendl("&: fit") : ft_putendl("&: not fit");
compare >>= 1;
}
print_bits(initial);
print_bits(compare);
print_bits(initial & compare);
!(initial & compare) ? ft_putendl("&: fit") : ft_putendl("&: not fit");
/*
// j = 1 << 12;
// while (j >>= 1)
// (initial | compare) & j ? ft_putnbr(1) : ft_putnbr(0);
// ft_putchar('\n');
// (initial | compare) ? ft_putendl("|: fit") : ft_putendl("|: not fit");
// j = 1 << 12;
// while (j >>= 1)
// (initial ^ compare) & j ? ft_putnbr(1) : ft_putnbr(0);
// ft_putchar('\n');
// (initial ^ compare) ? ft_putendl("^: fit") : ft_putendl("^: not fit");
*/
}
int main(int ac, char **av)
{
int i;
int j;
// i = 56173;
// j = 9362;
i = 9622;
j = 27;
if (ac > 0)
{
if (ac > 1)
ft_putendl(ft_convertbase(av[1], "0123456789", "01"));
print_bits(i);
print_bits(j);
compare(i, j);
}
return (0);
}
/*
**int main(int ac, char **av)
**{
** int init;
** int mask;
**
** mask = (1 << 4);
** if (ac == 4)
** {
** ft_putendl(ft_convertbase(av[1], av[2], av[3]));
** ft_putnbrendl(init);
** init |= mask;
** ft_putnbrendl(init);
** }
** return (0);
**}
*/