7 Commits

Author SHA1 Message Date
Maoake Teriierooiterai
67d7509faf all basics functions has been tested we can start the sort algorithms 2025-12-09 11:42:37 +01:00
Maoake
30b306d2c2 modified some files like all files in stack utils and adding main.c and modified atoi and parssing 2025-12-08 20:44:03 +00:00
Maoake
8e8ca5cfdc adding atoi in function 2025-12-08 18:31:08 +00:00
Maoake Teriierooiterai
15d56b2b32 adding the parsing need to test 2025-12-08 16:50:55 +01:00
David Gailleton
c521cff21a Merge branch 'stack_functions' 2025-12-08 16:17:46 +01:00
Maoake Teriierooiterai
9dc3d88d08 Merge branch 'stack_functions' 2025-12-08 15:37:16 +01:00
David Gailleton
d4d8a79d30 README initialisation 2025-12-08 14:58:49 +01:00
15 changed files with 236 additions and 38 deletions

BIN
.main.c.swp Normal file

Binary file not shown.

BIN
.parsing.c.swp Normal file

Binary file not shown.

5
README.md Normal file
View File

@@ -0,0 +1,5 @@
This project has been created as part of the 42 curriculum by mteriier[, dgaillet].
## Description
The *Push swap* project goal is to sort values with push swap operations beetween 2 stack (*a* and *b*)

42
ft_atoi.c Normal file
View File

@@ -0,0 +1,42 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* ft_atoi.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 18:28:17 by mteriier #+# #+# */
/* Updated: 2025/12/08 19:30:48 by mteriier ### ########.fr */
/* */
/* ************************************************************************** */
#include <stdlib.h>
static int calcul_sign(char c)
{
if (c == '-')
return (-1);
return (1);
}
int ft_atoi(const char *nptr)
{
size_t i;
int sign;
int tmp;
i = 0;
sign = 1;
tmp = 0;
while ((nptr[i] >= 9 && nptr[i] <= 13) || nptr[i] == ' ')
i++;
sign = calcul_sign(nptr[i]);
if (nptr[i] == '-' || nptr[i] == '+')
i++;
while (nptr[i] >= '0' && nptr[i] <= '9')
{
tmp = tmp * 10 + nptr[i] - '0';
i++;
}
return (tmp * sign);
}

70
main.c Normal file
View File

@@ -0,0 +1,70 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* main.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 18:32:35 by mteriier #+# #+# */
/* Updated: 2025/12/09 11:39:55 by mteriier ### ########lyon.fr */
/* */
/* ************************************************************************** */
#include "push_swap.h"
#include <stdio.h>
#include <stdlib.h>
void print_all_stack(t_stack *stack, t_stack *first, char pile)
{
t_stack *tmp;
int i;
tmp = stack;
i = 0;
printf("TAB %c : \n", pile);
if (!stack || !first)
return ;
while (tmp->next != first)
{
printf("[%d] ", tmp->value);
tmp = tmp->next;
i++;
}
printf("[%d] \n", tmp->value);
}
int main(int argc, char **argv)
{
t_stacks *stacks;
stacks = NULL;
if (argc > 1)
{
stacks = init_big_stacks(argc, argv);
print_all_stack(stacks->a, stacks->a, 'A');
print_all_stack(stacks->b, stacks->b, 'B');
sa(stacks);
print_all_stack(stacks->a, stacks->a, 'A');
print_all_stack(stacks->b, stacks->b, 'B');
pb(stacks);
print_all_stack(stacks->a, stacks->a, 'A');
print_all_stack(stacks->b, stacks->b, 'B');
pa(stacks);
print_all_stack(stacks->a, stacks->a, 'A');
print_all_stack(stacks->b, stacks->b, 'B');
rra(stacks);
print_all_stack(stacks->a, stacks->a, 'A');
print_all_stack(stacks->b, stacks->b, 'B');
pb(stacks);
pb(stacks);
print_all_stack(stacks->a, stacks->a, 'A');
print_all_stack(stacks->b, stacks->b, 'B');
rrb(stacks);
print_all_stack(stacks->a, stacks->a, 'A');
print_all_stack(stacks->b, stacks->b, 'B');
rrr(stacks);
print_all_stack(stacks->a, stacks->a, 'A');
print_all_stack(stacks->b, stacks->b, 'B');
}
stack_clear_all(stacks->a, stacks->a);
}

53
parsing.c Normal file
View File

