Merge branch 'master' into add_2op_optimization

5 files changed, 86 insertions, 104 deletions

diff --git a/cmd_optimization.c b/cmd_optimization.c
index 83e20c0..d0928f5 100644
--- a/cmd_optimization.c
+++ b/cmd_optimization.c
@@ -6,11 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/13 16:42:34 by dkaiser           #+#    #+#             */
-<<<<<<< Updated upstream
-/*   Updated: 2024/04/13 17:31:18 by dkaiser          ###   ########.fr       */
-=======
 /*   Updated: 2024/04/17 09:41:10 by dkaiser          ###   ########.fr       */
->>>>>>> Stashed changes
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,42 +14,6 @@
 #include "libft/libft.h"
 #include "push_swap.h"
 
-/* void	optimize_commands(t_list **cmds) */
-/* { */
-/* 	int		optimizations; */
-/* 	t_list	*cur; */
-/*     t_list *last; */
-
-/* 	optimizations = 0; */
-/* 	cur = *cmds; */
-/*     last = NULL; */
-/* 	while (cur->next) */
-/* 	{ */
-/* 		if ((*(enum e_pscmd *)cur->content == PA */
-/* 				&& *(enum e_pscmd *)cur->next->content == PB) */
-/* 			|| (*(enum e_pscmd *)cur->content == PA */
-/* 				&& *(enum e_pscmd *)cur->next->content == PB)) */
-/* 		{ */
-/*             if (last) */
-/*                 last->next = cur->next->next; */
-/*             else */
-/*                 (*cmds)->next = cur->next->next; */
-/*             ft_lstdelone(cur->next, free); */
-/*             ft_lstdelone(cur, free); */
-/*             optimizations++; */
-/*         } */
-/*         if (!optimizations) */
-/*         { */
-/*             last = cur; */
-/*             cur = cur->next; */
-/*         } */
-/*         else */
-/*             break; */
-/* 	} */
-/* 	if (optimizations) */
-/* 		optimize_commands(cmds); */
-/* } */
-
 static enum e_pscmd get_cmd(t_list *cmd)
 {
     if (cmd)
@@ -62,19 +22,21 @@ static enum e_pscmd get_cmd(t_list *cmd)
         return NO_CMD;
 }
 
-void optimize_commands(t_list **cmds)
+static void optimize_redundant(t_psdata *data, enum e_pscmd cmd1, enum e_pscmd cmd2)
 {
     t_list *cur;
     t_list *last;
     int optimizations;
 
-    cur = *cmds;
+    cur = data->cmds;
     last = cur;
     optimizations = 0;
 
-    while (cur->next)
+    if (!cur)
+        return ;
+    while (cur && cur->next)
     {
-        if ((get_cmd(cur) == PA && get_cmd(cur->next) == PB) || (get_cmd(cur) == PB && get_cmd(cur->next) == PA))
+        if ((get_cmd(cur) == cmd1 && get_cmd(cur->next) == cmd2) || (get_cmd(cur) == cmd2 && get_cmd(cur->next) == cmd1))
         {
             last->next = cur->next->next;
             ft_lstdelone(cur->next, free);
@@ -82,12 +44,12 @@ void optimize_commands(t_list **cmds)
             optimizations++;
         }
         last = last->next;
-        cur = last->next;
+        if (last)
+            cur = last->next;
+        else
+            cur = NULL;
     }
     if (optimizations)
-<<<<<<< Updated upstream
-        optimize_commands(cmds);
-=======
         optimize_redundant(data, cmd1, cmd2);
 }
 
@@ -127,5 +89,4 @@ void optimize_commands(t_psdata *data)
     optimize_redundant(data, PA, PB);
     optimize_redundant(data, RB, RRB);
     optimize_two_stack_ops(data, RA, RB, RR);
->>>>>>> Stashed changes
 }
diff --git a/command_handling.c b/command_handling.c
index e4dc476..0b5f335 100644
--- a/command_handling.c
+++ b/command_handling.c
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/13 14:38:47 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/04/15 16:35:05 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/04/16 09:27:41 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -38,32 +38,31 @@ static void	run_for_both(t_stack *stack_a, t_stack *stack_b,
 	f(stack_b);
 }
 
-void	run_command(t_stack *stack_a, t_stack *stack_b, t_list **cmds,
-		enum e_pscmd cmd)
+void	run_command(t_psdata *data, enum e_pscmd cmd)
 {
 	if (cmd == SA)
-		stack_swap(stack_a);
+		stack_swap(data->a);
 	else if (cmd == SB)
-		stack_swap(stack_b);
+		stack_swap(data->b);
 	else if (cmd == SS)
-		run_for_both(stack_a, stack_b, stack_swap);
+		run_for_both(data->a, data->b, stack_swap);
 	else if (cmd == PA)
-		stack_push(stack_a, stack_b);
+		stack_push(data->a, data->b);
 	else if (cmd == PB)
-		stack_push(stack_b, stack_a);
+		stack_push(data->b, data->a);
 	else if (cmd == RA)
-		stack_rotate(stack_a);
+		stack_rotate(data->a);
 	else if (cmd == RB)
-		stack_rotate(stack_b);
+		stack_rotate(data->b);
 	else if (cmd == RR)
-		run_for_both(stack_a, stack_b, stack_rotate);
+		run_for_both(data->a, data->b, stack_rotate);
 	else if (cmd == RRA)
-		stack_rrotate(stack_a);
+		stack_rrotate(data->a);
 	else if (cmd == RRB)
-		stack_rrotate(stack_b);
+		stack_rrotate(data->b);
 	else if (cmd == RRR)
-		run_for_both(stack_a, stack_b, stack_rrotate);
-	add_cmd_to_queue(cmds, cmd);
+		run_for_both(data->a, data->b, stack_rrotate);
+	add_cmd_to_queue(&data->cmds, cmd);
 }
 
 static void	print_cmd(void *ptr_cmd)
