From 4cb2fd324491ae3ab09015b570ff35cc15b65aed Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Thu, 8 Jan 2026 12:58:15 +0000 Subject: [PATCH 1/7] input checker --- Makefile | 2 +- headers/parsing.h | 3 ++- main.c | 10 +++++++++- parsing/checker.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ test_one.c | 2 +- 5 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 parsing/checker.c diff --git a/Makefile b/Makefile index ce5dc8d..443234b 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ INSERTION = insertion.c FLAGS_FILES = algorithms_sort.c flag.c -PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c +PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c checker.c STACK_UTILS = push.c rev_rotate.c rotate.c stack_add.c stack_remove.c stacks_len.c swap.c print_stacks.c diff --git a/headers/parsing.h b/headers/parsing.h index ad07753..76e26d3 100644 --- a/headers/parsing.h +++ b/headers/parsing.h @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/07 08:03:08 by mteriier #+# #+# */ -/* Updated: 2026/01/07 08:03:10 by mteriier ### ########lyon.fr */ +/* Updated: 2026/01/08 12:56:19 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -22,5 +22,6 @@ int ft_strncmp(const char *s1, const char *s2, int n); size_t ft_strlen(const char *s); char *ft_substr(char const *s, unsigned int start, size_t len); char **ft_split(char const *s, char c); +int checker(int argc, char **argv); #endif diff --git a/main.c b/main.c index da33874..cdd0ad0 100644 --- a/main.c +++ b/main.c @@ -6,14 +6,22 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 18:32:35 by mteriier #+# #+# */ -/* Updated: 2025/12/14 16:55:43 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 12:57:04 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ #include "push_swap.h" +#include "parsing.h" +#include int main(int argc, char **argv) { + if (!checker(argc, argv)) + { + write(2, "Error !\n", 8); + return (1); + } + if (argc > 1) test1(argc, argv); return (0); diff --git a/parsing/checker.c b/parsing/checker.c new file mode 100644 index 0000000..516047c --- /dev/null +++ b/parsing/checker.c @@ -0,0 +1,50 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* checker.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: dgaillet +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2026/01/08 12:37:12 by dgaillet #+# #+# */ +/* Updated: 2026/01/08 12:54:19 by dgaillet ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + +#include "push_swap.h" + +static int check_digits(char *str) +{ + int i; + + i = 0; + while (str[i]) + { + if (!ft_isdigit(str[i]) && str[i] != ' ') + return (0); + i++; + } + return (1); +} + +int checker(int argc, char **argv) +{ + int i; + + i = 0; + while (++i < argc) + { + if (ft_strncmp("--simple", argv[1], ft_strlen(argv[1]))) + continue ; + if (ft_strncmp("--medium", argv[1], ft_strlen(argv[1]))) + continue ; + if (ft_strncmp("--complex", argv[1], ft_strlen(argv[1]))) + continue ; + if (ft_strncmp("--adaptative", argv[1], ft_strlen(argv[1]))) + continue ; + if (check_digits(argv[1])) + continue ; + else + return (0); + } + return (1); +} diff --git a/test_one.c b/test_one.c index 1a0ee0c..a878e3f 100644 --- a/test_one.c +++ b/test_one.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/22 12:33:58 by mteriier #+# #+# */ -/* Updated: 2026/01/07 14:58:10 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 12:57:57 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ From 0dcbd8aaabc8e1db4e705a53375f59eeb4d4547e Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Thu, 8 Jan 2026 13:04:37 +0000 Subject: [PATCH 2/7] FIX: multiple flags in input generate an error --- parsing/checker.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/parsing/checker.c b/parsing/checker.c index 516047c..47eb750 100644 --- a/parsing/checker.c +++ b/parsing/checker.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/08 12:37:12 by dgaillet #+# #+# */ -/* Updated: 2026/01/08 12:54:19 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:04:25 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -29,19 +29,21 @@ static int check_digits(char *str) int checker(int argc, char **argv) { int i; + int methods_flag; + methods_flag = 0; i = 0; while (++i < argc) { - if (ft_strncmp("--simple", argv[1], ft_strlen(argv[1]))) - continue ; - if (ft_strncmp("--medium", argv[1], ft_strlen(argv[1]))) - continue ; - if (ft_strncmp("--complex", argv[1], ft_strlen(argv[1]))) - continue ; - if (ft_strncmp("--adaptative", argv[1], ft_strlen(argv[1]))) - continue ; - if (check_digits(argv[1])) + if (ft_strncmp("--simple", argv[1], ft_strlen(argv[1])) && !methods_flag) + methods_flag = 1; + else if (ft_strncmp("--medium", argv[1], ft_strlen(argv[1])) && !methods_flag) + methods_flag = 1; + else if (ft_strncmp("--complex", argv[1], ft_strlen(argv[1])) && !methods_flag) + methods_flag = 1; + else if (ft_strncmp("--adaptative", argv[1], ft_strlen(argv[1])) && !methods_flag) + methods_flag = 1; + else if (check_digits(argv[1])) continue ; else return (0); From 335827d6b641c97447b56fa0683a709d854b90d3 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Thu, 8 Jan 2026 13:13:52 +0000 Subject: [PATCH 3/7] add checker for bench mod --- parsing/checker.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/parsing/checker.c b/parsing/checker.c index 47eb750..3ab410d 100644 --- a/parsing/checker.c +++ b/parsing/checker.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/08 12:37:12 by dgaillet #+# #+# */ -/* Updated: 2026/01/08 13:04:25 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:13:16 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -26,23 +26,34 @@ static int check_digits(char *str) return (1); } +static int check_flags(char *str) +{ + if (!ft_strncmp("--simple", str, ft_strlen(str))) + return (1); + else if (!ft_strncmp("--medium", argv[1], ft_strlen(argv[1]))) + return (1); + else if (!ft_strncmp("--complex", argv[1], ft_strlen(argv[1]))) + return (1); + else if (!ft_strncmp("--adaptative", argv[1], ft_strlen(argv[1]))) + return (1); + return (0); +} + int checker(int argc, char **argv) { int i; int methods_flag; + int bench; + bench = 0; methods_flag = 0; i = 0; while (++i < argc) { - if (ft_strncmp("--simple", argv[1], ft_strlen(argv[1])) && !methods_flag) - methods_flag = 1; - else if (ft_strncmp("--medium", argv[1], ft_strlen(argv[1])) && !methods_flag) - methods_flag = 1; - else if (ft_strncmp("--complex", argv[1], ft_strlen(argv[1])) && !methods_flag) - methods_flag = 1; - else if (ft_strncmp("--adaptative", argv[1], ft_strlen(argv[1])) && !methods_flag) + if (check_flags(argv[1]) && !methods_flag) methods_flag = 1; + else if (!ft_strncmp("--bench", argv[1], ft_strlen(argv[1])) && !bench) + bench = 1; else if (check_digits(argv[1])) continue ; else From 765ec373e5b6dff1504c518c80788d683ddd0e15 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Thu, 8 Jan 2026 13:17:43 +0000 Subject: [PATCH 4/7] replace argv[1] by str --- parsing/checker.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/parsing/checker.c b/parsing/checker.c index 3ab410d..7fd1ac5 100644 --- a/parsing/checker.c +++ b/parsing/checker.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/08 12:37:12 by dgaillet #+# #+# */ -/* Updated: 2026/01/08 13:13:16 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:17:36 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -30,11 +30,11 @@ static int check_flags(char *str) { if (!ft_strncmp("--simple", str, ft_strlen(str))) return (1); - else if (!ft_strncmp("--medium", argv[1], ft_strlen(argv[1]))) + else if (!ft_strncmp("--medium", str, ft_strlen(str))) return (1); - else if (!ft_strncmp("--complex", argv[1], ft_strlen(argv[1]))) + else if (!ft_strncmp("--complex", str, ft_strlen(str))) return (1); - else if (!ft_strncmp("--adaptative", argv[1], ft_strlen(argv[1]))) + else if (!ft_strncmp("--adaptative", str, ft_strlen(str))) return (1); return (0); } From 2ba9029955a2eece0f3193e1a194098440d01631 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Thu, 8 Jan 2026 13:54:29 +0000 Subject: [PATCH 5/7] Add bench mode and algo in t_stacks --- headers/push_swap.h | 18 +++++++++++++++--- parsing/parsing.c | 24 +++++++++++++++++++++--- stack_utils/push.c | 12 +++++++++--- stack_utils/rev_rotate.c | 17 +++++++++++++---- stack_utils/rotate.c | 17 +++++++++++++---- stack_utils/swap.c | 17 +++++++++++++---- 6 files changed, 84 insertions(+), 21 deletions(-) diff --git a/headers/push_swap.h b/headers/push_swap.h index 516b731..21bbf0a 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/07 10:30:42 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:36:33 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -22,8 +22,20 @@ typedef struct s_stack typedef struct s_stacks { - t_stack *a; - t_stack *b; + t_stack *a; + t_stack *b; + int algo; + int bench; + unsigned int ra; + unsigned int rb; + unsigned int rr; + unsigned int rra; + unsigned int rrb; + unsigned int rrr; + unsigned int pa; + unsigned int pb; + unsigned int sa; + unsigned int sb; } t_stacks; /* PRINT STACK FUNCTION*/ diff --git a/parsing/parsing.c b/parsing/parsing.c index 90ffe1b..2736c01 100644 --- a/parsing/parsing.c +++ b/parsing/parsing.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 16:21:05 by mteriier #+# #+# */ -/* Updated: 2025/12/09 10:19:17 by mteriier ### ########lyon.fr */ +/* Updated: 2026/01/08 13:54:18 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -62,16 +62,34 @@ static t_stack *special_parsing(int argc, char **argv, int mod) while () } +static void set_t_stacks(t_stacks *stacks) +{ + stacks->a = NULL; + stacks->b = NULL; + stacks->algo = 0; + stacks->bench = 0; + stacks->sa = 0; + stacks->sb = 0; + stacks->ss = 0; + stacks->pa = 0; + stacks->pb = 0; + stacks->ra = 0; + stacks->rb = 0; + stacks->rr = 0; + stacks->rra = 0; + stacks->rrb = 0; + stacks->rrr = 0; +} + t_stacks *init_piles(int argc, char **argv, int mod) { t_stacks *stacks; t_stack *a; stacks = malloc(sizeof(t_stacks)); - stacks->a = NULL; - stacks->b = NULL; if (!stacks) return (NULL); + set_t_stacks(stacks); a = parsing(argc, argv, mod); stacks->a = a; return (stacks); diff --git a/stack_utils/push.c b/stack_utils/push.c index d587526..43d6e28 100644 --- a/stack_utils/push.c +++ b/stack_utils/push.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 15:09:40 by mteriier #+# #+# */ -/* Updated: 2025/12/12 11:39:33 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:52:01 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -30,7 +30,10 @@ void pa(t_stacks *stacks) stacks->b = stacks->b->next; } stack_add_front(&(stacks->a), b_push); - write(1, "pa\n", 3); + if (stacks->bench) + stacks->pa++; + else + write(1, "pa\n", 3); } void pb(t_stacks *stacks) @@ -49,5 +52,8 @@ void pb(t_stacks *stacks) stacks->a = stacks->a->next; } stack_add_front(&(stacks->b), a_push); - write(1, "pb\n", 3); + if (stacks->bench) + stacks->pb++; + else + write(1, "pb\n", 3); } diff --git a/stack_utils/rev_rotate.c b/stack_utils/rev_rotate.c index fefa099..26a24b8 100644 --- a/stack_utils/rev_rotate.c +++ b/stack_utils/rev_rotate.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:43:45 by dgaillet #+# #+# */ -/* Updated: 2025/12/12 11:39:25 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:52:33 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -17,14 +17,20 @@ void rra(t_stacks *stacks) { if (stacks && stacks->a && stacks->a->previous) stacks->a = stacks->a->previous; - write(1, "rra\n", 4); + if (stacks->bench) + stacks->rra++; + else + write(1, "rra\n", 4); } void rrb(t_stacks *stacks) { if (stacks && stacks->b && stacks->b->previous) stacks->b = stacks->b->previous; - write(1, "rrb\n", 4); + if (stacks->bench) + stacks->rrb++; + else + write(1, "rrb\n", 4); } void rrr(t_stacks *stacks) @@ -33,5 +39,8 @@ void rrr(t_stacks *stacks) stacks->b = stacks->b->previous; if (stacks && stacks->a && stacks->a->previous) stacks->a = stacks->a->previous; - write(1, "rrr\n", 4); + if (stacks->bench) + stacks->rrr++; + else + write(1, "rrr\n", 4); } diff --git a/stack_utils/rotate.c b/stack_utils/rotate.c index 627240d..7e5cd46 100644 --- a/stack_utils/rotate.c +++ b/stack_utils/rotate.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:32:10 by dgaillet #+# #+# */ -/* Updated: 2025/12/12 11:39:17 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:52:59 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -17,14 +17,20 @@ void ra(t_stacks *stacks) { if (stacks && stacks->a && stacks->a->next) stacks->a = stacks->a->next; - write(1, "ra\n", 3); + if (stacks->bench) + stacks->ra++; + else + write(1, "ra\n", 3); } void rb(t_stacks *stacks) { if (stacks && stacks->b && stacks->b->next) stacks->b = stacks->b->next; - write(1, "rb\n", 3); + if (stacks->bench) + stacks->rb++; + else + write(1, "rb\n", 3); } void rr(t_stacks *stacks) @@ -33,5 +39,8 @@ void rr(t_stacks *stacks) stacks->a = stacks->a->next; if (stacks && stacks->b && stacks->b->next) stacks->b = stacks->b->next; - write(1, "rr\n", 3); + if (stacks->bench) + stacks->rr++; + else + write(1, "rr\n", 3); } diff --git a/stack_utils/swap.c b/stack_utils/swap.c index 2dad2b6..4f7525e 100644 --- a/stack_utils/swap.c +++ b/stack_utils/swap.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:48:44 by mteriier #+# #+# */ -/* Updated: 2025/12/12 11:38:52 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:53:40 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -24,7 +24,10 @@ void sa(t_stacks *stacks) stock = a->value; a->value = a->next->value; a->next->value = stock; - write(1, "sa\n", 3); + if (stacks->bench) + stacks->sa++; + else + write(1, "sa\n", 3); } void sb(t_stacks *stacks) @@ -38,7 +41,10 @@ void sb(t_stacks *stacks) stock = b->value; b->value = b->next->value; b->next->value = stock; - write(1, "sb\n", 3); + if (stacks->bench) + stacks->sb++; + else + write(1, "sb\n", 3); } void ss(t_stacks *stacks) @@ -63,5 +69,8 @@ void ss(t_stacks *stacks) a->value = a->next->value; a->next->value = stock; } - write(1, "ss\n", 3); + if (stacks->bench) + stacks->ss++; + else + write(1, "ss\n", 3); } From bb39e7d0ecf59de11d00126353230841b89b2de5 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Thu, 8 Jan 2026 13:59:09 +0000 Subject: [PATCH 6/7] delete condition to add operation in t_stacks --- stack_utils/push.c | 14 +++++--------- stack_utils/rev_rotate.c | 20 +++++++------------- stack_utils/rotate.c | 20 +++++++------------- stack_utils/swap.c | 20 +++++++------------- 4 files changed, 26 insertions(+), 48 deletions(-) diff --git a/stack_utils/push.c b/stack_utils/push.c index 43d6e28..63636e9 100644 --- a/stack_utils/push.c +++ b/stack_utils/push.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 15:09:40 by mteriier #+# #+# */ -/* Updated: 2026/01/08 13:52:01 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:57:56 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -30,10 +30,8 @@ void pa(t_stacks *stacks) stacks->b = stacks->b->next; } stack_add_front(&(stacks->a), b_push); - if (stacks->bench) - stacks->pa++; - else - write(1, "pa\n", 3); + stacks->pa++; + write(1, "pa\n", 3); } void pb(t_stacks *stacks) @@ -52,8 +50,6 @@ void pb(t_stacks *stacks) stacks->a = stacks->a->next; } stack_add_front(&(stacks->b), a_push); - if (stacks->bench) - stacks->pb++; - else - write(1, "pb\n", 3); + stacks->pb++; + write(1, "pb\n", 3); } diff --git a/stack_utils/rev_rotate.c b/stack_utils/rev_rotate.c index 26a24b8..e575827 100644 --- a/stack_utils/rev_rotate.c +++ b/stack_utils/rev_rotate.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:43:45 by dgaillet #+# #+# */ -/* Updated: 2026/01/08 13:52:33 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:57:27 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -17,20 +17,16 @@ void rra(t_stacks *stacks) { if (stacks && stacks->a && stacks->a->previous) stacks->a = stacks->a->previous; - if (stacks->bench) - stacks->rra++; - else - write(1, "rra\n", 4); + stacks->rra++; + write(1, "rra\n", 4); } void rrb(t_stacks *stacks) { if (stacks && stacks->b && stacks->b->previous) stacks->b = stacks->b->previous; - if (stacks->bench) - stacks->rrb++; - else - write(1, "rrb\n", 4); + stacks->rrb++; + write(1, "rrb\n", 4); } void rrr(t_stacks *stacks) @@ -39,8 +35,6 @@ void rrr(t_stacks *stacks) stacks->b = stacks->b->previous; if (stacks && stacks->a && stacks->a->previous) stacks->a = stacks->a->previous; - if (stacks->bench) - stacks->rrr++; - else - write(1, "rrr\n", 4); + stacks->rrr++; + write(1, "rrr\n", 4); } diff --git a/stack_utils/rotate.c b/stack_utils/rotate.c index 7e5cd46..26d0896 100644 --- a/stack_utils/rotate.c +++ b/stack_utils/rotate.c @@ -6,7 +6,7 @@ /* By: dgaillet +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:32:10 by dgaillet #+# #+# */ -/* Updated: 2026/01/08 13:52:59 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:57:47 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -17,20 +17,16 @@ void ra(t_stacks *stacks) { if (stacks && stacks->a && stacks->a->next) stacks->a = stacks->a->next; - if (stacks->bench) - stacks->ra++; - else - write(1, "ra\n", 3); + stacks->ra++; + write(1, "ra\n", 3); } void rb(t_stacks *stacks) { if (stacks && stacks->b && stacks->b->next) stacks->b = stacks->b->next; - if (stacks->bench) - stacks->rb++; - else - write(1, "rb\n", 3); + stacks->rb++; + write(1, "rb\n", 3); } void rr(t_stacks *stacks) @@ -39,8 +35,6 @@ void rr(t_stacks *stacks) stacks->a = stacks->a->next; if (stacks && stacks->b && stacks->b->next) stacks->b = stacks->b->next; - if (stacks->bench) - stacks->rr++; - else - write(1, "rr\n", 3); + stacks->rr++; + write(1, "rr\n", 3); } diff --git a/stack_utils/swap.c b/stack_utils/swap.c index 4f7525e..e32e4e3 100644 --- a/stack_utils/swap.c +++ b/stack_utils/swap.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 14:48:44 by mteriier #+# #+# */ -/* Updated: 2026/01/08 13:53:40 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 13:58:13 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -24,10 +24,8 @@ void sa(t_stacks *stacks) stock = a->value; a->value = a->next->value; a->next->value = stock; - if (stacks->bench) - stacks->sa++; - else - write(1, "sa\n", 3); + stacks->sa++; + write(1, "sa\n", 3); } void sb(t_stacks *stacks) @@ -41,10 +39,8 @@ void sb(t_stacks *stacks) stock = b->value; b->value = b->next->value; b->next->value = stock; - if (stacks->bench) - stacks->sb++; - else - write(1, "sb\n", 3); + stacks->sb++; + write(1, "sb\n", 3); } void ss(t_stacks *stacks) @@ -69,8 +65,6 @@ void ss(t_stacks *stacks) a->value = a->next->value; a->next->value = stock; } - if (stacks->bench) - stacks->ss++; - else - write(1, "ss\n", 3); + stacks->ss++; + write(1, "ss\n", 3); } From 567a9c61ab4d1f1101c4e76767e6af56399ab720 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Thu, 8 Jan 2026 14:02:15 +0000 Subject: [PATCH 7/7] Add disorder var in t_stacks --- headers/push_swap.h | 3 ++- parsing/parsing.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/headers/push_swap.h b/headers/push_swap.h index 21bbf0a..56671ca 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 13:36:33 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 14:01:04 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -26,6 +26,7 @@ typedef struct s_stacks t_stack *b; int algo; int bench; + float disorder; unsigned int ra; unsigned int rb; unsigned int rr; diff --git a/parsing/parsing.c b/parsing/parsing.c index 2736c01..5f02bab 100644 --- a/parsing/parsing.c +++ b/parsing/parsing.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 16:21:05 by mteriier #+# #+# */ -/* Updated: 2026/01/08 13:54:18 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 14:01:23 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -68,6 +68,7 @@ static void set_t_stacks(t_stacks *stacks) stacks->b = NULL; stacks->algo = 0; stacks->bench = 0; + stacks->disorder = 0; stacks->sa = 0; stacks->sb = 0; stacks->ss = 0;