tvdu29/lem_in
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Massive clean up

Browse Source 
cleaned up unused code
normalised push_ants
libft is no longer a submodule
still need to normalise lem_in
This commit is contained in:
Tanguy MAZE
2019-04-10 14:34:59 +02:00
parent fb66233265
commit 5d094ebcaf
127 changed files with 180 additions and 5112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
srcs/lem_in.c
View File

@@ -6,65 +6,19 @@
/* By: mndhlovu <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/25 06:31:05 by mndhlovu #+# #+# */
/* Updated: 2019/04/09 19:08:36 by tmaze ### ########.fr */
/* Updated: 2019/04/10 14:26:07 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
int lm_error_exit(void)
int lm_error_exit(void)
{
ft_putendl_fd("ERROR", 2);
return (1);
}
void ft_print_graph(t_graph *graph)
{
int v;
t_ind *crawl;
v = -1;
while (++v < graph->v)
{
crawl = graph->array[v].head;
printf("\n Adjacency list of vertex %d\n head", v);
while (crawl)
{
printf("->%d",crawl->index);
crawl = crawl->next;
}
printf("\n");
}
}
void lm_print_report(t_lmdata *ldata, t_syntax *synt, t_holder *holder)
{
t_node *nodes;
t_temp *data;
if (ldata != NULL)
{
nodes = ldata->nodes_data;
while (nodes)
{
ft_printf("name: %s x: %d y: %d index: %d role: %c\n", nodes->name, nodes->x, nodes->y, nodes->ind, nodes->role);
nodes = nodes->next;
}
}
if (holder != NULL)
{
data = holder->data;
while (data)
{
ft_printf("src: %d - dest: %d\n", data->src_ind, data->dest_ind);
data = data->next;
}
}
ft_printf("nb_state: %d\n s_cmd: %d\n e_cmd: %d\n s_error: %d\n e_rror: %d\n v_error: %d\n l_error: %d\n",
synt->nb_state, synt->s_cmd, synt->e_cmd, synt->s_error, synt->e_error, synt->v_error, synt->l_error);
}
static int lem_in(t_syntax *synt, t_holder *holder,
static int lem_in(t_syntax *synt, t_holder *holder,
t_lmdata *lmdata)
{
if (!(lm_parser(synt, lmdata, holder)))
@@ -76,7 +30,7 @@ static int lem_in(t_syntax *synt, t_holder *holder,
return (1);
}
int main(int ac, char **av)
int main(int ac, char **av)
{
t_syntax synt;
t_lmdata ldata;
@@ -85,7 +39,6 @@ int main(int ac, char **av)
t_node *it;
t_node *start;
t_node *end;
t_ind *it2;
int i;
(void)av;
@@ -106,24 +59,8 @@ int main(int ac, char **av)
end = it;
it = it->next;
}
ft_printf("data->adj: %p\n", ldata.adj);
if ((!start) || (ret = edmunds_karp(&ldata, start->ind, end->ind)) == NULL)
return (lm_error_exit());
if (ret != NULL)
{
i = 0;
while (ret[i])
{
it2 = ret[i];
while (it2)
{
ft_printf(" %d -> ", it2->index);
it2 = it2->next;
}
ft_putchar('\n');
i++;
}
}
push_ants(&ldata, ret, i);
tablst_inddel(ret);
i = 0;

157
srcs/push_ants.c
View File

@@ -6,120 +6,87 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/06 11:37:56 by tmaze #+# #+# */
/* Updated: 2019/04/09 18:54:54 by tmaze ### ########.fr */
/* Updated: 2019/04/10 14:15:59 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
t_ants *add_ant(t_ants **ants, int nb_ant, int nb_path, t_ind **paths)
static void clean_ants(t_ants **ants)
{
t_ants *new;
t_ants *it;
if ((new = (t_ants*)ft_memalloc(sizeof(t_ants))) != NULL)
{
new->nb_ant = nb_ant;
new->nb_path = nb_path;
new->nb_node = paths[nb_path]->index;
new->end = 0;
new->next = NULL;
if (*ants == NULL)
*ants = new;
else
{
it = *ants;
while (it->next)
it = it->next;
it->next = new;
}
}
return (new);
}
void del_ants(t_ants **ants)
{
t_ants *tmp;
while (*ants)
while (*ants && (*ants)->end)
{
tmp = *ants;
*ants = (*ants)->next;
ft_memdel((void**)&tmp);
}
}
t_node *get_node(t_lmdata *data, int index)
{
t_node *it;
it = data->nodes_data;
while (it && it->ind != index)
it = it->next;
return (it);
}
void push_ants(t_lmdata *data, t_ind **paths, int nb_paths)
{
t_ants *ants;
t_ants *it;
t_ants *tmp;
int i;
int ant_c;
char has_start[nb_paths];
ant_c = 1;
ants = NULL;
ft_bzero(has_start, nb_paths);
if (add_ant(&ants, ant_c, 0, paths) == NULL)
return ;
ant_c++;
has_start[0] = 1;
while (ants)
it = *ants;
while (it && it->next)
{
i = 0;
while (i < nb_paths)
{
if (ant_c <= data->nbants && !has_start[i])
{
if (add_ant(&ants, ant_c, i, paths) == NULL)
{
del_ants(&ants);
return ;
}
ant_c++;
has_start[i] = 1;
}
i++;
}
it = ants;
while (it)
{
ft_printf("L%d-%s", it->nb_ant, get_node(data, it->nb_node)->name);
if (get_node(data, it->nb_node)->next)
it->nb_node = get_node(data, it->nb_node)->next->ind;
else
it->end = 1;
if (it->next)
ft_putchar(' ');
else
ft_putchar('\n');
has_start[it->nb_path] = 0;
it = it->next;
}
it = ants;
while (ants && ants->end)
{
it = ants;
ants = ants->next;
ft_memdel((void**)&it);
}
it = ants;
while (it && it->next && it->next->end)
if (it->next->end)
{
tmp = it->next;
it->next = tmp->next;
ft_memdel((void**)&tmp);
}
else
it = it->next;
}
}
static void print_ants(t_lmdata *data, t_ants **ants, char *has_start
, t_ind **paths)
{
t_ants *it;
it = *ants;
while (it)
{
ft_printf("L%d-%s", it->nb_ant, get_node(data, it->nb_node)->name);
if (get_node_path(paths[it->nb_path], it->nb_node)
&& get_node_path(paths[it->nb_path], it->nb_node)->next)
it->nb_node = get_node_path(paths[it->nb_path]
, it->nb_node)->next->index;
else
it->end = 1;
if (it->next)
ft_putchar(' ');
else
ft_putchar('\n');
has_start[it->nb_path] = 0;
it = it->next;
clean_ants(ants);
}
}
void push_ants(t_lmdata *data, t_ind **paths, int nb_paths)
{
t_ants *ants;
int i;
int ant_c;
char has_start[nb_paths];
ants = NULL;
ft_bzero(has_start, nb_paths);
if (add_ant(&ants, 1, 0, paths) == NULL)
return ;
ant_c = 2;
has_start[0] = 1;
while ((ants || ant_c <= data->nbants) && (i = -1))
{
while (++i < nb_paths)
if (ant_c <= data->nbants && !has_start[i])
{
if (!add_ant(&ants, ant_c, i, paths))
del_ants(&ants);
if (!ants)
return ;
ant_c++;
has_start[i] = 1;
}
print_ants(data, &ants, has_start, paths);
}
}

70
srcs/push_ants_utils.c Normal file
View File

@@ -0,0 +1,70 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* push_ants_utils.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/04/10 11:23:36 by tmaze #+# #+# */
/* Updated: 2019/04/10 11:24:01 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
t_ants *add_ant(t_ants **ants, int nb_ant, int nb_path, t_ind **paths)
{
t_ants *new;
t_ants *it;
if ((new = (t_ants*)ft_memalloc(sizeof(t_ants))) != NULL)
{
new->nb_ant = nb_ant;
new->nb_path = nb_path;
new->nb_node = paths[nb_path]->index;
new->end = 0;
new->next = NULL;
if (*ants == NULL)
*ants = new;
else
{
it = *ants;
while (it->next)
it = it->next;
it->next = new;
}
}
return (new);
}
void del_ants(t_ants **ants)
{
t_ants *tmp;
while (*ants)
{
tmp = *ants;
*ants = (*ants)->next;
ft_memdel((void**)&tmp);
}
}
t_node *get_node(t_lmdata *data, int index)
{
t_node *it;
it = data->nodes_data;
while (it && it->ind != index)
it = it->next;
return (it);
}
t_ind *get_node_path(t_ind *lst, int index)
{
t_ind *it;
it = lst;
while (it && it->index != index)
it = it->next;
return (it);
}

147
srcs/test.c
View File

@@ -1,147 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* test.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/03/28 11:37:06 by tmaze #+# #+# */
/* Updated: 2019/04/06 13:51:55 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
#include "lem_in.h"
#define NB_NODES 8
#define NB_ANTS 20
int add_link(t_lmdata *data, int n1, int n2)
{
return (lst_indadd(&(data->adj[n1]), n2) && lst_indadd(&(data->adj[n2]), n1));
}
int main(void)
{
t_lmdata data;
t_ind **path;
t_ind *it;
int i;
data.nb_nodes = NB_NODES;
if ((data.adj = (t_ind**)ft_memalloc(sizeof(t_ind*) * NB_NODES)) == NULL)
return (1);
if (!add_link(&data, 0, 1) || !add_link(&data, 0, 2))
{
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 1, 4))
{
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 2, 3) || !add_link(&data, 2, 5))
{
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 3, 6))
{
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 4, 5))
{
lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 5, 6) || !add_link(&data, 5, 7))
{
lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
if (!add_link(&data, 6, 7))
{
lst_inddel(&(data.adj[7]));
lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (1);
}
ft_printf("===== list of adj =====\n");
i = 0;
while (i < NB_NODES)
{
ft_printf("===== adj of %d =====\n", i);
it = data.adj[i];
while (it)
{
ft_printf("index: %d\nweight: %d\n\n", it->index, it->weight);
it = it->next;
}
i++;
}
path = edmunds_karp(&data, 0, 7);
if (path != NULL)
{
i = 0;
while (path[i])
{
it = path[i];
while (it)
{
ft_printf(" %d -> ", it->index);
it = it->next;
}
ft_putchar('\n');
i++;
}
}
tablst_inddel(path);
lst_inddel(&(data.adj[7]));
lst_inddel(&(data.adj[6]));
lst_inddel(&(data.adj[5]));
lst_inddel(&(data.adj[4]));
lst_inddel(&(data.adj[3]));
lst_inddel(&(data.adj[2]));
lst_inddel(&(data.adj[1]));
lst_inddel(&(data.adj[0]));
ft_memdel((void**)&(data.adj));
return (0);
}