bugfix

bintree.c

@@ -2,7 +2,7 @@
 #include "stack.h"
 #include "bintree.h"
 
-//TODO: binären Suchbaum implementieren
+// 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),
@@ -12,7 +12,57 @@
 // 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)
 {
+    if (isDuplicate)
+        *isDuplicate = 0;
 
+    // Wenn kein Knoten angelegt
+    if (root == NULL)
+    {
+        // Neuen Knoten erstellen
+        TreeNode *newNode = malloc(sizeof(TreeNode));
+        if (!newNode)
+            return NULL;
+        // mit Daten füllen
+        newNode->data = malloc(dataSize);
+        if (!(newNode->data))
+        {
+            free(newNode);
+            return NULL;
+        }
+
+        memcpy(newNode->data, data, dataSize);
+        newNode->left = NULL; // Kinder NULL setzen
+        newNode->right = NULL;
+        return newNode;
+    }
+    // auf Doppellungen überprüfen, daten/werte vergelichen
+    // int cmp = compareFct(data, root->data);
+
+    int cmp = compareFct(data, root->data);
+
+    if (cmp == 0) // Duplikat erkannt
+    {
+        if (isDuplicate) // nicht einfügen
+        {
+            *isDuplicate = 1;
+            return root;
+        }
+        else // einfügen erlaubt
+        {
+            root->right = addToTree(root->right, data, dataSize, compareFct, NULL);
+            return root;
+        }
+    }
+    // kein Duplikat
+    if (cmp < 0)
+    {
+        root->left = addToTree(root->left, data, dataSize, compareFct, isDuplicate);
+    }
+    else if (cmp > 0)
+    {
+        root->right = addToTree(root->right, data, dataSize, compareFct, isDuplicate);
+    }
+    return root;
 }
 
 // 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.
@@ -20,17 +70,66 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
 // push the top node and push all its left nodes.
 void *nextTreeData(TreeNode *root)
 {
+    static StackNode *stack = NULL; // Stack für Iterator
+    static TreeNode *lastRoot = NULL;
+    TreeNode *currentNode;
 
+    if (root != NULL) // Initialisierung bei erstem Aufruf
+    {
+        lastRoot = root;
+
+        if (stack)
+        {
+            clearStack(stack);
+            stack = NULL;
+        }
+        //leeren Stack initialisieren
+        stack = NULL;
+
+        // alle linken Knoten vom Wurzelknoten pushen
+        currentNode = root;
+        while (currentNode)
+        {
+            stack = push(stack, currentNode);
+            currentNode = currentNode->left;
+        }
+    }
+    // Stack ist leer, keine Daten mehr
+    if (!stack)
+        return NULL;
+
+    TreeNode *newNode = (TreeNode *)top(stack);
+    // Stack-Knoten entfernen
+    stack = pop(stack);
+
+    // Wenn rechter Teilbaum vorhanden → alle linken Knoten pushen
+    currentNode = newNode->right;
+    while (currentNode)
+    {
+        stack = push(stack, currentNode);
+        currentNode = currentNode->left;
+    }
+    return newNode->data; // Daten zurückgeben
 }
 
 // Releases all memory resources (including data copies).
 void clearTree(TreeNode *root)
 {
-
+    if (root)
+    {
+        clearTree(root->left);
+        clearTree(root->right);
+        free(root->data);
+        free(root);
+    }
 }
 
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root)
 {
-
+    unsigned int size = 0;
+    if (root == NULL)
+        return 0;
+    size = 1 + treeSize(root->left) + treeSize(root->right);
+    return size;
 }

highscores.txt

@@ -1 +1,5 @@
+player_name;6979
+player_name;4982
 player1;3999
+player_name;3992
+player_name;2996

makefile

@@ -35,8 +35,11 @@ $(program_obj_filesobj_files): %.o: %.c
 # --------------------------
 # Unit Tests
 # --------------------------
-unitTests:
+unitTests: numbers.o test_numbers.c bintree.o $(unityfolder)/unity.c
-	echo "needs to be implemented"
+	$(CC) $(FLAGS) -I$(unityfolder) -o runtest_numbers test_numbers.c numbers.o bintree.o $(unityfolder)/unity.c
+
+unitTestsStack: stack.o test_stack.c $(unityfolder)/unity.c
+	$(CC) $(FLAGS) -I$(unityfolder) $^ -o $@
 
 # --------------------------
 # Clean

numbers.c

