get new files from ykolomie

.gitignore

@@ -35,5 +35,11 @@
 # Vim temp
 *.swp
 
+<<<<<<< HEAD
+CMakeLists.txt
+.idea/
+**/cmake-build-debug/*
+=======
 # Sublime files
 *.sublime*
+>>>>>>> github/develop

Makefile

@@ -6,7 +6,7 @@
 #    By: gtertysh <marvin@42.fr>                    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2016/12/14 16:54:48 by gtertysh          #+#    #+#              #
-#    Updated: 2016/12/20 19:05:59 by gtertysh         ###   ########.fr        #
+#    Updated: 2016/12/20 20:05:58 by ykolomie         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -46,12 +46,14 @@ LIBFOLDER = ./libft/
 
 FLAGS = -Werror -Wextra -Wall
 
+STACK = -Wl,-stack_size -Wl,0x10000000000
+
 CC = clang
 
 all: $(NAME)
 
 $(NAME): $(OBJ) $(LIBFOLDER)$(LIB)
-	$(CC) $(FLAGS) $(OBJ) $(LIBFLAGS) -o $(NAME)
+	$(CC) $(FLAGS) $(STACK) $(OBJ) $(LIBFLAGS) -o $(NAME)
 
 $(OBJDIR)%.o : $(SRCDIR)%.c
 	$(CC) $(FLAGS) $(INC) -c $< -o $@  

src/dancing_links.c

@@ -12,67 +12,71 @@
 
 #include "fillit.h"
 
-// t_col   *add_column(t_col *root)
-// {
-//     t_col   *new_col;
+t_node   *add_column(t_node *root)
+{
+    t_node   *new_col;
 
-//     new_col = (t_col*)malloc(sizeof(t_col));
-//     new_col->down = (void*)new_col;
-//     new_col->up = (void*)new_col;
-//     new_col->left = root->left;
-//     new_col->right = root;
-//     return (new_col);
-// }
+    new_col = (t_node*)malloc(sizeof(t_node));
+    new_col->down = new_col;
+    new_col->up = new_col;
+    new_col->left = root->left;
+    new_col->right = root;
+    new_col->row = -1;
+    new_col->column = NULL;
+    return (new_col);
+}
 
-// t_node  *add_node(t_col *col, int row)
-// {
-//     t_node  *new_node;
+t_node  *add_node(t_node *col, int row)
+{
+    t_node  *new_node;
 
-//     new_node = (t_node*)malloc(sizeof(t_node));
-//     new_node->row = row;
-//     new_node->up = (t_node*)col->up;
-//     new_node->down = (t_node*)col;
-//     col->up->down = new_node;
-//     col->up = new_node;
-//     return (new_node);
-// }
+    new_node = (t_node*)malloc(sizeof(t_node));
+    new_node->row = row;
+    new_node->up = col->up;
+    new_node->down = col;
+    col->up->down = new_node;
+    col->up = new_node;
+    return (new_node);
+}
 
-// void    cover(t_col *to_cover)
-// {
-//     void    *step_vert;
-//     t_node  *step_horiz;
+void    cover(t_col *to_cover)
+{
+    void    *step_vert;
+    t_node  *step_horiz;
 
-//     to_cover->left->right = to_cover->right;
-//     to_cover->right->left = to_cover->left;
-//     step_vert = to_cover->down;
-//     while (step_vert != (void*)to_cover)
-//     {
-//         step_horiz = (t_node*)step_vert->right;
-//         while (step_horiz != (t_node*)step_vert) {
-//             step_horiz->down->up = step_horiz->up;
-//             step_horiz->up->down = step_horiz->down;
-//             step_horiz = step_horiz->right;
-//         }
-//         step_vert = (t_node*)step_vert->down;
-//     }
-// }
+    to_cover->left->right = to_cover->right;
+    to_cover->right->left = to_cover->left;
+    step_vert = to_cover->down;
+    while (step_vert != to_cover)
+    {
+        step_horiz = step_vert->right;
+        while (step_horiz != step_vert) {
+            step_horiz->down->up = step_horiz->up;
+            step_horiz->up->down = step_horiz->down;
+            step_horiz = step_horiz->right;
+        }
+        step_vert = step_vert->down;
+    }
+}
 
-// void    uncover(t_col *to_uncover)
-// {
-//     void   *step_vert;
-//     t_node *step_horiz;
+void    uncover(t_col *to_uncover)
+{
+    void   *step_vert;
+    t_node *step_horiz;
 
-//     step_vert = to_uncover->up;
-//     while (step_vert != (void*)to_uncover)
-//     {
-//         step_horiz = (t_node*)step_vert->left;
-//         while (step_horiz != (t_node*)step_vert)
-//         {
-//             step_horiz->down->up = step_horiz;
-//             step_horiz->up->down = step_horiz;
-//             step_horiz = step_horiz->left;
-//         }
-//         step_vert = (t_node*)step_vert->up;
-//     }
-// }
+    step_vert = to_uncover->up;
+    while (step_vert != to_uncover)
+    {
+        step_horiz = step_vert->left;
+        while (step_horiz != step_vert)
+        {
+            step_horiz->down->up = step_horiz;
+            step_horiz->up->down = step_horiz;
+            step_horiz = step_horiz->left;
+        }
+        step_vert = step_vert->up;
+    }
+    to_uncover->left->right = to_uncover;
+    to_uncover->right->left = to_uncover;
+}
 

src/fillit.c

@@ -1,4 +1,4 @@
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 unsigned int	ft_sqrt_ceil(unsigned int num)
 {
@@ -26,7 +26,7 @@ void	 convert_tetramino(char *s, t_map *map, int index)
 	int				y;
 	int				sharp_count;
 
-	map->figure[index]->offset_y = 0;
+	map->figure[index].offset_y = 0;
 	sharp_count = 0;
 	i = 0;
 	y = 1;
@@ -41,10 +41,10 @@ void	 convert_tetramino(char *s, t_map *map, int index)
 
 		}
 		temp = temp << 12;
-		map->figure[index]->line[y - 1] = temp;
+		map->figure[index].line[y - 1] = temp;
 		y++;
 	}
-	map->figure[index]->height = y - 1;
+	map->figure[index].height = y - 1;
 }
 
 void	map_initialization(char **tetramino_table, t_map *map)
@@ -58,6 +58,7 @@ void	map_initialization(char **tetramino_table, t_map *map)
 	map->size = ft_sqrt_ceil(i * 4);
 	map->mask = 1;
 	map->mask <<= 16 - map->size;
+    map->ok = 0;
 	clear_map(map);
 }
 
@@ -111,32 +112,60 @@ int		can_insert(t_map *map, int index)
 	}
 	return (1);
 }
+
 int		shift_tetramino(t_map *map, int index)
 {
-	int left_shift;
-	int i;
-	int k;
+	int right_shift;
+	unsigned int i;
+	unsigned int k;
 	t_tetrominoes *temp;
 
 	temp = &map->figure[index];
 	i = temp->offset_y;
 	k = i + temp->height;
-	left_shift = 1;
+	right_shift = 1;
 	while (i < k)
 		if (temp->line[i++] & map->mask)
-			left_shift = 0;
+			right_shift = 0;
 	i = temp->offset_y;
-	if (left_shift)
+	if (right_shift && ++(temp->offset_x))
 		while (i < k)
 			temp->line[i++] >>= 1;
-	else if (k < map->size)
-		while(k-- > i)
-		{
-			while (!(temp->line[k] & 0x8000))
-				temp->line[k] <<= 1;
+	else if (k < map->size && ++(temp->offset_y)) {
+        while (k-- > i) {
+            temp->line[k] <<= temp->offset_x;
             temp->line[k + 1] = temp->line[k];
+        }
+        temp->offset_x = 0;
     }
 	else
 		return (0);
 	return (1);
 }
+
+
+t_map algorithm(t_map map, unsigned int index)
+{
+    int ins = 0;
+    t_map copy;
+
+    if (index == map.figure_amount) {
+        map.ok = 1;
+        return map;
+    }
+    while (!(ins = can_insert(&map, index)))
+        if (!shift_tetramino(&map, index))
+            break;
+    if (ins)
+    {
+        copy = map;
+        insert_tetramino(&map, index);
+        map = algorithm(map, index + 1);
+        if (!map.ok)
+        {
+            shift_tetramino(&copy, index);
+            map = algorithm(copy, index);
+        }
+    }
+    return map;
+}

src/glue_figure.c

@@ -6,11 +6,11 @@
 /*   By: gtertysh <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/14 17:12:30 by gtertysh          #+#    #+#             */
