clearTree hinzugefügt

Reviewed-on: #1

bintree.c

@@ -1,155 +1,117 @@
 #include <string.h>
+#include <stdlib.h>
 #include "stack.h"
 #include "bintree.h"
-#include <stdlib.h>
 
-// TODO: binären Suchbaum implementieren
-/*  * `addToTree`: fügt ein neues Element in den Baum ein (rekursiv),
- * `clearTree`: gibt den gesamten Baum frei (rekursiv),
- * `treeSize`: zählt die Knoten im Baum (rekursiv),
- * `nextTreeData`: Traversierung mit Hilfe des zuvor implementierten Stacks. */
+static StackNode *iterStack = NULL;
+static void pushLeftBranch(StackNode **stack, TreeNode *node);
 
-// Adds a copy of data's pointer destination to the tree using compareFct for ordering. Accepts duplicates
-// if isDuplicate is NULL, otherwise ignores duplicates and sets isDuplicate to 1 (or to 0 if a new entry is added).
-TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFctType compareFct, int *isDuplicate)
+// Inserts a new node into the BST.
+// If isDuplicate == NULL → duplicates are allowed
+// If isDuplicate != NULL → duplicates are ignored and *isDuplicate = 1
+TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize,
+                    CompareFctType compareFct, int *isDuplicate)
 {
-    TreeNode *insertedNode;
-
-    // create a new node if the current node is NULL
     if (root == NULL)
     {
-        // it's important to zero the pointers for adjacent nodes
-        insertedNode = calloc(1, sizeof(TreeNode));
-        if (!insertedNode)
+        TreeNode *newNode = calloc(1, sizeof(TreeNode));
+        if (!newNode)
+            return NULL;
+
+        newNode->data = malloc(dataSize);
+        if (!newNode->data)
         {
+            free(newNode);
             return NULL;
         }
 
-        insertedNode->data = malloc(dataSize);
-        if (!insertedNode->data)
-        {
-            return NULL;
-        }
-        memcpy(insertedNode->data, data, dataSize);
-        // reset isDuplicate if it exists
+        memcpy(newNode->data, data, dataSize);
+
         if (isDuplicate)
-        {
             *isDuplicate = 0;
-        }
-        return insertedNode;
+
+        return newNode;
     }
 
-    // TODO: what is the correct data type here?
-    int cmpRes = (*compareFct)(data, root->data);
-    // insert into the left branch
-    if (cmpRes < 0 || (cmpRes == 0 && isDuplicate == NULL))
+    int cmp = compareFct(data, root->data);
+
+    if (cmp < 0 || (cmp == 0 && isDuplicate == NULL))
     {
         root->left = addToTree(root->left, data, dataSize, compareFct, isDuplicate);
     }
-    // insert into the right branch
-    else if (cmpRes > 0)
+    else if (cmp > 0)
     {
         root->right = addToTree(root->right, data, dataSize, compareFct, isDuplicate);
     }
-    // the data is equal to the current node
     else
     {
-        // the data already exists in the tree and duplicates are ignored (isDuplicate* not NULL)
-        *isDuplicate = 1;
+        if (isDuplicate)
+            *isDuplicate = 1;
     }
+
     return root;
 }
 
-// push all left descendants from @param node
-static void pushLeftDesc(StackNode **stackPtr, TreeNode *node)
+static void pushLeftBranch(StackNode **stack, TreeNode *node)
 {
-    if (!stackPtr || !node)
+    while (node)
     {
-        return;
-    }
-    TreeNode *curNode = node;
-    while (curNode->left)
-    {
-        *stackPtr = push(*stackPtr, curNode->left);
-        if (!*stackPtr)
-        {
-            return;
-        }
-        curNode = curNode->left;
+        *stack = push(*stack, node);
+        node = node->left;
     }
 }
 
