changes bintree.c finished

This commit is contained in:
Maximilian Ott 2025-12-16 09:15:17 +01:00
parent da4ea358a3
commit 353c4cfe6f

View File

@ -13,14 +13,12 @@ int compareFct(const void *argument1, const void *argument2)
int x = *((int *)argument1); int x = *((int *)argument1);
int y = *((int *)argument2); int y = *((int *)argument2);
if (x < y) if (x < y) return -1;
return -1; if (x > y) return 1;
if (x > y)
return 1;
return 0; return 0;
} }
/* Erzeugt einen neuen Baumknoten mit Kopie der Daten */ /* Erzeugt einen neuen Baumknoten mit Datenkopie */
static TreeNode *create_node(const void *data, size_t data_size) static TreeNode *create_node(const void *data, size_t data_size)
{ {
TreeNode *node = malloc(sizeof(TreeNode)); TreeNode *node = malloc(sizeof(TreeNode));
@ -45,7 +43,7 @@ static TreeNode *create_node(const void *data, size_t data_size)
return node; return node;
} }
/* Fügt ein Element in den Baum ein */ /* Fügt Daten in den Binärbaum ein */
TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize,
CompareFctType compareFct, int *isDuplicate) CompareFctType compareFct, int *isDuplicate)
{ {
@ -56,13 +54,13 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize,
return create_node(data, dataSize); return create_node(data, dataSize);
} }
int cmpFct = compareFct(data, root->data); int cmp = compareFct(data, root->data);
if (cmpFct < 0) if (cmp < 0)
{ {
root->left = addToTree(root->left, data, dataSize, compareFct, isDuplicate); root->left = addToTree(root->left, data, dataSize, compareFct, isDuplicate);
} }
else if (cmpFct > 0) else if (cmp > 0)
{ {
root->right = addToTree(root->right, data, dataSize, compareFct, isDuplicate); root->right = addToTree(root->right, data, dataSize, compareFct, isDuplicate);
} }
@ -75,34 +73,29 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize,
return root; return root;
} }
/* Iterator über den Baum (Inorder-Traversierung) */ /* Inorder-Iterator über den Baum */
void *nextTreeData(TreeNode *root) void *nextTreeData(TreeNode *root)
{ {
static StackNode *stack = NULL; static StackNode *stack = NULL;
/* Neuer Baum → Stack initialisieren */ /* Neuer Start → linken Pfad auf Stack legen */
if (root != NULL) if (root != NULL)
stack = push_left(root, stack); stack = push_left(root, stack);
if (stack == NULL) if (stack == NULL)
return NULL; return NULL;
/* Top-Element vom Stack holen */ /* TOP lesen, dann POP */
StackNode *sn = pop(&stack); TreeNode *node = (TreeNode *)top(stack);
if (sn == NULL) stack = pop(stack);
return NULL;
TreeNode *node = (TreeNode *)sn->data;
free(sn); // WICHTIG: pop gibt StackNode zurück → hier freigeben
/* Rechten Teilbaum vorbereiten */
if (node->right != NULL) if (node->right != NULL)
stack = push_left(node->right, stack); stack = push_left(node->right, stack);
return node->data; return node->data;
} }
/* Hilfsfunktion: alle linken Knoten auf den Stack legen */ /* Hilfsfunktion: linken Pfad auf Stack legen */
static StackNode *push_left(TreeNode *node, StackNode *stack) static StackNode *push_left(TreeNode *node, StackNode *stack)
{ {
while (node != NULL) while (node != NULL)
@ -113,7 +106,7 @@ static StackNode *push_left(TreeNode *node, StackNode *stack)
return stack; return stack;
} }
/* Gibt den gesamten Baum frei */ /* Gibt gesamten Baum frei */
void clearTree(TreeNode *root) void clearTree(TreeNode *root)
{ {
if (root == NULL) if (root == NULL)
@ -125,7 +118,7 @@ void clearTree(TreeNode *root)
free(root); free(root);
} }
/* Liefert die Anzahl der Knoten im Baum */ /* Liefert Anzahl der Knoten */
unsigned int treeSize(const TreeNode *root) unsigned int treeSize(const TreeNode *root)
{ {
if (root == NULL) if (root == NULL)