tvdu29/push_swap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nearly there !!!

Browse Source 
WIP merge sort
still problems with negative numbers
This commit is contained in:
Tanguy MAZE
2019-03-06 12:12:00 +01:00
parent ac9b03acff
commit 428525b561
6 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
srcs/push_swap.c
View File

@@ -6,34 +6,114 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/03 11:41:49 by tmaze #+# #+# */
/* Updated: 2019/03/05 18:19:58 by tmaze ### ########.fr */
/* Updated: 2019/03/06 12:10:10 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "push_swap.h"
void sort(t_psdata *data, int sortby)
int sort(t_psdata *data, int size)
{
int i;
int j;
t_stack *ptr;
int i;
if (sortby => 2)
sort(data, sortby / 2);
i = data->size_a / sortby;
j = sortby;
printf("start sort %d\n", size);
if (size > 2)
{
if (!sort(data, ((size % 2) ? size + 1 : size) / 2))
return (0);
if (!sort(data, size - (((size % 2) ? size + 1 : size) / 2)))
return (0);
}
else if (size == 1)
return (1);
i = 0;
ptr = data->a;
while (i < ((size % 2) ? size + 1 : size) / 2)
{
ptr->ind = 1;
ptr = ptr->next;
i++;
}
i = 0;
while (ptr && i < (size - (((size % 2) ? size + 1 : size) / 2)))
{
ptr->ind = 2;
ptr = ptr->next;
i++;
}
i = 0;
ptr = data->a;
while (ptr)
{
printf("@ind %d: nb=%d ind=%d\n", i, ptr->nb, ptr->ind);
ptr = ptr->next;
i++;
}
while (data->a->ind == 1)
{
printf("pb\n");
if (!ps_push(data, 'b'))
return (0);
if (data->size_b > 1)
{
printf("rb\n");
ps_rot(data, 'b');
}
}
while (data->a->ind != 0 || data->size_b > 0)
{
printf("data->a->ind %d\ndata->a->nb %d\ndata->size_b %zu\n", data->a->ind, data->a->nb, data->size_b);
if ((data->a->ind != 0 && data->size_b > 0 && data->a->nb > data->b->nb)
|| (data->a->ind == 0 && data->size_b > 0))
{
printf("pa\n");
ps_push(data, 'a');
}
printf("mise a zero:\ndata->a->ind %d\ndata->a->nb %d\n", data->a->ind, data->a->nb);
data->a->ind = 0;
printf("ra\n");
ps_rot(data, 'a');
i = 0;
ptr = data->a;
while (ptr)
{
printf("@ind %d: nb=%d ind=%d\n", i, ptr->nb, ptr->ind);
ptr = ptr->next;
i++;
}
}
return (1);
}
int main(int ac, char **av)
{
t_stack *ptr;
t_psdata data;
ps_initdata(&data);
ret = 0;
if (!get_params(&data, ac, av))
return (0);
new = data.a;
if (new == NULL)
ptr = data.a;
if (ptr == NULL)
ft_putendl("Empty");
sort(&data, ((data.size_a % 2) ? data.sizea + 1 : data.size_a) / 2);
while (ptr)
{
ptr->ind = 0;
ptr = ptr->next;
}
if (!sort(&data, data.size_a))
{
printf("Error\n");
ps_stkclean(&data);
return (1);
}
ptr = data.a;
while (ptr)
{
printf("%d\n", ptr->nb);
ptr->ind = 0;
ptr = ptr->next;
}
return (0);
}