@@ -0,0 +1,53 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* parsing.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* 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 */
/* */
/* ************************************************************************** */
#include "push_swap.h"
#include <stdlib.h>
t_stack *parsing(int argc, char **argv)
{
int i;
int stock;
t_stack *first;
t_stack *new;
i = 1;
first = NULL;
while (i < argc)
{
stock = ft_atoi(argv[i]);
new = new_stack(stock);
if (!new && !first)
return (NULL);
else if (!new)
{
stack_clear_all(first, first);
return (NULL);
}
stack_add_back(&first, new);
i++;
}
return (first);
}
t_stacks *init_big_stacks(int argc, char **argv)
{
t_stacks *stacks;
t_stack *a;
stacks = malloc(sizeof(t_stacks));
if (!stacks)
return (NULL);
a = parsing(argc, argv);
stacks->a = a;
return (stacks);
}

View File

@@ -6,7 +6,7 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 14:18:06 by dgaillet #+# #+# */ /* Created: 2025/12/08 14:18:06 by dgaillet #+# #+# */
/* Updated: 2025/12/08 15:34:51 by mteriier ### ########lyon.fr */ /* Updated: 2025/12/09 10:17:27 by mteriier ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -15,9 +15,9 @@
typedef struct s_stack typedef struct s_stack
{ {
int value; int value;
s_stack *next; struct s_stack *next;
s_stack *previous; struct s_stack *previous;
} t_stack; } t_stack;
typedef struct s_stacks typedef struct s_stacks
@@ -27,16 +27,24 @@ typedef struct s_stacks
} t_stacks; } t_stacks;
/*STACK_FUNCTIONS*/ /*STACK_FUNCTIONS*/
void pa(t_stacks *stacks); void pa(t_stacks *stacks);
void pb(t_stacks *stacks); void pb(t_stacks *stacks);
void rra(t_stacks *stacks); void rra(t_stacks *stacks);
void rrb(t_stacks *stacks); void rrb(t_stacks *stacks);
void rrr(t_stacks *stacks); void rrr(t_stacks *stacks);
void ra(t_stacks *stacks); void ra(t_stacks *stacks);
void rb(t_stacks *stacks); void rb(t_stacks *stacks);
void rr(t_stacks *stacks); void rr(t_stacks *stacks);
void sa(t_stacks *stacks); void sa(t_stacks *stacks);
void sb(t_stacks *stacks); void sb(t_stacks *stacks);
void ss(t_stacks *stacks); void ss(t_stacks *stacks);
/*FUNCTION UTILS*/
t_stack *new_stack(int value);
void stack_add_back(t_stack **stack, t_stack *new);
void stack_add_front(t_stack **stack, t_stack *new);
void stack_clear_all(t_stack *stack, t_stack *first);
t_stack *parsing(int argc, char **argv);
t_stacks *init_big_stacks(int argc, char **argv);
int ft_atoi(const char *nptr);
#endif #endif

BIN
stack_utils/.push.c.swp Normal file

Binary file not shown.

Binary file not shown.

View File