diff --git a/main.c b/main.c
index ed2a579..3881df0 100644
--- a/main.c
+++ b/main.c
@@ -6,51 +6,69 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/12 17:03:30 by dkaiser           #+#    #+#             */
-<<<<<<< Updated upstream
-/*   Updated: 2024/04/15 17:53:19 by dkaiser          ###   ########.fr       */
-=======
 /*   Updated: 2024/04/17 09:42:43 by dkaiser          ###   ########.fr       */
->>>>>>> Stashed changes
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft/ft_printf.h"
 #include "push_swap.h"
 
-int	main(int argc, char *argv[])
+static void free_data(t_psdata *data)
 {
-	t_stack	*stack_a;
-	t_stack	*stack_b;
-	t_list	*pscmds;
-
-	stack_a = create_stack(argc, argv);
-	if (!stack_a)
+	if (data)
 	{
-		ft_putendl_fd("Error", 2);
-		return (1);
+		if (data->a)
+		{
+			if (data->a->stack)
+				free(data->a->stack);
+			free(data->a);
+		}
+		if (data->b)
+		{
+			if (data->b->stack)
+				free(data->b->stack);
+			free(data->b);
+		}
+		free(data);
 	}
-<<<<<<< Updated upstream
+}
+
+static t_psdata *initialize_data(int argc, char *argv[])
+{
+	t_psdata *result;
 
-	stack_b = malloc(sizeof(t_stack));
-	if (!stack_b)
+	result = malloc(sizeof(t_psdata));
+	if (result)
 	{
-		//free everything
+		result->a = create_stack(argc, argv);
+		if (result->a)
+		{
+			result->b = malloc(sizeof(t_stack));
+			if (result->b)
+			{
+				result->b->stack = malloc(sizeof(int) * (argc - 1));
+				if (result->b->stack)
+				{
+					result->b->size = 0;
+					return result;
+				}
+			}
+		}
 	}
-	stack_b->stack = malloc(sizeof(int) * (argc - 1));
-	if (!stack_b->stack)
+	free_data(result);
+	return NULL;
+}
+
+int	main(int argc, char *argv[])
+{
+	t_psdata *data;
+
+	data = initialize_data(argc, argv);
+	if (!data)
 	{
-		//free everything
+		ft_putendl_fd("Error", 2);
+		return (1);
 	}
-	stack_b->size = 0;
-	stack_optimize(stack_a);
-	pscmds = stack_sort(stack_a, stack_b);
-	/* optimize_commands(&pscmds); */
-	print_commands(pscmds);
-	ft_printf("\nA: ");
-	stack_print(stack_a);
-	ft_printf("B: ");
-	stack_print(stack_b);
-=======
 	stack_optimize(data->a);
 	stack_sort(data);
 	optimize_commands(data);
@@ -59,6 +77,5 @@ int	main(int argc, char *argv[])
 	/* stack_print(data->a); */
 	/* ft_printf("B: "); */
 	/* stack_print(data->b); */
->>>>>>> Stashed changes
 	return (0);
 }
diff --git a/push_swap.h b/push_swap.h
index 3500171..fc7b51a 100644
--- a/push_swap.h
+++ b/push_swap.h
@@ -6,7 +6,7 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/12 16:59:09 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/04/15 17:41:05 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/04/16 17:57:33 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,6 +37,13 @@ typedef struct s_stack
 	int size;
 } t_stack;
 
+typedef struct s_psdata
+{
+	t_stack *a;
+	t_stack *b;
+	t_list *cmds;
+} t_psdata;
+
 t_stack	*create_stack(int argc, char *argv[]);
 
 void	stack_swap(t_stack *stack);
@@ -45,13 +52,12 @@ void	stack_rotate(t_stack *stack);
 void	stack_rrotate(t_stack *stack);
 void stack_print(t_stack *stack);
 
-void	run_command(t_stack *stack_a, t_stack *stack_b, t_list **cmds,
-			enum e_pscmd cmd);
+void	run_command(t_psdata *data, enum e_pscmd cmd);
 void	print_commands(t_list *cmds);
 
 int	stack_optimize(t_stack *stack);
-void	optimize_commands(t_list **cmds);
+void	optimize_commands(t_psdata *data);
 
-t_list	*stack_sort(t_stack *stack_a, t_stack *stack_b);
+void	stack_sort(t_psdata *data);
 
 #endif // PUSH_SWAP_H
diff --git a/sorting.c b/sorting.c
index f04304f..8f5d31f 100644
--- a/sorting.c
+++ b/sorting.c
@@ -6,14 +6,13 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/13 15:04:19 by dkaiser           #+#    #+#             */
-/*   Updated: 2024/04/15 17:54:23 by dkaiser          ###   ########.fr       */
+/*   Updated: 2024/04/16 09:27:53 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "push_swap.h"
 
-
-t_list	*stack_sort(t_stack *stack_a, t_stack *stack_b)
+void stack_sort(t_psdata *data)
 {
-    return NULL;
+
 }