mirror of
https://github.com/DavidGailleton/42-Push_Swap.git
synced 2026-01-27 00:41:57 +00:00
Merge branch 'master' into simple_algorithm
This commit is contained in:
@@ -6,12 +6,13 @@
|
||||
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/12/08 15:09:40 by mteriier #+# #+# */
|
||||
/* Updated: 2025/12/09 11:36:36 by mteriier ### ########lyon.fr */
|
||||
/* Updated: 2025/12/12 11:39:33 by dgaillet ### ########lyon.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../push_swap.h"
|
||||
#include "push_swap.h"
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
void pa(t_stacks *stacks)
|
||||
{
|
||||
@@ -29,7 +30,7 @@ void pa(t_stacks *stacks)
|
||||
stacks->b = stacks->b->next;
|
||||
}
|
||||
stack_add_front(&(stacks->a), b_push);
|
||||
|
||||
write(1, "pa\n", 3);
|
||||
}
|
||||
|
||||
#include <stdio.h>
|
||||
@@ -50,4 +51,5 @@ void pb(t_stacks *stacks)
|
||||
stacks->a = stacks->a->next;
|
||||
}
|
||||
stack_add_front(&(stacks->b), a_push);
|
||||
write(1, "pb\n", 3);
|
||||
}
|
||||
|
||||
@@ -6,26 +6,32 @@
|
||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/12/08 14:43:45 by dgaillet #+# #+# */
|
||||
/* Updated: 2025/12/08 19:37:26 by mteriier ### ########.fr */
|
||||
/* Updated: 2025/12/12 11:39:25 by dgaillet ### ########lyon.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../push_swap.h"
|
||||
#include "push_swap.h"
|
||||
#include <unistd.h>
|
||||
|
||||
void rra(t_stacks *stacks)
|
||||
{
|
||||
if (stacks && stacks->a && stacks->a->previous)
|
||||
stacks->a = stacks->a->previous;
|
||||
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);
|
||||
}
|
||||
|
||||
void rrr(t_stacks *stacks)
|
||||
{
|
||||
rra(stacks);
|
||||
rrb(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;
|
||||
write(1, "rrr\n", 4);
|
||||
}
|
||||
|
||||
@@ -6,26 +6,32 @@
|
||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/12/08 14:32:10 by dgaillet #+# #+# */
|
||||
/* Updated: 2025/12/08 19:37:44 by mteriier ### ########.fr */
|
||||
/* Updated: 2025/12/12 11:39:17 by dgaillet ### ########lyon.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../push_swap.h"
|
||||
#include "push_swap.h"
|
||||
#include <unistd.h>
|
||||
|
||||
void ra(t_stacks *stacks)
|
||||
{
|
||||
if (stacks && stacks->a && stacks->a->next)
|
||||
stacks->a = stacks->a->next;
|
||||
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);
|
||||
}
|
||||
|
||||
void rr(t_stacks *stacks)
|
||||
{
|
||||
ra(stacks);
|
||||
rb(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;
|
||||
write(1, "rr\n", 3);
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/12/08 15:52:40 by dgaillet #+# #+# */
|
||||
/* Updated: 2025/12/09 08:51:33 by mteriier ### ########lyon.fr */
|
||||
/* Updated: 2025/12/12 11:39:09 by dgaillet ### ########lyon.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../push_swap.h"
|
||||
#include "push_swap.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
t_stack *new_stack(int value)
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
/* By: dgaillet <dgaillet@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/12/08 16:05:27 by dgaillet #+# #+# */
|
||||
/* Updated: 2025/12/08 19:40:01 by mteriier ### ########.fr */
|
||||
/* Updated: 2025/12/12 11:39:02 by dgaillet ### ########lyon.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../push_swap.h"
|
||||
#include "push_swap.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
void stack_clear_all(t_stack *stack, t_stack *first)
|
||||
|
||||
@@ -6,11 +6,12 @@
|
||||
/* By: mteriier <mteriier@student.42lyon.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2025/12/08 14:48:44 by mteriier #+# #+# */
|
||||
/* Updated: 2025/12/08 19:40:49 by mteriier ### ########.fr */
|
||||
/* Updated: 2025/12/12 11:38:52 by dgaillet ### ########lyon.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "../push_swap.h"
|
||||
#include "push_swap.h"
|
||||
#include <unistd.h>
|
||||
|
||||
void sa(t_stacks *stacks)
|
||||
{
|
||||
@@ -23,6 +24,7 @@ void sa(t_stacks *stacks)
|
||||
stock = a->value;
|
||||
a->value = a->next->value;
|
||||
a->next->value = stock;
|
||||
write(1, "sa\n", 3);
|
||||
}
|
||||
|
||||
void sb(t_stacks *stacks)
|
||||
@@ -36,10 +38,30 @@ void sb(t_stacks *stacks)
|
||||
stock = b->value;
|
||||
b->value = b->next->value;
|
||||
b->next->value = stock;
|
||||
write(1, "sb\n", 3);
|
||||
}
|
||||
|
||||
void ss(t_stacks *stacks)
|
||||
{
|
||||
sa(stacks);
|
||||
sb(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;
|
||||
}
|
||||
write(1, "ss\n", 3);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user