willem/push_swap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sort5 not working

Browse Source
This commit is contained in:
whaffman 2024-11-07 17:28:35 +01:00
parent bf0aa15453
commit 327f5a296d
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -6,7 +6,7 @@
# By: whaffman <whaffman@student.codam.nl> +#+ +:+ +#++#++:++#++ # # By: whaffman <whaffman@student.codam.nl> +#+ +:+ +#++#++:++#++ #
# +#+ +#+#+ +#++#+ +#+ \o/ # # +#+ +#+#+ +#++#+ +#+ \o/ #
# Created: 2024/10/15 11:48:46 by whaffman #+#+# #+#+# #+# #+# | # # Created: 2024/10/15 11:48:46 by whaffman #+#+# #+#+# #+# #+# | #
# Updated: 2024/11/07 12:48:24 by whaffman ### ### ### ### / \ # # Updated: 2024/11/07 15:28:08 by whaffman ### ### ### ### / \ #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -21,7 +21,7 @@ OBJ_PATH = obj
VPATH = src:src/util:src/moves:src/sort VPATH = src:src/util:src/moves:src/sort
SOURCES = push_swap.c ft_lstat.c new_element.c push.c rotate.c reverse_rotate.c \ SOURCES = push_swap.c ft_lstat.c new_element.c push.c rotate.c reverse_rotate.c \
swap.c sort3.c swap.c sort3.c sort5.c stack_min.c stack_max.c
OBJECTS = $(addprefix $(OBJ_PATH)/, $(SOURCES:.c=.o)) OBJECTS = $(addprefix $(OBJ_PATH)/, $(SOURCES:.c=.o))
@ -63,7 +63,7 @@ fclean: clean
re: fclean all re: fclean all
run: all run: all
@$(eval ARG = $(shell shuf -i 0-100 -n 3)) @$(eval ARG = $(shell shuf -i 0-100 -n 5))
./$(NAME) $(ARG) ./$(NAME) $(ARG)
debug: CFLAGS += -DDEBUG -g debug: CFLAGS += -DDEBUG -g

7
inc/push_swap.h
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ +:+ +#++#++:++#++ */ /* By: whaffman <whaffman@student.codam.nl> +#+ +:+ +#++#++:++#++ */
/* +#+ +#+#+ +#++#+ +#+ \o/ */ /* +#+ +#+#+ +#++#+ +#+ \o/ */
/* Created: 2024/11/04 13:58:35 by whaffman #+#+# #+#+# #+# #+# | */ /* Created: 2024/11/04 13:58:35 by whaffman #+#+# #+#+# #+# #+# | */
/* Updated: 2024/11/07 13:12:32 by whaffman ### ### ### ### / \ */ /* Updated: 2024/11/07 16:37:19 by whaffman ### ### ### ### / \ */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -24,9 +24,12 @@ typedef struct s_state
int new_element(t_list **stack, const char *str); int new_element(t_list **stack, const char *str);
t_list *ft_lstat(t_list *list, int n); t_list *ft_lstat(t_list *list, int n);
void print_stack(const char *name, t_list *stack); void print_stack(const char *name, t_list *stack);
void print_stacks(t_list *stack_a, t_list *stack_b); void print_state(t_state *state);
int stack_max(t_list *lst);
int stack_min(t_list *lst);
int sort3(t_state *state); int sort3(t_state *state);
int sort5(t_state *state);
void push(t_list **stack_1, t_list **stack_2); void push(t_list **stack_1, t_list **stack_2);
void rotate(t_list **stack); void rotate(t_list **stack);

6
src/moves/push.c
View File

@ -6,20 +6,20 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ +:+ +#++#++:++#++ */ /* By: whaffman <whaffman@student.codam.nl> +#+ +:+ +#++#++:++#++ */
/* +#+ +#+#+ +#++#+ +#+ \o/ */ /* +#+ +#+#+ +#++#+ +#+ \o/ */
/* Created: 2024/11/06 19:27:09 by whaffman #+#+# #+#+# #+# #+# | */ /* Created: 2024/11/06 19:27:09 by whaffman #+#+# #+#+# #+# #+# | */
/* Updated: 2024/11/06 19:38:01 by whaffman ### ### ### ### / \ */ /* Updated: 2024/11/07 15:51:16 by whaffman ### ### ### ### / \ */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "libft.h" #include "libft.h"
#include "push_swap.h" #include "push_swap.h"
void pa(t_state *state) void pb(t_state *state)
{ {
push(&(state->a), &(state->b)); push(&(state->a), &(state->b));
ft_printf("pa\n"); ft_printf("pa\n");
} }
void pb(t_state *state) void pa(t_state *state)
{ {
push(&(state->b), &(state->a)); push(&(state->b), &(state->a));
ft_printf("pb\n"); ft_printf("pb\n");

6
src/push_swap.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ +:+ +#++#++:++#++ */ /* By: whaffman <whaffman@student.codam.nl> +#+ +:+ +#++#++:++#++ */
/* +#+ +#+#+ +#++#+ +#+ \o/ */ /* +#+ +#+#+ +#++#+ +#+ \o/ */
/* Created: 2024/11/04 13:04:11 by whaffman #+#+# #+#+# #+# #+# | */ /* Created: 2024/11/04 13:04:11 by whaffman #+#+# #+#+# #+# #+# | */
/* Updated: 2024/11/07 13:44:28 by whaffman ### ### ### ### / \ */ /* Updated: 2024/11/07 15:26:58 by whaffman ### ### ### ### / \ */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -70,7 +70,9 @@ int main(int argc, char *argv[])
return (1); return (1);
} }
} }
sort3(state); ft_printf("min: %d\n", stack_min(state->a));
ft_printf("max: %d\n", stack_max(state->a));
sort5(state);
print_state(state); print_state(state);
return (0); return (0);
} }