mirror of
https://github.com/DavidGailleton/42-Push_Swap.git
synced 2026-01-27 00:41:57 +00:00
Merge branch 'master' into radix
This commit is contained in:
@@ -24,7 +24,8 @@ static int to_insert(t_stacks *stacks, int sorted)
|
||||
a = stacks->a;
|
||||
while (i < sorted)
|
||||
{
|
||||
if (stacks->b->value > a->previous->value && stacks->b->value <= a->value)
|
||||
if (stacks->b->value > a->previous->value
|
||||
&& stacks->b->value <= a->value)
|
||||
return (i);
|
||||
a = a->previous;
|
||||
i++;
|
||||
|
||||
@@ -92,4 +92,4 @@ void push_range_to_b(t_stacks *piles, t_tab *one_preset, int range)
|
||||
sort_little_pile(piles);
|
||||
one_preset->nb_in--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,11 +32,14 @@ int get_next_lower(t_stack *first, int old_lower)
|
||||
{
|
||||
t_stack *tmp;
|
||||
int next_lower;
|
||||
int skip_first;
|
||||
|
||||
tmp = first;
|
||||
skip_first = 1;
|
||||
next_lower = 2147483647;
|
||||
while (tmp->next != first)
|
||||
while (tmp != first || skip_first)
|
||||
{
|
||||
skip_first = 0;
|
||||
if (old_lower < tmp->value && tmp->value <= next_lower)
|
||||
{
|
||||
next_lower = tmp->value;
|
||||
|
||||
@@ -64,7 +64,7 @@ int range_bucket(t_stack *first)
|
||||
int sqrt;
|
||||
|
||||
len = stack_len(first);
|
||||
diff = (get_max_number(first) - get_min_number(first)) ;
|
||||
diff = get_max_number(first) - get_min_number(first);
|
||||
sqrt = my_sqrt(len);
|
||||
if (diff / sqrt < 2)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user