From 4f288f94c8ec8ced5200d2e4e5713d9b119aed48 Mon Sep 17 00:00:00 2001 From: Dominik Kaiser Date: Tue, 16 Apr 2024 00:13:14 +0200 Subject: [PATCH] Revert "Add inefficient quicksort? algorithm" This reverts commit f421b2dcf9a5d12655e48f4a06f35f17e785fb0f. --- main.c | 12 ++++++------ sorting.c | 44 ++------------------------------------------ 2 files changed, 8 insertions(+), 48 deletions(-) diff --git a/main.c b/main.c index 076688b..803f6eb 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: dkaiser size = 0; stack_optimize(stack_a); pscmds = stack_sort(stack_a, stack_b); - optimize_commands(&pscmds); + /* optimize_commands(&pscmds); */ print_commands(pscmds); - /* ft_printf("\nA: "); */ - /* stack_print(stack_a); */ - /* ft_printf("B: "); */ - /* stack_print(stack_b); */ + ft_printf("\nA: "); + stack_print(stack_a); + ft_printf("B: "); + stack_print(stack_b); return (0); } diff --git a/sorting.c b/sorting.c index b5668a9..f04304f 100644 --- a/sorting.c +++ b/sorting.c @@ -6,54 +6,14 @@ /* By: dkaiser size < 2) - return 1; - i = 1; - while (i < stack->size) - { - if (stack->stack[i] < stack->stack[i-1]) - return 0; - i++; - } - return 1; -} - t_list *stack_sort(t_stack *stack_a, t_stack *stack_b) { - t_list *cmds = NULL; - int pivot; - - int pivot_idx = stack_a->size - 1; - while (stack_b->size || !is_sorted(stack_a)) - { - pivot = stack_a->stack[pivot_idx]; - - while (stack_a->size > 0 && stack_a->stack[0] != pivot) - { - if (stack_a->stack[0] > pivot) - run_command(stack_a, stack_b, &cmds, RA); - else - run_command(stack_a, stack_b, &cmds, PB); - } - while (stack_b->size > 0) - run_command(stack_a, stack_b, &cmds, PA); - if (stack_a->stack[pivot_idx] == pivot) - pivot_idx--; - if (pivot_idx < 0) - pivot_idx = stack_a->size - 1; - } - return cmds; + return NULL; } -- 2.47.2