da7e/42-Push_Swap
1
0
Fork 0
mirror of https://github.com/DavidGailleton/42-Push_Swap.git synced 2026-01-27 00:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Maoake Teriierooiterai
2026-01-08 15:07:55 +01:00
parent 4af87fa98a 567a9c61ab
commit 42ed0f7579
12 changed files with 140 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -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

4
headers/parsing.h
View File

@@ -6,7 +6,7 @@
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 */
/* */
/* ************************************************************************** */
@@ -23,5 +23,7 @@ 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);
void free_tab(char **tab);
int checker(int argc, char **argv);
int len_split(char **tab);
#endif

19
headers/push_swap.h
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 14:18:06 by dgaillet #+# #+# */
/* Updated: 2026/01/07 10:30:42 by dgaillet ### ########lyon.fr */
/* Updated: 2026/01/08 14:01:04 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -22,8 +22,21 @@ typedef struct s_stack
typedef struct s_stacks
{
t_stack *a;
t_stack *b;
t_stack *a;
t_stack *b;
int algo;
int bench;
float disorder;
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*/

10
main.c
View File

@@ -6,14 +6,22 @@
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <unistd.h>
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);

63
parsing/checker.c Normal file
View File

@@ -0,0 +1,63 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* checker.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2026/01/08 12:37:12 by dgaillet #+# #+# */
/* Updated: 2026/01/08 13:17:36 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);
}
static int check_flags(char *str)
{
if (!ft_strncmp("--simple", str, ft_strlen(str)))
return (1);
else if (!ft_strncmp("--medium", str, ft_strlen(str)))
return (1);
else if (!ft_strncmp("--complex", str, ft_strlen(str)))
return (1);
else if (!ft_strncmp("--adaptative", str, ft_strlen(str)))
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 (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
return (0);
}
return (1);
}

10
parsing/ft_strlen.c
View File

@@ -21,3 +21,13 @@ size_t ft_strlen(const char *s)
i++;
return (i);
}
int len_split(char **tab)
{
int i;
i = 0;
while (tab[i])
i++;
return (i);
}

35
parsing/parsing.c
View File

@@ -6,7 +6,7 @@
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 16:21:05 by mteriier #+# #+# */
/* Updated: 2025/12/09 10:19:17 by mteriier ### ########lyon.fr */
/* Updated: 2026/01/08 14:01:23 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -25,16 +25,6 @@ static int wich_mod(int mod)
return (0);
}
static int len_split(char **tab)
{
int i;
i = 0;
while (tab[i])
i++;
return (i);
}
static t_stack *parsing(int argc, char **argv, int mod)
{
int i;
@@ -78,16 +68,35 @@ static t_stack *special_parsing(char **argv, int mod)
return (a);
}
static void set_t_stacks(t_stacks *stacks)
{
stacks->a = NULL;
stacks->b = NULL;
stacks->algo = 0;
stacks->bench = 0;
stacks->disorder = 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);
if (mod == 0 || mod == 1 || mod == 2)
a = parsing(argc, argv, mod);
else

4
stack_utils/push.c
View File

@@ -6,7 +6,7 @@
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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:57:56 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -30,6 +30,7 @@ void pa(t_stacks *stacks)
stacks->b = stacks->b->next;
}
stack_add_front(&(stacks->a), b_push);
stacks->pa++;
write(1, "pa\n", 3);
}
@@ -49,5 +50,6 @@ void pb(t_stacks *stacks)
stacks->a = stacks->a->next;
}
stack_add_front(&(stacks->b), a_push);
stacks->pb++;
write(1, "pb\n", 3);
}

5
stack_utils/rev_rotate.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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:57:27 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -17,6 +17,7 @@ void rra(t_stacks *stacks)
{
if (stacks && stacks->a && stacks->a->previous)
stacks->a = stacks->a->previous;
stacks->rra++;
write(1, "rra\n", 4);
}
@@ -24,6 +25,7 @@ void rrb(t_stacks *stacks)
{
if (stacks && stacks->b && stacks->b->previous)
stacks->b = stacks->b->previous;
stacks->rrb++;
write(1, "rrb\n", 4);
}
@@ -33,5 +35,6 @@ void rrr(t_stacks *stacks)
stacks->b = stacks->b->previous;
if (stacks && stacks->a && stacks->a->previous)
stacks->a = stacks->a->previous;
stacks->rrr++;
write(1, "rrr\n", 4);
}

5
stack_utils/rotate.c
View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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:57:47 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -17,6 +17,7 @@ void ra(t_stacks *stacks)
{
if (stacks && stacks->a && stacks->a->next)
stacks->a = stacks->a->next;
stacks->ra++;
write(1, "ra\n", 3);
}
@@ -24,6 +25,7 @@ void rb(t_stacks *stacks)
{
if (stacks && stacks->b && stacks->b->next)
stacks->b = stacks->b->next;
stacks->rb++;
write(1, "rb\n", 3);
}
@@ -33,5 +35,6 @@ void rr(t_stacks *stacks)
stacks->a = stacks->a->next;
if (stacks && stacks->b && stacks->b->next)
stacks->b = stacks->b->next;
stacks->rr++;
write(1, "rr\n", 3);
}

5
stack_utils/swap.c
View File

@@ -6,7 +6,7 @@
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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:58:13 by dgaillet ### ########lyon.fr */
/* */
/* ************************************************************************** */
@@ -24,6 +24,7 @@ void sa(t_stacks *stacks)
stock = a->value;
a->value = a->next->value;
a->next->value = stock;
stacks->sa++;
write(1, "sa\n", 3);
}
@@ -38,6 +39,7 @@ void sb(t_stacks *stacks)
stock = b->value;
b->value = b->next->value;
b->next->value = stock;
stacks->sb++;
write(1, "sb\n", 3);
}
@@ -63,5 +65,6 @@ void ss(t_stacks *stacks)
a->value = a->next->value;
a->next->value = stock;
}
stacks->ss++;
write(1, "ss\n", 3);
}

2
test_one.c
View File

@@ -6,7 +6,7 @@
/* By: mteriier <mteriier@student.lyon42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 */
/* */
/* ************************************************************************** */