diff --git a/builds/print.o b/builds/print.o index 5819b1b..6085fb4 100644 Binary files a/builds/print.o and b/builds/print.o differ diff --git a/builds/push_swap.o b/builds/push_swap.o index 6cc732c..5bfbf2c 100644 Binary files a/builds/push_swap.o and b/builds/push_swap.o differ diff --git a/builds/stop.o b/builds/stop.o index 4088fad..b935031 100644 Binary files a/builds/stop.o and b/builds/stop.o differ diff --git a/includes/push_swap.h b/includes/push_swap.h index 619c1a1..5d40dee 100644 --- a/includes/push_swap.h +++ b/includes/push_swap.h @@ -28,6 +28,7 @@ t_list *launch_algo(t_stack *stack); /* ** stop.c */ +void print_test(t_list *lst, char *s); void ps_usage(void); void ps_error(int i); void ps_stop(t_stack *stack, t_list *lst, int i); @@ -40,7 +41,6 @@ void hugo_sort(t_stack **a, t_stack **b, t_list *lst); /* ** print.c */ -void print_test(t_list *lst, char *s); void fill_solution(t_list *lst, char *s); void print_result(t_list *lst, int i); diff --git a/push_swap b/push_swap index efcd900..3b0d16c 100755 Binary files a/push_swap and b/push_swap differ diff --git a/srcs/print.c b/srcs/print.c index 608b4b9..db5202b 100644 --- a/srcs/print.c +++ b/srcs/print.c @@ -1,31 +1,6 @@ #include "push_swap.h" -void print_test(t_list *lst, char *s) -{ - t_stack **tmpa; - t_stack **tmpb; - t_stack *a; - t_stack *b; - - tmpa = lst->content; - tmpb = lst->next->content; - a = *tmpa; - b = *tmpb; - ft_printf("%s -> a: %12i . %12i . ", s, tmpa, a); - if (a) - ft_printf("%12i", a->n); - else - ft_printf(" NULL"); - ft_printf(" | b: %12i . %12i . ", tmpb, b); - if (b) - ft_printf("%12i \n", b->n); - else - ft_printf(" NULL\n"); - - //ft_printf("%s -> a: %i , %i , %i / b: %i , %i, %i \n", s, tmpa, a, a->n, tmpb, b, b->n); -} - /* ** this function is called at each action (pushes, swapes, rotates) ** pointers to the stacks a and b are stored into two first element of list solution (because both lists a and b are not available from every functions, like sa() doesn't receive b in argument) @@ -48,7 +23,8 @@ void fill_solution(t_list *solution, char *sp) t_stack *b; char *stack; - print_test(solution, "fill_solution (beginning)"); +print_test(solution, "fill_solution (beginning)"); + tmp1 = solution->content; tmp2 = solution->next->content; a = *tmp1; @@ -68,9 +44,13 @@ void fill_solution(t_list *solution, char *sp) stack = ft_strjoinfree(stack, ft_itoa(b->n)); b = b->next; } - print_test(solution, "fill_solu. (bfr add_back)"); + +print_test(solution, "fill_solu. (bfr add_back)"); + ft_lstadd_back(&solution, ft_lstnew(stack)); - print_test(solution, "fill_solu. (aft add_back)"); + +print_test(solution, "fill_solu. (aft add_back)"); + } void print_result(t_list *result, int flag) diff --git a/srcs/push_swap.c b/srcs/push_swap.c index a851cf0..ac685d1 100644 --- a/srcs/push_swap.c +++ b/srcs/push_swap.c @@ -64,12 +64,18 @@ t_list *launch_algo(t_stack *a) b = NULL; solution = ft_lstnew(&a); ft_lstadd_back(&solution, ft_lstnew(&b)); + print_test(solution, "launch_algo "); + fill_solution(solution, ft_strdup("start")); + print_test(solution, "launch_algo (after fill) "); + hugo_sort(&a, &b, solution); //bubble_sort(&a, &b, solution); + print_test(solution, "launch_algo (bfr return) "); + return (solution); } @@ -91,10 +97,11 @@ int main(int ac, char **av) flag = check_flag(&ac, &av); stack = init_stack(ac, av); result = launch_algo(stack); - print_test(result, "main "); - //sa(&stack, &result); - print_result(result, flag); +print_test(result, "main "); + //sa(&stack, &result); +print_result(result, flag); + ps_stop(NULL, result, 0); return(0); } diff --git a/srcs/stop.c b/srcs/stop.c index 141d032..625ff4a 100644 --- a/srcs/stop.c +++ b/srcs/stop.c @@ -1,6 +1,31 @@ #include "push_swap.h" +void print_test(t_list *lst, char *s) +{ + t_stack **tmpa; + t_stack **tmpb; + t_stack *a; + t_stack *b; + + tmpa = lst->content; + tmpb = lst->next->content; + a = *tmpa; + b = *tmpb; + ft_printf("%s -> a: %12i . %12i . ", s, tmpa, a); + if (a) + ft_printf("%12i", a->n); + else + ft_printf(" NULL"); + ft_printf(" | b: %12i . %12i . ", tmpb, b); + if (b) + ft_printf("%12i \n", b->n); + else + ft_printf(" NULL\n"); + + //ft_printf("%s -> a: %i , %i , %i / b: %i , %i, %i \n", s, tmpa, a, a->n, tmpb, b, b->n); +} + void ps_usage(void) { ft_printf("usage :\n"); @@ -36,7 +61,7 @@ void ps_stop(t_stack *stack, t_list *lst, int err) (void)solution; */ -/* + /* t_list *tmp; t_stack **aa; t_stack **bb; @@ -67,9 +92,10 @@ void ps_stop(t_stack *stack, t_list *lst, int err) } (void)a; (void)b; -*/ + */ + +print_test(lst, "ps_stop "); - print_test(lst, "ps_stop "); if (err < 0) return ; else if (err > 0)