jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

btree fixed and normed, yay

Browse source
This commit is contained in:
Jack Halford 2016-11-26 23:03:17 +01:00
parent e242b3daff
commit 370dcdd087
3 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libftasm/includes/btree.h
View file

@ -25,15 +25,17 @@ struct s_btree
struct s_btree *right; struct s_btree *right;
}; };
enum e_printdata struct s_printdata
{ {
is_left, int is_left;
offset, int offset;
depth, int depth;
left, int left;
right, int right;
}; };
typedef struct s_printdata t_printdata;
t_btree *btree_create_node(void const *item, size_t content_size); t_btree *btree_create_node(void const *item, size_t content_size);
void btree_insert_data( void btree_insert_data(

43
libftasm/src/btree/btree_print.c
View file

@ -12,7 +12,7 @@
#include "btree.h" #include "btree.h"
static int print_t2(int data[5], char s[20][255], char b[20]) static int print_t2(t_printdata data, char s[20][255], char b[20])
{ {
int width; int width;
int i; int i;
@ -20,29 +20,29 @@ static int print_t2(int data[5], char s[20][255], char b[20])
width = 5; width = 5;
i = -1; i = -1;
while (++i < width) while (++i < width)
s[2 * data[depth]][data[offset] + data[left] + i] = b[i]; s[2 * data.depth][data.offset + data.left + i] = b[i];
i = -1; i = -1;
if (data[depth] && data[is_left]) if (data.depth && data.is_left)
{ {
while (++i < width + data[right]) while (++i < width + data.right)
s[2 * data[depth] - 1] s[2 * data.depth - 1]
[data[offset] + data[left] + width / 2 + i] = '-'; [data.offset + data.left + width / 2 + i] = '-';
s[2 * data[depth] - 1][data[offset] + data[left] + width / 2] = '+'; s[2 * data.depth - 1][data.offset + data.left + width / 2] = '+';
s[2 * data[depth] - 1] s[2 * data.depth - 1]
[data[offset] + data[left] + data[right] + 3 * width / 2] = '+'; [data.offset + data.left + data.right + 3 * width / 2] = '+';
} }
else if (data[depth] && !data[is_left]) else if (data.depth && !data.is_left)
{ {
while (++i < width + data[left]) while (++i < width + data.left)
s[2 * data[depth] - 1][data[offset] - width / 2 + i] = '-'; s[2 * data.depth - 1][data.offset - width / 2 + i] = '-';
s[2 * data[depth] - 1][data[offset] + data[left] + width / 2] = '+'; s[2 * data.depth - 1][data.offset + data.left + width / 2] = '+';
s[2 * data[depth] - 1][data[offset] - width / 2 - 1] = '+'; s[2 * data.depth - 1][data.offset - width / 2 - 1] = '+';
} }
return (data[left] + data[width] + right); return (data.left + width + data.right);
} }
static int print_t(t_btree *tree, static int print_t(t_btree *tree,
int data[5], char s[20][255], char *(*printer)(void *)) t_printdata data, char s[20][255], char *(*printer)(void *))
{ {
char b[20]; char b[20];
int width; int width;
@ -51,10 +51,11 @@ static int print_t(t_btree *tree,
if (!tree) if (!tree)
return (0); return (0);
sprintf(b, "%5s", printer(tree->item)); sprintf(b, "%5s", printer(tree->item));
data[left] = print_t(tree->left, (int[3]){ data.left = print_t(tree->left, (t_printdata){
1, data[offset], data[depth] + 1}, s, printer); 1, data.offset, data.depth + 1, data.left, data.right}, s, printer);
data[right] = print_t(tree->right, (int[3]){ data.right = print_t(tree->right, (t_printdata){
0, data[offset] + data[left] + width, data[depth] + 1}, s, printer); 0, data.offset + data.left + width, data.depth + 1,
data.left, data.right}, s, printer);
return (print_t2(data, s, b)); return (print_t2(data, s, b));
} }
@ -68,7 +69,7 @@ void btree_print(t_btree *tree, char *(*printer)(void *))
while (++i < 20) while (++i < 20)
sprintf(s[i], "%80s", " "); sprintf(s[i], "%80s", " ");
sprintf(empty, "%80s", " "); sprintf(empty, "%80s", " ");
print_t(tree, (int[5]){0, 0, 0, 0, 0}, s, printer); print_t(tree, (t_printdata){0, 0, 0, 0, 0}, s, printer);
i = -1; i = -1;
while (++i < 20) while (++i < 20)
{ {

2
libftasm/src/misc/ft_debug.c
View file

@ -17,5 +17,5 @@ void ft_debug(void)
static int n = 0; static int n = 0;
n++; n++;
ft_printf("----------\n check %02i\n----------\n", n); ft_dprintf(2, "----------\n check %02i\n----------\n", n);
} }