adding a function to start sorting nbrs -> do_sort()

biralavor · Jun 6, 2024 · bcd7f4c · bcd7f4c
1 parent 5074c80
commit bcd7f4c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/program_to_test/Makefile b/program_to_test/Makefile
@@ -6,7 +6,7 @@
 #    By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/05/09 17:59:28 by umeneses          #+#    #+#              #
-#    Updated: 2024/06/05 14:54:57 by umeneses         ###   ########.fr        #
+#    Updated: 2024/06/06 18:49:18 by umeneses         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -46,6 +46,7 @@ NAME					= push_swap
 
 SRC_FILES				= push_main.c
 SRC_FILES				+= ft_argv_validation.c
+SRC_FILES				+= ft_do_sort.c
 SRC_FILES				+= ft_do_push_fts.c
 SRC_FILES				+= ft_do_rev_rotate_fts.c
 SRC_FILES				+= ft_do_rotate_fts.c

diff --git a/program_to_test/headers/push_swap.h b/program_to_test/headers/push_swap.h
@@ -6,7 +6,7 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/08 15:23:33 by umeneses          #+#    #+#             */
-/*   Updated: 2024/06/06 18:37:42 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/06 18:48:17 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -57,6 +57,7 @@ void	ft_reverse_rotate_ab(t_stack **stack_a, t_stack **stack_b);
 bool	ft_is_sorted(t_stack *stack);
 /* sorting validation functions */
 
+void	ft_do_sort(t_stack **stack_a, t_stack **stack_b);
 t_stack	*ft_sort_2_nbrs(t_stack **stack);
 t_stack	*ft_sort_3_nbrs(t_stack **stack);
 /* sorting functions */

diff --git a/program_to_test/src/ft_do_sort.c b/program_to_test/src/ft_do_sort.c
@@ -0,0 +1,24 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_do_sort.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/06/06 18:46:55 by umeneses          #+#    #+#             */
+/*   Updated: 2024/06/06 18:53:26 by umeneses         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "push_swap.h"
+
+void	ft_do_sort(t_stack **stack_a, t_stack **stack_b)
+{
+	if (!ft_is_sorted(*stack_a) || !ft_is_sorted(*stack_b))
+	{
+		if (ft_lstsize_int((t_list *)*stack_a) == 2)
+			ft_sort_2_nbrs(stack_a);
+		if (ft_lstsize_int((t_list *)*stack_a) == 3)
+			ft_sort_3_nbrs(stack_a);
+	}
+}
diff --git a/program_to_test/src/push_main.c b/program_to_test/src/push_main.c
@@ -6,7 +6,7 @@
 /*   By: umeneses <umeneses@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/09 18:34:31 by umeneses          #+#    #+#             */
-/*   Updated: 2024/06/06 15:36:13 by umeneses         ###   ########.fr       */
+/*   Updated: 2024/06/06 18:53:47 by umeneses         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,14 +26,8 @@ int	main(int argc, char **argv)
 	stack_a = ft_lts_buildstack_argv(&stack_a, argv);
 	ft_lst_printf_int_content("testing main content:", stack_a);
 	ft_printf("testing main size: %d\n", ft_lstsize_int((t_list *)stack_a));
-	if (!ft_is_sorted(stack_a))
-	{
-		if (ft_lstsize_int((t_list *)stack_a) == 2)
-			ft_sort_2_nbrs(&stack_a);
-		if (ft_lstsize_int((t_list *)stack_a) == 3)
-			ft_sort_3_nbrs(&stack_a);
-		ft_lst_printf_int_content("updated main content:", stack_a);
-	}
+	ft_do_sort(&stack_a, &stack_b);
+	ft_lst_printf_int_content("updated main content:", stack_a);
 	ft_lstclear_single_ptr(stack_a);
 	ft_lstclear_single_ptr(stack_b);
 	return (0);