da7e/42-Push_Swap
1
0
Fork 0
mirror of https://github.com/DavidGailleton/42-Push_Swap.git synced 2026-01-27 08:41:58 +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

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*/