-// Iterates over the tree given by root. Follows the usage of strtok. If tree is NULL, the next entry of the last tree given is returned in ordering direction.
-// Use your implementation of a stack to organize the iterator. Push the root node and all left nodes first. On returning the next element,
-// push the top node and push all its left nodes.
+// If root != NULL → reset iterator and start from new tree.
+// If root == NULL → continue iterating.
 void *nextTreeData(TreeNode *root)
 {
-    // this creates a static variable that maintains an internal state
-    static StackNode *stack;
-
-    // create a new stack
-    if (root)
+    // Start new iteration
+    if (root != NULL)
     {
-        // clear possibly existing stacks
-        clearStack(stack);
-        // init a new stack
-        stack = push(NULL, root);
-        // init failed
-        if (!stack)
-        {
-            return NULL;
-        }
-        pushLeftDesc(&stack, root);
+        // reset old iterator state
+        clearStack(iterStack);
+        iterStack = NULL;
 
-        // return the first val
-        return nextTreeData(NULL);
+        // push root and all left children
+        pushLeftBranch(&iterStack, root);
     }
 
-    // neither stack nor root exist
-    if (!stack)
-    {
+    // No active iterator
+    if (iterStack == NULL)
         return NULL;
-    }
 
-    // get next val with stack
-    TreeNode *res = top(stack);
-    stack = pop(stack);
-    if (res->right)
-    {
-        stack = push(stack, res->right);
-        pushLeftDesc(&stack, res->right);
-    }
+    // Get next node
+    TreeNode *node = (TreeNode *)top(iterStack);
+    iterStack = pop(iterStack);
 
-    return res->data;
+    // push right subtree and its left descendants
+    if (node->right)
+        pushLeftBranch(&iterStack, node->right);
+
+    return node->data;
 }
 
-// Releases all memory resources (including data copies).
+// Frees all nodes and also resets iterator.
 void clearTree(TreeNode *root)
 {
-    // this check is crucial for recursion
     if (!root)
-    {
-        // nothing to clear
         return;
-    }
 
-    // release the resources of child nodes first
     clearTree(root->left);
     clearTree(root->right);
 
-    // free the data (it's just a copy created in addToTree())
     free(root->data);
     free(root);
+
+    // If we clear the tree, iterator must not point into freed memory.
+    clearStack(iterStack);
+    iterStack = NULL;
 }
 
-// Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root)
 {
-    // there are no nodes
     if (!root)
-    {
         return 0;
-    }
 
     return 1 + treeSize(root->left) + treeSize(root->right);
-}
+}

numbers.c

@@ -5,101 +5,79 @@
 #include "numbers.h"
 #include "bintree.h"
 
-static int compareInt(const void *ptr1, const void *ptr2);
+//Speicher für Array erstellen, zufällige Zahlen von 1-2xlen erzeugen, mittels Binärbaum checken, ob Zahlen einzigartig sind
+//Eine Zahl duplizieren, an zufälliger Stelle einfügen und die Zahl an der Stelle ans Ende schieben
+const int compare (const void *a, const void *b);
 
-// TODO: getDuplicate und createNumbers implementieren
-/*  *   * Erzeugen eines Arrays mit der vom Nutzer eingegebenen Anzahl an Zufallszahlen.
- * Sicherstellen, dass beim Befüllen keine Duplikate entstehen.
- * Duplizieren eines zufälligen Eintrags im Array.
- * in `getDuplicate()`: Sortieren des Arrays und Erkennen der doppelten Zahl durch Vergleich benachbarter Elemente. */
-
-// Returns len random numbers between 1 and 2x len in random order which are all different, except for two entries.
-// Returns NULL on errors. Use your implementation of the binary search tree to check for possible duplicates while
-// creating random numbers.
-
-/*
-the implemented tree can't efficiently check if it contains a specific number, but we don't actually need that anyways
-create numbers just counts and checks if the just inserted number sets the isDuplicate pointer
-*/
-// srand should have been called before this function
 unsigned int *createNumbers(unsigned int len)
 {
-  unsigned int *randomNumbers = malloc(len * sizeof(int));
-
-  if (!randomNumbers)
-  {
-    return NULL;
-  }
-
-  // including upper limit
-  int upperLimit = len * 2;
-
-  int numberCnt = 0;
-
+  unsigned int *numbers = malloc (sizeof(unsigned int) * len);
+  unsigned int upperLimit = len * 2;
   int isDuplicate = 0;
-  TreeNode *root = NULL;
-  // we only need len-1 numbers because 1 will be duplicated
-  while (numberCnt < len - 1)
-  {
-    // numbers up to and including upperLimit without 0
-    int randNum = rand() % upperLimit + 1;
-    // reset isDuplicate
-    isDuplicate = 0;
-    // don't forget to set the root here
-    root = addToTree(root, &randNum, sizeof(randNum), (CompareFctType)compareInt, &isDuplicate);
-    if (isDuplicate)
+  TreeNode *binTree = NULL;
+
+  for (unsigned int i = 0; i < len; i++) {
+    do
     {
-      // number already exists
-      continue;
-    }
-    randomNumbers[numberCnt++] = randNum;
+      isDuplicate = 0;
+      numbers[i] = rand () % upperLimit + 1;
+      binTree = addToTree(binTree, &numbers[i], sizeof(unsigned int), compare, &isDuplicate);
+    } while (isDuplicate);
+  } 
+
+  unsigned int duplicate = numbers[rand () % len];
+  int indexDuplicate;
+
+  do {
+    indexDuplicate = rand() % len;
+  } while (numbers[indexDuplicate] == duplicate);
+
+  if (numbers[len-1] != duplicate) {
+    numbers[len-1] = numbers[indexDuplicate];
   }
-
-  // select which number to duplicate
-  int dupNum = randomNumbers[rand() % numberCnt];
-  // ...and where to insert
-  int dupNumIdx = rand() % len;
-
-  // move the number currently at the dupNumIdx to the end
-  // and insert the dupNum at the index
-  // this also works if the last idx was selected for dupNum
-  randomNumbers[len - 1] = randomNumbers[dupNumIdx];
-  randomNumbers[dupNumIdx] = dupNum;
-
-  // clean up memory
-  clearTree(root);
-  return randomNumbers;
+  
+  numbers[indexDuplicate] = duplicate;
+  
+  clearTree(binTree);
+  
+  return numbers;
 }
 
