diff --git a/Makefile b/Makefile index 747db20..879383e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: gfantoni +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/01/26 11:03:46 by josfelip #+# #+# # -# Updated: 2024/02/21 18:00:55 by gfantoni ### ########.fr # +# Updated: 2024/02/26 16:53:46 by gfantoni ### ########.fr # # # # **************************************************************************** # @@ -32,7 +32,14 @@ HEADER = $(HEADER_PATH)push_swap.h OBJ_PATH = ./obj/ DEBUG_OBJ_PATH = ./obj_debug/ SOURCES_PATH = ./sources/ -SOURCES = 00_main.c 01_user_input_validation.c 02_indexing.c 03_do_moves.c 03_moves.c 04_pre_sort.c 05_target_position.c 06_comp_cost.c 07_cheapest_move.c 08_sort.c 09_push_swap.c 10_dial.c 93_utils.c 94_utils.c 95_utils.c 96_utils.c 97_utils.c 98_utils.c 99_2_utils.c 99_utils.c +SOURCES = 00_main.c 01_user_input_validation.c 02_indexing.c 03_do_moves.c \ + 03_moves.c 04_pre_sort.c 05_target_position.c 06_comp_cost.c \ + 07_cheapest_move.c 08_sort.c 09_push_swap.c 10_dial.c 93_utils.c \ + 94_utils.c 95_utils.c 96_utils.c 97_utils.c 98_utils.c 99_2_utils.c \ + 99_utils.c \ + bst_breadth.c bst_check_node.c bst_del_utils.c bst_min_max.c \ + bst_nodes.c bst_traversal.c + MANDATORY_SOURCES = $(addprefix $(SOURCES_PATH), $(SOURCES)) ifdef WITH_DEBUG diff --git a/lib/sources/bst/includes/bst.h b/includes/bst.h similarity index 93% rename from lib/sources/bst/includes/bst.h rename to includes/bst.h index 220328e..e458aa3 100644 --- a/lib/sources/bst/includes/bst.h +++ b/includes/bst.h @@ -6,15 +6,14 @@ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/26 16:17:51 by gfantoni #+# #+# */ -/* Updated: 2024/02/26 16:34:45 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:49:13 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef BST_H # define BST_H -//# include -# include "../../functions/includes/functions.h" +# include "../lib/includes/libft.h" # define TRUE 1 # define FALSE 0 diff --git a/includes/push_swap.h b/includes/push_swap.h index 0e4a587..5d24d5a 100644 --- a/includes/push_swap.h +++ b/includes/push_swap.h @@ -6,21 +6,19 @@ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/30 10:52:24 by josfelip #+# #+# */ -/* Updated: 2024/02/26 09:18:48 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:51:08 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ #ifndef PUSH_SWAP_H # define PUSH_SWAP_H -# ifndef DEBUG -# define DEBUG 0 -# endif - # include "../lib/includes/libft.h" -# include -# include -# include +# include "bst.h" + +// # include +// # include +// # include enum e_op { diff --git a/lib/Makefile b/lib/Makefile index d06b754..5726ae0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -3,36 +3,29 @@ NAME = libft.a GET_NEXT_LINE = sources/get_next_line/get_next_line.a GET_NEXT_LINE_PATH = sources/get_next_line/ -BST = sources/bst/bst.a -BST_PATH = sources/bst/ FUNCTIONS = sources/functions/functions.a FUNCTIONS_PATH = sources/functions/ -all: $(FUNCTIONS) $(GET_NEXT_LINE) $(BST) $(NAME) +all: $(FUNCTIONS) $(GET_NEXT_LINE) $(NAME) $(GET_NEXT_LINE): make -C $(GET_NEXT_LINE_PATH) -$(BST): - make -C $(BST_PATH) - $(FUNCTIONS): make -C $(FUNCTIONS_PATH) $(NAME): - ar -rcT $(NAME) $(FUNCTIONS) $(GET_NEXT_LINE) $(BST) + ar -rcT $(NAME) $(FUNCTIONS) $(GET_NEXT_LINE) clean: make clean -C $(FUNCTIONS_PATH) make clean -C $(GET_NEXT_LINE_PATH) - make clean -C $(BST_PATH) fclean: clean rm -f $(NAME) make fclean -C $(FUNCTIONS_PATH) make fclean -C $(GET_NEXT_LINE_PATH) - make fclean -C $(BST_PATH) re: fclean all diff --git a/lib/includes/libft.h b/lib/includes/libft.h index ef4e2a5..5e4213d 100644 --- a/lib/includes/libft.h +++ b/lib/includes/libft.h @@ -6,7 +6,7 @@ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/07/22 13:02:21 by gfantoni #+# #+# */ -/* Updated: 2024/01/31 11:16:16 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:49:34 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,6 +15,5 @@ # include "../sources/functions/includes/functions.h" # include "../sources/get_next_line/includes/get_next_line.h" -# include "../sources/bst/includes/bst.h" #endif diff --git a/lib/sources/bst/Makefile b/lib/sources/bst/Makefile deleted file mode 100644 index b8eb3ec..0000000 --- a/lib/sources/bst/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -NAME = bst.a - -CFLAGS = -Wextra -Wall -Werror - -HEADERS = -Iincludes - -MK = mkdir -p - -SOURCE_PATH = sources/ - -SRCS = \ - bst_nodes.c \ - bst_check_node.c \ - bst_min_max.c \ - bst_traversal.c \ - bst_breadth.c \ - bst_del_utils.c \ - -OBJECTS_PATH = objects - -OBJS = $(addprefix $(OBJECTS_PATH)/, $(SRCS:%.c=%.o)) - -all: $(NAME) - -$(OBJECTS_PATH)/%.o: $(SOURCE_PATH)%.c - $(MK) $(@D) - $(CC) $(CFLAGS) -o $@ -c $< $(HEADERS) - -$(NAME): $(OBJS) - ar -rcT $(NAME) $? - -clean: - rm -rf $(OBJECTS_PATH) - -fclean: clean - rm -rf $(NAME) - -re: fclean all - -.PHONY: all clean fclean re \ No newline at end of file diff --git a/lib/sources/bst/sources/bst_breadth.c b/sources/bst_breadth.c similarity index 95% rename from lib/sources/bst/sources/bst_breadth.c rename to sources/bst_breadth.c index 5ff5e51..7f98f09 100644 --- a/lib/sources/bst/sources/bst_breadth.c +++ b/sources/bst_breadth.c @@ -6,11 +6,11 @@ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/27 11:03:23 by gfantoni #+# #+# */ -/* Updated: 2024/02/26 15:52:18 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:48:11 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ -#include "bst.h" +#include "../includes/bst.h" static void bst_breadth(t_bst **queue, int front, int total, int rear); diff --git a/lib/sources/bst/sources/bst_check_node.c b/sources/bst_check_node.c similarity index 90% rename from lib/sources/bst/sources/bst_check_node.c rename to sources/bst_check_node.c index a440c83..28940b7 100644 --- a/lib/sources/bst/sources/bst_check_node.c +++ b/sources/bst_check_node.c @@ -1,16 +1,16 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* check_node.c :+: :+: :+: */ +/* bst_check_node.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/26 16:25:54 by gfantoni #+# #+# */ -/* Updated: 2024/01/27 13:46:59 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:48:23 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ -#include "bst.h" +#include "../includes/bst.h" int bst_verify(t_bst *node, int minkey, int maxkey) { diff --git a/lib/sources/bst/sources/bst_del_utils.c b/sources/bst_del_utils.c similarity index 90% rename from lib/sources/bst/sources/bst_del_utils.c rename to sources/bst_del_utils.c index 53da9dd..092938e 100644 --- a/lib/sources/bst/sources/bst_del_utils.c +++ b/sources/bst_del_utils.c @@ -1,16 +1,16 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* del_utils.c :+: :+: :+: */ +/* bst_del_utils.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/27 12:37:55 by gfantoni #+# #+# */ -/* Updated: 2024/01/27 13:47:06 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:48:27 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ -#include "bst.h" +#include "../includes/bst.h" t_bst *left_right_child_null(t_bst *node, int *was_deleted) { diff --git a/lib/sources/bst/sources/bst_min_max.c b/sources/bst_min_max.c similarity index 93% rename from lib/sources/bst/sources/bst_min_max.c rename to sources/bst_min_max.c index 35ac6c7..eabeb42 100644 --- a/lib/sources/bst/sources/bst_min_max.c +++ b/sources/bst_min_max.c @@ -6,11 +6,11 @@ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/26 16:20:43 by gfantoni #+# #+# */ -/* Updated: 2024/02/23 14:23:28 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:48:31 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ -#include "bst.h" +#include "../includes/bst.h" int bst_find_minimum(t_bst *node) { diff --git a/lib/sources/bst/sources/bst_nodes.c b/sources/bst_nodes.c similarity index 96% rename from lib/sources/bst/sources/bst_nodes.c rename to sources/bst_nodes.c index fb4eca0..b51c389 100644 --- a/lib/sources/bst/sources/bst_nodes.c +++ b/sources/bst_nodes.c @@ -6,11 +6,11 @@ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/27 11:39:14 by gfantoni #+# #+# */ -/* Updated: 2024/02/26 12:50:49 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:48:34 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ -#include "bst.h" +#include "../includes/bst.h" t_bst *bst_create_node(int new_key) { diff --git a/lib/sources/bst/sources/bst_traversal.c b/sources/bst_traversal.c similarity index 90% rename from lib/sources/bst/sources/bst_traversal.c rename to sources/bst_traversal.c index 2792dcf..b8f8719 100644 --- a/lib/sources/bst/sources/bst_traversal.c +++ b/sources/bst_traversal.c @@ -1,16 +1,16 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* traversal.c :+: :+: :+: */ +/* bst_traversal.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: gfantoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/26 16:19:41 by gfantoni #+# #+# */ -/* Updated: 2024/01/29 10:31:34 by gfantoni ### ########.fr */ +/* Updated: 2024/02/26 16:48:36 by gfantoni ### ########.fr */ /* */ /* ************************************************************************** */ -#include "bst.h" +#include "../includes/bst.h" void bst_pre_order(t_bst *node) {