testing
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2019/03/16 13:21:02 by tmaze #+# #+# */
|
||||
/* Updated: 2019/03/18 17:36:47 by tmaze ### ########.fr */
|
||||
/* Updated: 2019/03/19 12:35:27 by tmaze ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -16,7 +16,6 @@ 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))
|
||||
{
|
||||
@@ -33,6 +32,7 @@ static int join_lists(t_psdata *data, t_stack **last, int inds, int inds2)
|
||||
data->a->ind = inds;
|
||||
(*last) = get_last_a(data);
|
||||
}
|
||||
(*last) = get_last_a(data);
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
@@ -67,16 +67,9 @@ 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;
|
||||
|
||||
Reference in New Issue
Block a user