mirror of
https://github.com/DavidGailleton/42-Push_Swap.git
synced 2026-01-27 00:41:57 +00:00
fix my mistakes
This commit is contained in:
@@ -1,51 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* push.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2025/12/08 15:09:40 by mteriier #+# #+# */
|
|
||||||
/* Updated: 2026/01/08 13:57:56 by dgaillet ### ########lyon.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "push_swap.h"
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
void pa(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
t_stack *b_push;
|
|
||||||
|
|
||||||
if (!stacks || !stacks->b)
|
|
||||||
return ;
|
|
||||||
b_push = stacks->b;
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
void pb(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
t_stack *a_push;
|
|
||||||
|
|
||||||
if (!stacks || !stacks->a)
|
|
||||||
return ;
|
|
||||||
a_push = stacks->a;
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* rev_rotate.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2025/12/08 14:43:45 by dgaillet #+# #+# */
|
|
||||||
/* Updated: 2026/01/08 13:57:27 by dgaillet ### ########lyon.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "push_swap.h"
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
void rra(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
if (stacks && stacks->a && stacks->a->previous)
|
|
||||||
stacks->a = stacks->a->previous;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rrb(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
if (stacks && stacks->b && stacks->b->previous)
|
|
||||||
stacks->b = stacks->b->previous;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rrr(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
if (stacks && stacks->b && stacks->b->previous)
|
|
||||||
stacks->b = stacks->b->previous;
|
|
||||||
if (stacks && stacks->a && stacks->a->previous)
|
|
||||||
stacks->a = stacks->a->previous;
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* rotate.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2025/12/08 14:32:10 by dgaillet #+# #+# */
|
|
||||||
/* Updated: 2026/01/08 13:57:47 by dgaillet ### ########lyon.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "push_swap.h"
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
void ra(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
if (stacks && stacks->a && stacks->a->next)
|
|
||||||
stacks->a = stacks->a->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rb(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
if (stacks && stacks->b && stacks->b->next)
|
|
||||||
stacks->b = stacks->b->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rr(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
if (stacks && stacks->a && stacks->a->next)
|
|
||||||
stacks->a = stacks->a->next;
|
|
||||||
if (stacks && stacks->b && stacks->b->next)
|
|
||||||
stacks->b = stacks->b->next;
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* stack_add.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2025/12/08 15:52:40 by dgaillet #+# #+# */
|
|
||||||
/* Updated: 2025/12/12 11:39:09 by dgaillet ### ########lyon.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "push_swap.h"
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
t_stack *new_stack(int value)
|
|
||||||
{
|
|
||||||
t_stack *new;
|
|
||||||
|
|
||||||
new = malloc(sizeof(t_stack));
|
|
||||||
if (!new)
|
|
||||||
return (NULL);
|
|
||||||
new->value = value;
|
|
||||||
new->next = NULL;
|
|
||||||
new->previous = NULL;
|
|
||||||
return (new);
|
|
||||||
}
|
|
||||||
|
|
||||||
void stack_add_back(t_stack **stack, t_stack *new)
|
|
||||||
{
|
|
||||||
if (!stack || !new)
|
|
||||||
return ;
|
|
||||||
if (*stack == NULL)
|
|
||||||
{
|
|
||||||
(*stack) = new;
|
|
||||||
new->next = new;
|
|
||||||
new->previous = new;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
(*stack)->previous->next = new;
|
|
||||||
new->previous = (*stack)->previous;
|
|
||||||
(*stack)->previous = new;
|
|
||||||
new->next = *stack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void stack_add_front(t_stack **stack, t_stack *new)
|
|
||||||
{
|
|
||||||
if (!stack || !new)
|
|
||||||
return ;
|
|
||||||
stack_add_back(stack, new);
|
|
||||||
*stack = new;
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* stack_remove.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2025/12/08 16:05:27 by dgaillet #+# #+# */
|
|
||||||
/* Updated: 2025/12/12 11:39:02 by dgaillet ### ########lyon.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "push_swap.h"
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
void stack_clear_all(t_stack *stack, t_stack *first)
|
|
||||||
{
|
|
||||||
if (!stack)
|
|
||||||
return ;
|
|
||||||
if (stack->next != first)
|
|
||||||
stack_clear_all(stack->next, first);
|
|
||||||
free(stack);
|
|
||||||
}
|
|
||||||
|
|
||||||
void free_all(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
if (stacks->a)
|
|
||||||
stack_clear_all(stacks->a, stacks->a);
|
|
||||||
if (stacks->b)
|
|
||||||
stack_clear_all(stacks->b, stacks->b);
|
|
||||||
free(stacks);
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* stacks_len.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2025/12/09 13:11:50 by dgaillet #+# #+# */
|
|
||||||
/* Updated: 2025/12/09 13:19:21 by dgaillet ### ########lyon.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "push_swap.h"
|
|
||||||
|
|
||||||
int stack_a_len(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
t_stack *first;
|
|
||||||
t_stack *a_stack;
|
|
||||||
int len;
|
|
||||||
|
|
||||||
a_stack = stacks->a;
|
|
||||||
first = a_stack;
|
|
||||||
if (!a_stack)
|
|
||||||
return (0);
|
|
||||||
len = 1;
|
|
||||||
while (a_stack->next != first)
|
|
||||||
{
|
|
||||||
a_stack = a_stack->next;
|
|
||||||
len++;
|
|
||||||
}
|
|
||||||
return (len);
|
|
||||||
}
|
|
||||||
|
|
||||||
int stack_b_len(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
t_stack *first;
|
|
||||||
t_stack *b_stack;
|
|
||||||
int len;
|
|
||||||
|
|
||||||
b_stack = stacks->b;
|
|
||||||
first = b_stack;
|
|
||||||
if (!b_stack)
|
|
||||||
return (0);
|
|
||||||
len = 1;
|
|
||||||
while (b_stack->next != first)
|
|
||||||
{
|
|
||||||
b_stack = b_stack->next;
|
|
||||||
len++;
|
|
||||||
}
|
|
||||||
return (len);
|
|
||||||
}
|
|
||||||
|
|
||||||
int highest_stack_len(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
int a_len;
|
|
||||||
int b_len;
|
|
||||||
|
|
||||||
a_len = stack_a_len(stacks);
|
|
||||||
b_len = stack_b_len(stacks);
|
|
||||||
if (a_len > b_len)
|
|
||||||
return (a_len);
|
|
||||||
return (b_len);
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
/* ************************************************************************** */
|
|
||||||
/* */
|
|
||||||
/* ::: :::::::: */
|
|
||||||
/* swap.c :+: :+: :+: */
|
|
||||||
/* +:+ +:+ +:+ */
|
|
||||||
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
|
|
||||||
/* +#+#+#+#+#+ +#+ */
|
|
||||||
/* Created: 2025/12/08 14:48:44 by mteriier #+# #+# */
|
|
||||||
/* Updated: 2026/01/08 13:58:13 by dgaillet ### ########lyon.fr */
|
|
||||||
/* */
|
|
||||||
/* ************************************************************************** */
|
|
||||||
|
|
||||||
#include "push_swap.h"
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
void sa(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
t_stack *a;
|
|
||||||
int stock;
|
|
||||||
|
|
||||||
if (!stacks || !stacks->a || !stacks->a->next)
|
|
||||||
return ;
|
|
||||||
a = stacks->a;
|
|
||||||
stock = a->value;
|
|
||||||
a->value = a->next->value;
|
|
||||||
a->next->value = stock;
|
|
||||||
}
|
|
||||||
|
|
||||||
void sb(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
t_stack *b;
|
|
||||||
int stock;
|
|
||||||
|
|
||||||
if (!stacks || !stacks->b || !stacks->b->next)
|
|
||||||
return ;
|
|
||||||
b = stacks->b;
|
|
||||||
stock = b->value;
|
|
||||||
b->value = b->next->value;
|
|
||||||
b->next->value = stock;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ss(t_stacks *stacks)
|
|
||||||
{
|
|
||||||
t_stack *b;
|
|
||||||
t_stack *a;
|
|
||||||
int stock;
|
|
||||||
|
|
||||||
if (!stacks)
|
|
||||||
return ;
|
|
||||||
if (stacks->b && stacks->b->next)
|
|
||||||
{
|
|
||||||
b = stacks->b;
|
|
||||||
stock = b->value;
|
|
||||||
b->value = b->next->value;
|
|
||||||
b->next->value = stock;
|
|
||||||
}
|
|
||||||
if (stacks->a && stacks->a->next)
|
|
||||||
{
|
|
||||||
a = stacks->a;
|
|
||||||
stock = a->value;
|
|
||||||
a->value = a->next->value;
|
|
||||||
a->next->value = stock;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -18,7 +18,7 @@ int verif_is_number(char **tab)
|
|||||||
int len;
|
int len;
|
||||||
|
|
||||||
len = len_split(tab);
|
len = len_split(tab);
|
||||||
if (tab[len - 1][0] == '-')
|
if (tab[len - 1][0] == '-' && !ft_isdigit(tab[len - 1][1]))
|
||||||
return (0);
|
return (0);
|
||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ static int verif_atoi(const char *nptr)
|
|||||||
i = 0;
|
i = 0;
|
||||||
tmp = 0;
|
tmp = 0;
|
||||||
before = 0;
|
before = 0;
|
||||||
if (ft_strncmp("-2147483648", nptr, 15))
|
if (ft_strncmp(nptr, "-2147483648", 15))
|
||||||
return (1);
|
return (1);
|
||||||
while ((nptr[i] >= 9 && nptr[i] <= 13) || nptr[i] == ' ')
|
while ((nptr[i] >= 9 && nptr[i] <= 13) || nptr[i] == ' ')
|
||||||
i++;
|
i++;
|
||||||
|
|||||||
Reference in New Issue
Block a user