-// Returns only the only number in numbers which is present twice. Returns zero on errors.
-unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
-{
-  unsigned int *numbersCpy = malloc(sizeof(unsigned int) * len);
-  if (!numbersCpy)
-  {
+//Vergleichsfunktion von qsort
+const int compare (const void *a, const void *b) {
+  const unsigned int *x = a;
+  const unsigned int *y = b;
+  if (*x < *y) {
+    return -1;
+  }
+  else if (*x > *y) {
+    return 1;
+  }
+  else {
     return 0;
   }
-  memcpy(numbersCpy, numbers, len * sizeof(unsigned int));
-  numbersCpy = numbersCpy; // shadow the numbers array with copy
-
-  qsort((void *)numbersCpy, len, sizeof(int), compareInt); // sort the array
-
-  unsigned int duplicateFound = 0; // zero on errors
-  for (int i = 0; i < len - 1; i++)
-  {
-    if (numbersCpy[i] == numbersCpy[i + 1])
-    {
-      duplicateFound = numbersCpy[i];
-      break;
-    }
-  }
-  free(numbersCpy);
-  return duplicateFound;
 }
 
-static int compareInt(const void *ptr1, const void *ptr2)
+//Sortiert Zahlen mit qsort, vergleicht dann benachbarte Elemente und gibt bei Erfolg die doppelte Zahl zurück
+unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
 {
-  int num1 = *(int *)ptr1;
-  int num2 = *(int *)ptr2;
-  return num1 - num2;
+  if (len < 2) {
+    return 0;
+  }
+
+unsigned int *copy = malloc (sizeof(unsigned int) * len);
+memcpy (copy, numbers, sizeof(unsigned int) * len);
+
+qsort(copy, len, sizeof(unsigned int), compare);
+
+for (int i = 0; i < len-1; i++) {
+  if (copy[i] == copy [i+1]) {
+    unsigned int result = copy [i];
+    free (copy);
+    return result;
+  }
+}
+
+free (copy);
+return 0;
 }

test_bintree.c

@@ -1,39 +1,145 @@
 #include "unity.h"
 #include "bintree.h"
-#include "string.h"
+#include <string.h>
+#include <stdio.h>
+
+static int compareInt(const void *a, const void *b)
+{
+    int x = *(const int *)a;
+    int y = *(const int *)b;
+    return (x > y) - (x < y);
+}
 
 void setUp(void)
 {
-    // set stuff up here
 }
 
 void tearDown(void)
 {
-    // set stuff up here
 }
 
-// this adds some strings and checks if they are returned in the right order
-void test_insert_and_retrieve(void)
+/* ============================================================
+   TEST 1 — Strings einfügen + korrekte Reihenfolge prüfen
+   ============================================================ */
+
+void test_insert_and_retrieve_strings(void)
 {
     char *data1 = "a_this";
     char *data2 = "b_is";
     char *data3 = "c_testdata";
 
-    TreeNode *root = addToTree(NULL, data1, strlen(data1) + 1, (CompareFctType)&strcmp, NULL);
-    addToTree(root, data2, strlen(data2) + 1, (CompareFctType)&strcmp, NULL);
-    addToTree(root, data3, strlen(data3) + 1, (CompareFctType)&strcmp, NULL);
+    TreeNode *root = addToTree(NULL, data1, strlen(data1) + 1, (CompareFctType)strcmp, NULL);
+    addToTree(root, data2, strlen(data2) + 1, (CompareFctType)strcmp, NULL);
+    addToTree(root, data3, strlen(data3) + 1, (CompareFctType)strcmp, NULL);
 
-    TEST_ASSERT_EQUAL_STRING(data1, (char *)nextTreeData(root));
-    TEST_ASSERT_EQUAL_STRING(data2, (char *)nextTreeData(NULL));
-    TEST_ASSERT_EQUAL_STRING(data3, (char *)nextTreeData(NULL));
+    TEST_ASSERT_EQUAL_STRING(data1, nextTreeData(root));
+    TEST_ASSERT_EQUAL_STRING(data2, nextTreeData(NULL));
+    TEST_ASSERT_EQUAL_STRING(data3, nextTreeData(NULL));
+    TEST_ASSERT_EQUAL_PTR(NULL, nextTreeData(NULL)); // Ende
 
     clearTree(root);
 }
 
+/* ============================================================
+   TEST 2 — Integer einfügen + Traversierung
+   ============================================================ */
+
+void test_insert_and_retrieve_ints(void)
+{
+    int a = 2, b = 1, c = 3;
+
+    TreeNode *root = NULL;
+    root = addToTree(root, &a, sizeof(int), compareInt, NULL);
+    addToTree(root, &b, sizeof(int), compareInt, NULL);
+    addToTree(root, &c, sizeof(int), compareInt, NULL);
+
+    int *v1 = nextTreeData(root);
+    int *v2 = nextTreeData(NULL);
+    int *v3 = nextTreeData(NULL);
+    int *v4 = nextTreeData(NULL);
+
+    TEST_ASSERT_EQUAL_INT(1, *v1);
+    TEST_ASSERT_EQUAL_INT(2, *v2);
+    TEST_ASSERT_EQUAL_INT(3, *v3);
+    TEST_ASSERT_NULL(v4);
+
+    clearTree(root);
+}
+
+/* ============================================================
+   TEST 3 — treeSize korrekt?
+   ============================================================ */
+
+void test_tree_size(void)
+{
+    TreeNode *root = NULL;
+
+    TEST_ASSERT_EQUAL_UINT(0, treeSize(root));
+
+    int x1 = 10, x2 = 5, x3 = 15;
+    root = addToTree(root, &x1, sizeof(int), compareInt, NULL);
+    addToTree(root, &x2, sizeof(int), compareInt, NULL);
+    addToTree(root, &x3, sizeof(int), compareInt, NULL);
+
+    TEST_ASSERT_EQUAL_UINT(3, treeSize(root));
+
+    clearTree(root);
+}
+
+/* ============================================================
+   TEST 4 — Duplikaterkennung
+   ============================================================ */
+
+void test_duplicate_detection(void)
+{
+    int x = 42;
+    int dupFlag = -1;
+
+    TreeNode *root = addToTree(NULL, &x, sizeof(int), compareInt, &dupFlag);
+    TEST_ASSERT_EQUAL_INT(0, dupFlag);
+
+    addToTree(root, &x, sizeof(int), compareInt, &dupFlag);
+    TEST_ASSERT_EQUAL_INT(1, dupFlag);
+
+    TEST_ASSERT_EQUAL_UINT(1, treeSize(root));
+
+    clearTree(root);
+}
+
+/* ============================================================
+   TEST 5 — Iterator nach clearTree → sollte NULL liefern
+   ============================================================ */
+
+void test_iterator_after_cleartree(void)
+{
+    int a = 5, b = 1, c = 9;
+
+    TreeNode *root = NULL;
+    root = addToTree(root, &a, sizeof(int), compareInt, NULL);
+    addToTree(root, &b, sizeof(int), compareInt, NULL);
+    addToTree(root, &c, sizeof(int), compareInt, NULL);
+
+    nextTreeData(root);
+
+    clearTree(root);
+
+    TEST_ASSERT_NULL(nextTreeData(NULL));
+    TEST_ASSERT_NULL(nextTreeData(NULL));
+}
+
 int main(void)
 {
-    printf("============================\nBintree tests\n============================\n");
+    printf("============================\n");
+    printf("Bintree tests\n");
+    printf("============================\n");
+
     UNITY_BEGIN();
-    RUN_TEST(test_insert_and_retrieve);
+
+    RUN_TEST(test_insert_and_retrieve_strings);
+    RUN_TEST(test_insert_and_retrieve_ints);
+    RUN_TEST(test_tree_size);
+    RUN_TEST(test_duplicate_detection);
+    RUN_TEST(test_iterator_after_cleartree);
+
     return UNITY_END();
-}
+}