@@ -6,28 +6,48 @@
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */ /* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 15:09:40 by mteriier #+# #+# */ /* Created: 2025/12/08 15:09:40 by mteriier #+# #+# */
/* Updated: 2025/12/08 15:35:23 by mteriier ### ########lyon.fr */ /* Updated: 2025/12/09 11:36:36 by mteriier ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "push_swap.h" #include "../push_swap.h"
#include <stdlib.h>
void pa(t_stacks *stacks) void pa(t_stacks *stacks)
{ {
t_stack a; t_stack *b_push;
if (!stacks || !stacks->b) if (!stacks || !stacks->b)
return ; return ;
a = stack->a; b_push = stacks->b;
a->value = stacks->b->value; if (stacks->b->next == stacks->b)
stacks->b = NULL;
else
{
stacks->b->next->previous = stacks->b->previous;
stacks->b->previous->next = stacks->b->next;
stacks->b = stacks->b->next;
}
stack_add_front(&(stacks->a), b_push);
} }
#include <stdio.h>
void pb(t_stacks *stacks) void pb(t_stacks *stacks)
{ {
t_stack b; t_stack *a_push;
if (!stacks || !stacks->a) if (!stacks || !stacks->a)
return ; return ;
b = stacks->b; a_push = stacks->a;
b->value = stacks->a->value; if (stacks->a->next == stacks->a)
stacks->a = NULL;
else
{
stacks->a->next->previous = stacks->a->previous;
stacks->a->previous->next = stacks->a->next;
stacks->a = stacks->a->next;
}
stack_add_front(&(stacks->b), a_push);
} }

View File

@@ -6,11 +6,11 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 14:43:45 by dgaillet #+# #+# */ /* Created: 2025/12/08 14:43:45 by dgaillet #+# #+# */
/* Updated: 2025/12/08 14:52:53 by dgaillet ### ########lyon.fr */ /* Updated: 2025/12/08 19:37:26 by mteriier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "push_swap.h" #include "../push_swap.h"
void rra(t_stacks *stacks) void rra(t_stacks *stacks)
{ {

View File

@@ -6,11 +6,11 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 14:32:10 by dgaillet #+# #+# */ /* Created: 2025/12/08 14:32:10 by dgaillet #+# #+# */
/* Updated: 2025/12/08 14:52:37 by dgaillet ### ########lyon.fr */ /* Updated: 2025/12/08 19:37:44 by mteriier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "push_swap.h" #include "../push_swap.h"
void ra(t_stacks *stacks) void ra(t_stacks *stacks)
{ {

View File

@@ -6,11 +6,11 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 15:52:40 by dgaillet #+# #+# */ /* Created: 2025/12/08 15:52:40 by dgaillet #+# #+# */
/* Updated: 2025/12/08 16:03:54 by dgaillet ### ########lyon.fr */ /* Updated: 2025/12/09 08:51:33 by mteriier ### ########lyon.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "push_swap.h" #include "../push_swap.h"
#include <stdlib.h> #include <stdlib.h>
t_stack *new_stack(int value) t_stack *new_stack(int value)
@@ -30,7 +30,7 @@ void stack_add_back(t_stack **stack, t_stack *new)
{ {
if (!stack || !new) if (!stack || !new)
return ; return ;
if (!(*stack)) if (*stack == NULL)
{ {
(*stack) = new; (*stack) = new;
new->next = new; new->next = new;
@@ -39,7 +39,7 @@ void stack_add_back(t_stack **stack, t_stack *new)
else else
{ {
(*stack)->previous->next = new; (*stack)->previous->next = new;
new->previous = *(stack)->previous; new->previous = (*stack)->previous;
(*stack)->previous = new; (*stack)->previous = new;
new->next = *stack; new->next = *stack;
} }
@@ -47,7 +47,7 @@ void stack_add_back(t_stack **stack, t_stack *new)
void stack_add_front(t_stack **stack, t_stack *new) void stack_add_front(t_stack **stack, t_stack *new)
{ {
if (!stack || *new) if (!stack || !new)
return ; return ;
stack_add_back(stack, new); stack_add_back(stack, new);
*stack = new; *stack = new;

View File

@@ -6,11 +6,11 @@
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */ /* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 16:05:27 by dgaillet #+# #+# */ /* Created: 2025/12/08 16:05:27 by dgaillet #+# #+# */
/* Updated: 2025/12/08 16:15:28 by dgaillet ### ########lyon.fr */ /* Updated: 2025/12/08 19:40:01 by mteriier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "push_swap.h" #include "../push_swap.h"
#include <stdlib.h> #include <stdlib.h>
void stack_clear_all(t_stack *stack, t_stack *first) void stack_clear_all(t_stack *stack, t_stack *first)

View File

@@ -6,15 +6,15 @@
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */ /* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/12/08 14:48:44 by mteriier #+# #+# */ /* Created: 2025/12/08 14:48:44 by mteriier #+# #+# */
/* Updated: 2025/12/08 15:04:39 by mteriier ### ########lyon.fr */ /* Updated: 2025/12/08 19:40:49 by mteriier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "push_swap.h" #include "../push_swap.h"
void sa(t_stacks *stacks) void sa(t_stacks *stacks)
{ {
t_stack a; t_stack *a;
int stock; int stock;
if (!stacks || !stacks->a || !stacks->a->next) if (!stacks || !stacks->a || !stacks->a->next)
@@ -27,7 +27,7 @@ void sa(t_stacks *stacks)
void sb(t_stacks *stacks) void sb(t_stacks *stacks)
{ {
t_stack b; t_stack *b;
int stock; int stock;
if (!stacks || !stacks->b || !stacks->b->next) if (!stacks || !stacks->b || !stacks->b->next)