need to handles lenght path and color fun

Author: Allan BARRIELLE

abarriel2

@@ -0,0 +1 @@
+Subproject commit b3e5c22f7559b5b5c5885cc45099cf16372820e2

fdf

@@ -0,0 +1 @@
+Subproject commit 9f5fdff8e394878180927e54d4859f494da9d8fb

libft/Makefile

@@ -1,53 +1,37 @@
-
-#	Library output
+#	Output's Name
 NAME = libft.a
 
 #	GCC flags
 CFLAGS = -Werror
 ALL_CFLAGS = -Wall -Wextra $(CFLAGS)
 
-#	Ojects/Sources directories
-INC_LIBFT = includes/
-SRC_LIBFT = $(shell find . | grep "\.c$$" | sed "s/\.c$$//g")
-INCLUDES += $(addprefix -iquote , $(INC_LIBFT))
-SRCS += $(addsuffix .c, $(SRC_LIBFT))
+# Includes directories
+INC_PATH = includes/
+INCLUDES_FILES= $(shell find . | grep "\.h")
+INCLUDES += $(addprefix -iquote , $(INC_PATH))
 
-#	Final OBJS
+# Sources Objects directories
+SRCS = $(shell find . | grep "\.c")
 OBJS = $(SRCS:.c=.o)
 
-#	Layout
-VERBOSE = false
-
-all: header $(NAME) footer
+all: $(NAME)
 
 header:
-	@echo "\033[1;36m[\033[1m$(NAME)]\033[0m\033[1;33m Compile, link & archive\033[0m"
-
-footer:
-	@echo "\033[1;36m[\033[1m$(NAME)]\033[0m\033[1;32m Well Done\033[0m"
-
-$(NAME): $(OBJS)
-ifeq ($(VERBOSE),true)
-	@echo "\033[1;36m. Archive .\033[0m $(NAME)"
-else
-	@printf "\033[1;31m.\033[0m\n"
-endif
-	@$(AR) rcus $(NAME) $(OBJS)
+	@echo "\033[1;36m[${NAME}]\033[1;32m Compile && Archive\033[0m"
 
+$(NAME): $(OBJS) $(INCLUDES_FILES)
+	@printf "\n\r\e\033[0m\e[K\033[1;31m $@ \033[1;32m - Finished\033[0m\n"
+	@ar rc $(NAME) $(OBJS)
 %.o: %.c
-ifeq ($(VERBOSE),true)
-	@echo "\033[1;36m. Compile .\033[0m $<"
-else
-	@printf "\033[1;31m.\033[0m"
-endif
-	@$(CC) $(ALL_CFLAGS) $(INCLUDES) -c $< -o $@
+	@printf "\r\033[1;32m. Compile .\e\033[0m\e[K \033[1;31m$<"
+	@gcc $(ALL_CFLAGS) $(INCLUDES) -c $< -o $@
 
 clean:
-	@echo "\033[1;36m[\033[1m$(NAME)]\033[0m\033[1;33m >>\033[0m \033[1;33mclean (*.o)\033[0m"
+	
 	@$(RM) $(OBJS)
 
 fclean: clean
-	@echo "\033[1;36m[\033[1m$(NAME)]\033[0m\033[1;33m >>\033[0m \033[1;33mfclean ($(NAME))\033[0m"
+
 	@$(RM) $(NAME)
 
 re: fclean all

map/tes

@@ -1,4 +1,4 @@
-10
+6
 ##start
 1 2 5
 4 5 6

map/test_short

@@ -18,7 +18,6 @@
 3-6
 6-7
 7-4
-4-5
-5-10
+4-10
 8-9
-9-10
+9-10

srcs/lemin.c

@@ -46,6 +46,7 @@ t_ant	*init_ant(char *name)
 			ft_strcmp(name, "##end") && *name == '#')
 		get_next_line(0, &name);
 	i = ft_atol(name);
+	ft_printf("%s\n");
 	if (i <= 0 || !name || i > INT_MAX)
 		ft_exit("Wrong ant's numbers");
 	if (!(r = (t_ant*)malloc(sizeof(t_ant))))

