diff --git a/Makefile b/Makefile index 9c2e1f7..97037e6 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ SRC = main.c test_one.c ft_putnbr.c secure_write.c INSERTION = insertion.c -FLAGS_FILES = algorithms_sort.c flag.c +FLAGS_FILES = algorithms_sort.c flag.c bench.c PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c checker.c ft_itoa.c ft_isdigit.c @@ -46,7 +46,8 @@ ALGO_UTILS = check_order.c compare.c iterate.c pre_sort.c ALL_FILES = $(SRC) $(STACK_UTILS_DIR)/$(STACK_UTILS) $(PARS_DIR)/$(PARSING) \ $(ALGO_DIR)/$(MEDIUM_DIR)/$(MEDIUM_ALGO) $(ALGO_UTILS_DIR)/$(ALGO_UTILS) \ - $(INSERT_DIR)/$(INSERTION) $(ALGO_DIR)/$(COMPLEX_DIR)/$(COMPLEX_ALGO) + $(INSERT_DIR)/$(INSERTION) $(ALGO_DIR)/$(COMPLEX_DIR)/$(COMPLEX_ALGO) \ + $(FLAGS_DIR)/$(FLAGS_FILES) OBJ_DIR = obj @@ -69,9 +70,6 @@ $(NAME): $(OBJ) @echo "======= PUSH SWAP COMPILED =========" @echo "====================================" -$(OBJ_DIR)/%.o: %.c | $(OBJ_DIR) - $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ - $(OBJ_DIR)/%.o: $(PARS_DIR)/%.c | $(OBJ_DIR) $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ @@ -93,6 +91,12 @@ $(OBJ_DIR)/%.o: $(ALGO_DIR)/$(COMPLEX_DIR)/%.c | $(OBJ_DIR) $(OBJ_DIR)/%.o: $(ALGO_UTILS_DIR)/%.c | $(OBJ_DIR) $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ +$(OBJ_DIR)/%.o: $(FLAGS_DIR)/%.c | $(OBJ_DIR) + $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ + +$(OBJ_DIR)/%.o: %.c | $(OBJ_DIR) + $(CC) $(CFLAGS) -MMD -MP -c $< -o $@ + $(OBJ_DIR): @mkdir -p $(OBJ_DIR) diff --git a/flags/algorithms_sort.c b/flags/algorithms_sort.c index a0f9b28..ab9c266 100644 --- a/flags/algorithms_sort.c +++ b/flags/algorithms_sort.c @@ -6,12 +6,12 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/07 12:15:02 by mteriier #+# #+# */ -/* Updated: 2026/01/07 12:15:05 by mteriier ### ########lyon.fr */ +/* Updated: 2026/01/08 16:07:00 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ #include "push_swap.h" -#include "medium_algo.h" +#include "medium_headers.h" void simple(t_stacks *piles) { @@ -33,10 +33,13 @@ void medium(t_stacks *piles) void complex(t_stacks *piles) { + (void)piles; return ; } void adaptive(t_stacks *piles) { + (void)piles; return ; } + diff --git a/flags/bench.c b/flags/bench.c index eda181c..662a923 100644 --- a/flags/bench.c +++ b/flags/bench.c @@ -6,11 +6,12 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/08 13:59:52 by dgaillet #+# #+# */ -/* Updated: 2026/01/08 15:26:30 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 16:09:11 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ -#include "push_swaps.h" +#include "push_swap.h" +#include "parsing.h" #include #include @@ -34,10 +35,10 @@ static void print_disorder(t_stacks *stacks) free(str); } -static void print_strategy(t_stacks *stacks) +static void print_algo(t_stacks *stacks) { - secure_write(2, "[bench] strategy: ", 18); - if (stacks->strategy == 0) + secure_write(2, "[bench] algo: ", 18); + if (stacks->algo == 0) { secure_write(2, "Adaptative", 10); if (stacks->disorder < 0.2) @@ -47,11 +48,11 @@ static void print_strategy(t_stacks *stacks) else secure_write(2, " / O(nlogn)\n", 12); } - else if (stacks->strategy == 1) + else if (stacks->algo == 1) secure_write(2, "Simple / O(n2n)\n", 16); - else if (stacks->strategy == 2) + else if (stacks->algo == 2) secure_write(2, "Medium / O(nlogn)\n", 18); - else if (stacks->strategy == 3) + else if (stacks->algo == 3) secure_write(2, "Complex / O(n√n)\n", 17); } @@ -73,7 +74,7 @@ static void print_total_ops(t_stacks *stacks) total_ops += stacks->rrr; secure_write(2, "[bench] total_ops: ", 18); ft_putnbr_fd((int) total_ops, 2); - secure_write(2, "\n"); + secure_write(2, "\n", 1); } static void print_ops(t_stacks *stacks) @@ -104,11 +105,10 @@ static void print_ops(t_stacks *stacks) secure_write(2, "\n", 1); } -void bench(t_stacks *stacks) +void print_bench(t_stacks *stacks) { - print_disorder(stacks) - print_strategy(stacks); + print_disorder(stacks); + print_algo(stacks); print_total_ops(stacks); print_ops(stacks); - } diff --git a/flags/flag.c b/flags/flag.c index 31e0811..d097a9a 100644 --- a/flags/flag.c +++ b/flags/flag.c @@ -6,12 +6,13 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/07 12:39:29 by mteriier #+# #+# */ -/* Updated: 2026/01/07 12:39:31 by mteriier ### ########lyon.fr */ +/* Updated: 2026/01/08 16:07:29 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ #include "push_swap.h" #include "parsing.h" +#include "flags.h" void flags(int pos, char **argv, t_stacks *piles) { diff --git a/headers/flags.h b/headers/flags.h index 90130e2..0e1915d 100644 --- a/headers/flags.h +++ b/headers/flags.h @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/07 13:05:52 by mteriier #+# #+# */ -/* Updated: 2026/01/07 13:05:53 by mteriier ### ########lyon.fr */ +/* Updated: 2026/01/08 15:32:54 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -19,4 +19,6 @@ void complex(t_stacks *piles); void adaptive(t_stacks *piles); void flags(int pos, char **argv, t_stacks *piles); +void print_bench(t_stacks *stacks); + #endif diff --git a/headers/push_swap.h b/headers/push_swap.h index 64221ec..e83c07b 100644 --- a/headers/push_swap.h +++ b/headers/push_swap.h @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:18:06 by dgaillet #+# #+# */ -/* Updated: 2026/01/08 15:20:03 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 15:32:04 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ diff --git a/main.c b/main.c index cdd0ad0..6750253 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 18:32:35 by mteriier #+# #+# */ -/* Updated: 2026/01/08 12:57:04 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 15:34:59 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -21,7 +21,6 @@ int main(int argc, char **argv) write(2, "Error !\n", 8); return (1); } - if (argc > 1) test1(argc, argv); return (0); diff --git a/test_one.c b/test_one.c index 1ed6bf7..160ba63 100644 --- a/test_one.c +++ b/test_one.c @@ -6,11 +6,12 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/22 12:33:58 by mteriier #+# #+# */ -/* Updated: 2026/01/08 12:57:57 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 15:35:43 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ #include "push_swap.h" +#include "flags.h" #include "parsing.h" #include "medium_headers.h" #include @@ -25,6 +26,7 @@ int test1(int argc, char **argv) if (argc > 1) { piles = init_piles(argc, argv, 0); + print_bench(piles); preset = get_tabs(piles->a, range_bucket(piles->a)); bucket_algo(piles, preset, range_bucket(piles->a)); }