42/42_INT_06_pushwap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

algo recursive fonctionne manque le tris des mini listes

Browse Source
This commit is contained in:
hugogogo
2021-09-25 17:19:07 +02:00
parent 38a5a88d8a
commit 115c03b8ca
9 changed files with 154 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
srcs/algo.c
View File

@@ -56,37 +56,74 @@ int find_pivot(t_stack *list, int size)
int divide_a(t_stack **a, t_stack **b, t_list *solution)
{
int list_size;
int pivot;
int list_size;
int pivot;
t_stack *first_rotate;
(void)b;
(void)solution;
first_rotate = NULL;
list_size = sublist_size(*a);
pivot = find_pivot(*a, list_size);
(*a)->limit = 0;
while (list_size-- > 0)
{
if ((*a)->n >= pivot)
{
if (!first_rotate)
first_rotate = *a;
ra(a, &solution);
}
else
pb(b, a, &solution);
}
mark_step(solution);
while (*a != first_rotate)
rra(a, &solution);
(*a)->limit = 1;
(*b)->limit = 1;
mark_step(solution, "divide_a");
return (0);
}
int divide_b(t_stack **a, t_stack **b, t_list *solution)
{
(void)a;
(void)b;
(void)solution;
int list_size;
int pivot;
t_stack *first_rotate;
first_rotate = NULL;
list_size = sublist_size(*b);
pivot = find_pivot(*b, list_size);
(*b)->limit = 0;
while (list_size-- > 0)
{
if ((*b)->n >= pivot)
pa(a, b, &solution);
else
{
if (!first_rotate)
first_rotate = *b;
rb(b, &solution);
}
}
while (*b != first_rotate)
rrb(b, &solution);
(*a)->limit = 1;
(*b)->limit = 1;
mark_step(solution, "divide_b");
return (0);
}
void send_sublist_to_a(t_stack **a, t_stack **b, t_list *solution)
{
(void)a;
(void)b;
(void)solution;
int list_size;
list_size = sublist_size(*b);
(*b)->limit = 0;
while (list_size-- > 0)
pa(a, b, &solution);
(*a)->limit = 1;
if (*b)
(*b)->limit = 1;
mark_step(solution, "send_sublist_to_a");
}
void mini_sort(t_stack **a, t_stack **b, t_list *solution)
@@ -98,19 +135,18 @@ void mini_sort(t_stack **a, t_stack **b, t_list *solution)
void hugo_sort(t_stack **a, t_stack **b, t_list *solution)
{
if (sublist_size(*a) > 5)
divide_a(a, b, solution);
/*
if (sublist_size(*a) > 3)
divide_a(a, b, solution);
else if (sublist_size(*b) > 3)
else if (sublist_size(*b) > 5)
{
mini_sort(a, b, solution);
divide_b(a, b, solution);
}
else
else if (sublist_size(*b) > 0)
send_sublist_to_a(a, b, solution);
else
return ;
hugo_sort(a, b, solution);
*/
}
// /*

38
srcs/print.c
View File

@@ -7,22 +7,21 @@ char *fill_line(t_stack *list, char *stack)
if (list->limit == 1)
stack = ft_strjoinfree(ft_strdup("]"), stack);
stack = ft_strjoinfree(ft_itoa(list->n), stack);
if (list->limit == 1)
stack = ft_strjoinfree(ft_strdup("["), stack);
stack = ft_strjoinfree(ft_strdup(" "), stack);
list = list->next;
}
return (stack);
}
void mark_step(t_list *solution)
void mark_step(t_list *solution, char *step)
{
char *line;
while (solution->next != NULL)
solution = solution->next;
line = solution->content;
line = ft_strjoinfree(line, ft_strdup("!1"));
line = ft_strjoinfree(line, ft_strdup("!"));
line = ft_strjoinfree(line, ft_strdup(step));
solution->content = line;
}
@@ -62,6 +61,28 @@ void fill_solution(t_list *solution, char *sp)
ft_lstadd_back(&solution, ft_lstnew(stack));
}
// some drafty code to print sublist with flag
void print_flags(char **part, int flag)
{
int last_a;
int last_b;
last_a = part[1][ft_strlen(part[1]) - 1];
last_b = part[0][ft_strlen(part[0]) - 1];
if (flag && part[3] != NULL)
ft_printf(" ( %s )", part[3]);
if (flag == 1 || (flag == 2 && part[3] != NULL))
{
ft_printf("\n %s", part[1]);
if (part[3] != NULL && last_a != ']')
ft_putchar(']');
ft_printf("\n %s", part[0]);
if (part[3] != NULL && last_b != ']' && last_b != ':')
ft_putchar(']');
}
}
void print_result(t_list *result, int flag)
{
int i;
@@ -73,12 +94,9 @@ void print_result(t_list *result, int flag)
{
i++;
part = ft_split(result->content, '!');
ft_printf("%s\n", part[2]);
if (flag == 1 || (flag == 2 && part[3] != NULL))
{
ft_printf(" %s\n", part[1]);
ft_printf(" %s\n", part[0]);
}
ft_printf("%s", part[2]);
print_flags(part, flag);
ft_putchar('\n');
result = result->next;
free(part[0]);
free(part[1]);

3
srcs/push_swap.c
View File

@@ -41,7 +41,6 @@ t_stack *init_stack(int ac, char **av)
start->next = tmp;
tmp = start;
}
start->limit = 1;
return (start);
}
@@ -58,7 +57,7 @@ t_list *launch_algo(t_stack **a, t_stack **b, int flag)
if (flag)
{
fill_solution(solution, "start");
mark_step(solution);
mark_step(solution, "start");
}
hugo_sort(a, b, solution);
// bubble_sort(a, b, solution);