srcs/path.c

@@ -66,6 +66,7 @@ t_path	*init_path(char *name, int start,  int p)
 	if (!(u = (t_path*)malloc(sizeof(t_path))))
 		ft_exit("Failed to Malloc");
 	u->name = name;
+	u->ants = 0;
 	u->start = start;
 	u->size += p;
 	u->next = NULL;

srcs/send.c

@@ -6,39 +6,102 @@
 /*   By: abarriel <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/07 03:03:25 by abarriel          #+#    #+#             */
-/*   Updated: 2017/03/07 03:03:27 by abarriel         ###   ########.fr       */
+/*   Updated: 2017/03/08 11:28:02 by abarriel         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "lemin.h"
 
-void	one_path(t_path *p, t_ant *a)
+void	reverse_list(t_path **list, t_ant *a)
 {
-	int i;
-	int ants;
+	t_path	*p;
+	t_path	*q;
+	t_path	*r;
 
-	ants = 1;
-	i = 0;
-	if (p->start == 1)
-		p = p->next;
-	while(p)
-	{	
-		ft_printf("L%d-%s ",a->ant,p->name);
-		ants = p->ants;
+	p = *list;
+	p->ants = a->ant;
+	q = NULL;
+	while (p)
+	{
+		r = q;
+		q = p;
 		p = p->next;
-		if(p)
-		p->ants += ants;
+		q->next = r;
 	}
-	ft_printf("\n");
+	q->start = 2;
+	*list = q;
 }
+ft_putstr_fd(RED, fd);
+	if (color_nfun == 2)
+		ft_putstr_fd(GREEN, fd);
+	if (color_nfun == 3)
+		ft_putstr_fd(BLUE, fd);
+	if (color_nfun == 4)
+		ft_putstr_fd(PURPLE, fd);
+	if (color_nfun == 5)
+		ft_putstr_fd(YELLOW, fd);
 void	handles_path(t_path **p, t_ant *a, int max_path)
 {
 	int i;
 	int ants;
+	int end;
+	int start;
 
-	ants = 1;
+	t_path **tmp;
+	end = 0;
+	tmp = NULL;
+	ants = 0;
 	i = 0;
-	ft_printf("Nb ants = %d\nNb max_chemin = %d\n\n\n",a->ant, max_path);
-	if (max_path == 1)
-		one_path(*p,a);
-}
+	start = a->ant;
+	tmp = (t_path**)malloc(sizeof(t_path) * max_path);
+	while(i < max_path)
+	{	
+		reverse_list(&p[i],a);
+		tmp[i] = p[i];
+		i++;
+	}
+	i = 0;
+	while(end <= a->ant)
+	{
+		ft_printf("{GRE}%d\n",p[i]->ants);
+		while(i < max_path)
+		{
+			while(p[i])
+			{
+				if (p[i]->start == 2 && p[i]->next->ants > 0)
+				{
+					end++;
+					p[i]->ants = end;
+					ft_putstr("0;[")
+					ft_printf("L%d-%s ",p[i]->ants,p[i]->name);
+					if (end == a->ant)
+						return ;
+					// if(p[i]->ants == a->ant)
+					// 	return;
+				}
+				else if (p[i]->next && p[i]->next->start == 1 && start > 0)
+				{
+					p[i]->next->ants--;
+					start--;
+					ants++;
+					p[i]->ants = ants;
+					ft_printf("L%d-%s ",p[i]->ants,p[i]->name);
+				}
+				else if (p[i]->next && p[i]->next->ants > 0 && p[i]->next->start != 1)
+				{
+					p[i]->ants = p[i]->next->ants;
+					p[i]->next->ants = 0;
+					ft_printf("L%d-%s ",p[i]->ants,p[i]->name);
+				}
+				p[i] = p[i]->next;
+			}
+			p[i] = tmp[i];
+			i++;
+		}
+		
+		i = 0;
+		ft_printf("\n");
+		p[i] = tmp[i];
+		// i++;
+	}
+}