@@ -5,7 +5,7 @@
 #include "numbers.h"
 #include "bintree.h"
 
-//TODO: getDuplicate und createNumbers implementieren
+// 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.
@@ -14,13 +14,115 @@
 // 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.
+
+/*
+// ohne Binärbaum
 unsigned int *createNumbers(unsigned int len)
 {
+  if (len <= 2)
+    return NULL;
 
+  // Zufallszahlen erzeugen
+  srand(time(NULL));
+  unsigned int *numbers = malloc(len * sizeof(unsigned int));
+  // prüfen, ob Speicher richtig reserviert wurde
+  if (numbers == NULL)
+  {
+    printf("Es konnte nicht genügend Speicher reserviert werden");
+    free(numbers);
+    return NULL;
+  }
+  // einsetzen der Zahlen ins array
+  for (size_t i = 0; i < len; i++)
+  {
+    numbers[i] = rand() % ((2 * len) + 1);
+    // stellt sicher, dass keine Duplikate vorhanden sind
+    for (size_t j = 0; j < i; j++)
+    {
+      if (numbers[i] == numbers[j])
+      {
+        i--;
+        break;
+      }
+    }
+  }
+  // numbers[rand()% (len+1)] = rand()% ((2* len) + 1);
+  size_t dupIndex = rand() % len;    // Index, der dupliziert wird
+  size_t targetIndex = rand() % len; // Ziel-Index, wo das Duplikat hin soll
+  if (dupIndex != targetIndex)
+  {
+    numbers[targetIndex] = numbers[dupIndex]; // echtes Duplikat
+  }
+  return numbers;
+  free(numbers);
+}
+*/
+int compare(const void *a, const void *b)
+{
+  return (*(int *)a - *(int *)b);
+}
+
+// mit Binärbaum
+
+unsigned int *createNumbers(unsigned int len)
+{
+  if (len <= 2)
+    return NULL;
+
+  // Zufallszahlen erzeugen
+  srand(time(NULL));
+  unsigned int *numbers = malloc(len * sizeof(unsigned int));
+  // prüfen, ob Speicher richtig reserviert wurde
+  if (numbers == NULL)
+  {
+    printf("Es konnte nicht genügend Speicher reserviert werden");
+    free(numbers);
+    return NULL;
+  }
+
+  TreeNode *root = NULL;
+  for (size_t i = 0; i < len; i++)
+  {
+    unsigned int isDup = 0;
+    numbers[i] = (rand() % (2 * len)) + 1;
+    root = addToTree(root, &numbers, sizeof(numbers), compare, &isDup);
+    if (isDup != 1)
+    {
+      i--;
+    }
+  }
+
+  // numbers[rand()% len] = (rand()% (2* len) + 1);
+  size_t dupIndex = rand() % len;    // Index, der dupliziert wird
+  size_t targetIndex = rand() % len; // Ziel-Index, wo das Duplikat hin soll
+  if (dupIndex != targetIndex)
+  {
+    numbers[targetIndex] = numbers[dupIndex]; // echtes Duplikat
+  }
+  return numbers;
+  clearTree(root);
+  free(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 dobble;
+  // neues Array zum reinkopieren initialisieren
+  unsigned int *nums = malloc(len * sizeof(unsigned int));
+  for (int l = 0; l < len; l++)
+    nums[l] = numbers[l];
 
+  // array sortieren
+  qsort(nums, len, sizeof(unsigned int), compare);
+  for (int k = 0; k < len; k++)
+  {
+    if (nums[k] == nums[k + 1])
+    {
+      dobble = nums[k];
+      break;
+    }
+  }
+  return dobble;
+  free(nums);
 }

stack.c

@@ -10,24 +10,54 @@
 // Pushes data as pointer onto the stack.
 StackNode *push(StackNode *stack, void *data)
 {
+    // Neues Stack-Element erstellen
+    StackNode *newNode = malloc(sizeof(StackNode));
+    if (!newNode) {
+        return stack; // oder NULL, je nach Fehlerstrategie
+    }
 
+    
+    newNode->data = data;
+    newNode->next = stack; // bisheriger Stack wird nach unten geschoben
+
+    return newNode; // neuer Kopf des Stacks
 }
 
 // Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be
 // freed by caller.)
 StackNode *pop(StackNode *stack)
 {
+   if (stack == NULL)
+        return NULL;
 
+    StackNode *newTop = stack->next;
+
+    // Daten gehen verloren!
+    // Caller KANN sie nicht freigeben.
+    free(stack);
+
+    return newTop;
 }
 
 // Returns the data of the top element.
 void *top(StackNode *stack)
 {
+    if (stack == NULL)
+        return NULL;   // kein Element im Stack
 
+    return stack->data;
 }
 
 // Clears stack and releases all memory.
 void clearStack(StackNode *stack)
 {
+    StackNode *current = stack;
+
+    while (current != NULL) 
+    {
+        StackNode *next = current->next;
+        free(current);
+        current = next;
+    }
 
 }

stack.h

@@ -8,6 +8,10 @@ The latest element is taken from the stack. */
 #include <stdlib.h>
 
 //TODO: passenden Datentyp als struct anlegen
+typedef struct Node {
+    void *data;
+    struct Node *next;
+} StackNode;
 
 // Pushes data as pointer onto the stack.
 StackNode *push(StackNode *stack, void *data);

test_numbers.c

@@ -0,0 +1,54 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include "numbers.h"
+#include "bintree.h"
+#include "unity.h"
+
+//überprüft, dass die Funktion nicht NULL zurückgibt
+void test_create_Numbers_notNull(void){
+    unsigned int* numbers = createNumbers(10);
+    TEST_ASSERT_NOT_NULL(numbers);
+    free(numbers);
+}
+// überprüft, ob die generierten Zufallszahlen innerhalb des Intervalls sind
+void test_create_Numbers_randoms_inside_Value_range(void){
+    unsigned int len = 10;
+    unsigned int* numbers = createNumbers(len);
+
+    for(size_t i = 0; i < len; i++)
+        TEST_ASSERT_LESS_OR_EQUAL(2 * len + 1, numbers[i]);
+
+    free(numbers);
+}
+
+// überprüft, ob getDuplicate,die richtige doppelte Zahl findet
+void test_get_duplicate_returns_correct_dobble(void){
+    unsigned int numbers [5] = {1,2,3,4,2};
+    unsigned int len = 5;
+    unsigned int expected_result = 2;
+    unsigned int result = getDuplicate(numbers, len);
+    TEST_ASSERT_EQUAL_UINT32(expected_result, result);
+}
+
+
+void setUp(void) {
+    
+}
+
+void tearDown(void) {
+    
+}
+
+
+int main()
+{
+    UNITY_BEGIN();
+    
+    printf("\n============================\nNumbers tests\n============================\n");
+    RUN_TEST(test_get_duplicate_returns_correct_dobble);
+    RUN_TEST(test_create_Numbers_notNull);
+    RUN_TEST(test_create_Numbers_randoms_inside_Value_range);
+    return UNITY_END();
+}

test_stack.c

@@ -0,0 +1,78 @@
+#include <stdlib.h>
+#include "stack.h"
+#include "unity.h"
+
+void test_push_and_top(void);
+
+void test_pop(void);
+
+void test_clearStack(void);
+
+void setUp(void) {}
+
+void tearDown(void) {}
+
+
+int main(void)
+{
+    UNITY_BEGIN();
+
+    RUN_TEST(test_push_and_top);
+    RUN_TEST(test_pop);
+    RUN_TEST(test_clearStack);
+
+    return UNITY_END();
+}
+
+
+void test_push_and_top(void)
+{
+    StackNode *stack = NULL;
+
+    int a = 10;
+    int b = 20;
+    int c = 30;
+
+    stack = push(stack, &a);
+    stack = push(stack, &b);
+    stack = push(stack, &c);
+
+    TEST_ASSERT_EQUAL_INT(30, *(int*)top(stack));
+
+    clearStack(stack);
+    TEST_ASSERT_NULL(stack);
+}
+
+void test_pop(void)
+{
+    StackNode *stack = NULL;
+
+    int x = 111;
+    int y = 222;
+
+    stack = push(stack, &x);
+    stack = push(stack, &y);
+
+    // pop removes y
+    stack = pop(stack);
+    TEST_ASSERT_EQUAL_INT(111, *(int*)top(stack));
+
+    // pop removes x
+    stack = pop(stack);
+    TEST_ASSERT_NULL(stack);
+}
+
+void test_clearStack(void)
+{
+    StackNode *stack = NULL;
+
+    int x = 5;
+    int y = 6;
+
+    stack = push(stack, &x);
+    stack = push(stack, &y);
+
+    clearStack(stack);
+
+    TEST_ASSERT_NULL(stack);
+}