-/*   Updated: 2016/12/14 17:12:32 by gtertysh         ###   ########.fr       */
+/*   Updated: 2016/12/20 20:06:22 by ykolomie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 // This function creates string table in which one line represent one figure
 // by "glueing" evry 4 strings from table

src/main.c

@@ -6,11 +6,11 @@
 /*   By: gtertysh <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/10 16:07:25 by gtertysh          #+#    #+#             */
-/*   Updated: 2016/12/20 19:21:09 by gtertysh         ###   ########.fr       */
+/*   Updated: 2016/12/20 20:05:29 by ykolomie         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 /*
 **	bad global variable 
@@ -57,8 +57,7 @@ int		main(int argc, char **argv)
 	{
 		ft_putstr("error\n");
 		return (1);
-	}
-	//printf("string:\n\n\n%s\n", string);
+	}	//printf("string:\n\n\n%s\n", string);
 
 	table = to_table(&string);
 	//printf("print_table:\n\n\n");

src/move_up_left.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 // Moves figures to top left corner.
 // table contains strings each represent one figure

src/read_file.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 // read from file. Returns string.
 char	*read_file(char *path)
@@ -24,7 +24,7 @@ char	*read_file(char *path)
 	readed = 0;
 	string = 0;
 	old_size = 0;
-	if (!(fd = open(path, O_RDONLY)))
+	if ((fd = open(path, O_RDONLY)) == -1)
 	{
 		ft_putstr("error\n");
 		return (0);

src/string_to_table.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 // Split string to table by newline character. 
 // Each string contain one line of the file

src/test!_check.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 // Test func. Compare figures from file
 // with templates

src/test!_print_one_string.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 // Test func. Print table but one string contain whole figure.
 void	print_one_string(t_ttrmn ttr)

src/test!_print_table.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 // Test func. Print string table, 
 // each line - line of tetromino figure.

src/to_letters.c

@@ -10,7 +10,7 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "fillit.h"
+#include "../inc/fillit.h"
 
 // convert "#" symbols to letters
 // rewrite for new method with structures

tests/sample.fillit

@@ -18,27 +18,4 @@
 .##.
 ....
 
-....
-..#.
-.##.
-.#..
 
-....
-....
-.##.
-##..
-
-....
-....
-..##
-.##.
-
-....
-...#
-...#
-..##
-
-....
-....
-...#
-.###

tests/sample1.fillit

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