actually it's not =(

This commit is contained in:
Tanguy MAZE
2019-03-18 17:38:27 +01:00
parent e0f584fd30
commit 0b3ba46116
6 changed files with 19 additions and 8 deletions

View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/16 13:21:02 by tmaze #+# #+# */
/* Updated: 2019/03/16 13:27:43 by tmaze ### ########.fr */
/* Updated: 2019/03/18 17:36:47 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -15,6 +15,8 @@
static int join_lists(t_psdata *data, t_stack **last, int inds, int inds2)
{
while ((*last)->ind == inds2 || data->size_b > 0)
{
ft_printf("last nb %d ind %d inds2 %d\n", (*last)->nb, (*last)->ind, inds2);
if (((*last)->ind != inds2 && data->size_b > 0)
|| (data->size_b > 0 && data->b->nb > (*last)->nb))
{
@@ -31,6 +33,7 @@ static int join_lists(t_psdata *data, t_stack **last, int inds, int inds2)
data->a->ind = inds;
(*last) = get_last_a(data);
}
}
return (1);
}
@@ -64,9 +67,16 @@ int sort(t_psdata *data)
t_stack *last;
int inds;
int inds2;
t_stack *ptr;
last = get_last_a(data);
inds = last->ind + 1;
ptr = data->a;
while (ptr)
{
ft_printf("nb: %d ind %d\n", ptr->nb, ptr->ind);
ptr = ptr->next;
}
while (data->a->ind != last->ind)
{
inds2 = data->a->ind;