wip

.vscode/settings.json

@@ -1,6 +0,0 @@
-{
-    "files.associations": {
-        "stdio.h": "c",
-        "unity.h": "c"
-    }
-}

bintree.c

@@ -2,66 +2,17 @@
 #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),
- * `nextTreeData`: Traversierung mit Hilfe des zuvor implementierten Stacks. */
+    * `clearTree`: gibt den gesamten Baum frei (rekursiv),
+    * `treeSize`: zählt die Knoten im Baum (rekursiv),
+    * `nextTreeData`: Traversierung mit Hilfe des zuvor implementierten Stacks. */
 
 // 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).
-/*
-memcpy
-dest	-	pointer to the memory location to copy to
-src	-	pointer to the memory location to copy from
-count	-	number of bytes to copy
-*/
 TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFctType compareFct, int *isDuplicate)
 {
-    if (root == NULL)
-    {
-        TreeNode *newtreenode = malloc(sizeof(TreeNode));
-        if (newtreenode != NULL)
-        {
 
-            newtreenode->data = malloc(dataSize);
-            if (newtreenode->data == NULL)
-            {
-                free(newtreenode);
-                return NULL;
-            }
-
-            memcpy(newtreenode->data, data, dataSize);
-
-            newtreenode->left = NULL;
-            newtreenode->right = NULL;
-
-            if (isDuplicate != NULL)
-            {
-                *isDuplicate = 0;
-            }
-        }
-        return newtreenode;
-    }
-
-    int compare_value = compareFct(data, root->data); // wie funktioniert comparefcttype funktion? bzw wo steht diese?
-
-    if (compare_value == 0 && isDuplicate != NULL)
-    {
-        *isDuplicate = 1;
-        return root;
-    }
-
-    if (compare_value < 0)
-    {
-        root->left = addToTree(root->left, data, dataSize, compareFct, isDuplicate);
-    }
-    else
-    {
-        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.
@@ -69,60 +20,17 @@ 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;
-    TreeNode *currentElement = root;
 
-    if (currentElement != NULL)
-    {
-        clearStack(stack);
-        stack = NULL;
-
-        while (currentElement != NULL)
-        {
-            stack = push(stack, currentElement);
-            currentElement = currentElement->left;
-        }
-    }
-
-    if (stack == NULL)
-    {
-        return NULL;
-    }
-
-    TreeNode *node = (TreeNode *)top(stack);
-    stack = pop(stack);
-
-    currentElement = node->right;
-    while (currentElement != NULL)
-    {
-        stack = push(stack, currentElement);
-        currentElement = currentElement->left;
-    }
-    return node->data;
 }
 
 // Releases all memory resources (including data copies).
 void clearTree(TreeNode *root)
 {
-    if (root != NULL)
-    {
-        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 count = 0;
-    
-    if (root != NULL)
-    {
-        count = 1;
-        count += treeSize(root->right);
-        count += treeSize(root->left);
-    }
-    return count;
+
 }

bintree.h

@@ -17,19 +17,11 @@ typedef struct node
 TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFctType compareFct, int *isDuplicate);
 // 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 right top node and push all its left nodes.
-// Hilfsfunktion pushAllLeft (node) auf rechten nachfolger
-// wenn neuer Baum dann pushallleft auf wurzel
-// immer aufräumen!!!
-// kein vorsortiertes array, sonst entarteter Baum
+// push the top node and push all its left nodes.
 void *nextTreeData(TreeNode *root);
 // Releases all memory resources (including data copies).
-// sortierte Ausgabe
-// aufrufen wie mit strtok
-// welcher Baum durchlaufen
-// immer null aufrufen bis fertig durchlaufen weil null zurückgegeben wird
 void clearTree(TreeNode *root);
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root);
-//rekursiv die Anzahl der gesetzten Knoten ermitteln
+
 #endif

highscores.txt

@@ -1,7 +1,2 @@
-NAME;21730
-jakob;11918
-jakob;11860
 Jakob;4974
 player1;3999
-NAME;2997
-NAME;2995

makefile

@@ -35,15 +35,9 @@ $(program_obj_filesobj_files): %.o: %.c
 # --------------------------
 # Unit Tests
 # --------------------------
-test_numbers:
-	$(CC) -o test_numbers test_numbers.c numbers.c $(unityfolder)/unity.c $(FLAGS)
 
-test_stack:
-	$(CC) -o test_stack test_stack.c stack.c $(unityfolder)/unity.c $(FLAGS)
 
-test_bintree:
-	$(CC) -o test_bintree test_bintree.c bintree.c stack.c $(unityfolder)/unity.c $(FLAGS)
-	
+
 # --------------------------
 # Clean
 # --------------------------

numbers.c

@@ -5,9 +5,7 @@
 #include "numbers.h"
 #include "bintree.h"
 
-unsigned int seed = 0;
-
-unsigned int *numbers;
+unsigned int RANDOM_SEED = 0;
 
 // TODO: getDuplicate und createNumbers implementieren
 /*  *   * Erzeugen eines Arrays mit der vom Nutzer eingegebenen Anzahl an Zufallszahlen.
@@ -19,83 +17,81 @@ unsigned int *numbers;
 // Returns NULL on errors. Use your implementation of the binary search tree to check for possible duplicates while
 // creating random numbers.
 
-unsigned int setSeed(unsigned int seed_test)
+unsigned int setSeed(unsigned int seed)
 {
-  seed = seed_test;
-  return seed;
+  RANDOM_SEED = seed;
+  return RANDOM_SEED;
 }
 
-void create_unique_random_numbers(unsigned int len, unsigned int numbers[])
+void createchecknumber(unsigned int len, unsigned int numbers[])
 {
-    TreeNode *root = NULL;
-    int isDuplicate;
+  for (unsigned int i = 0; i < len; i++)
+  {
+    unsigned int same = 0;
 
-    for (unsigned int i = 0; i < len; i++)
+    do
     {
-        unsigned int same = 0;
-        do
-        {
-            unsigned int value = rand() % (len * 2) + 1;
-            root = addToTree(root, &value, sizeof(unsigned int), compare, &isDuplicate);
-            if (isDuplicate)
-            {
-                same = 1;
-            }
-            else
-            {
-                numbers[i] = value;
-                same = 0;
-            }
-        } while (same);
-    }
+      unsigned int value = (rand() % (len * 2) + 1);
+      same = 0;
 
-    clearTree(root);
+      for (unsigned int j = 0; j < i; j++)
+      {
+        if (numbers[j] == value)
+        {
+          same = 1;
+          break;
+        }
+      }
+
+      if (same == 0)
+      {
+        numbers[i] = value;
+      }
+
+    } while (same == 1);
+  }
 }
 
 unsigned int *createNumbers(unsigned int len)
 {
-
-  if (len <= 2)
+  if (len <= 2) //sonst Index-Auswahl-Dauerschleife
   {
-    return numbers;
+    return NULL;
   }
 
-  if (seed == 0)
+  if (RANDOM_SEED == 0)
   {
     srand(time(NULL));
   }
   else
   {
-    srand(seed);
+    srand(RANDOM_SEED);
   }
 
-  numbers = malloc(sizeof(unsigned int) * len);
-
-  if (numbers != NULL)
+  unsigned int *numbers = malloc(sizeof(unsigned int) * len);
+  if (numbers == NULL)
   {
-    create_unique_random_numbers(len, numbers);
-
-    unsigned int i = 0;
-    unsigned int j = 0;
-
-    do
-    {
-      i = 0;
-      j = 0;
-
-      i = rand() % len;
-      j = rand() % len;
-
-    } while (i == j || i == j + 1 || i == j - 1);
-
-    numbers[i] = numbers[j];
+    return NULL; 
   }
 
+  createchecknumber(len, numbers);
+
+  unsigned int i = 0;
+  unsigned int j = 0;
+
+  do
+  {
+    i = rand() % len;
+    j = rand() % len;
+
+  } while (i == j);
+
+  numbers[i] = numbers[j];
+
   return numbers;
 }
 
-/*
-void sortnumbers(unsigned int numbers[], unsigned int len) //-> qsort
+void sortnumbers(unsigned int numbers[], unsigned int len)
 {
   for (unsigned int j = 0; j < len - 1; j++)
   {
@@ -111,39 +107,27 @@ void sortnumbers(unsigned int numbers[], unsigned int len) //-> qsort
     }
   }
 }
-*/
 
-int compare(const void *arg1, const void *arg2)
-{
-  unsigned int a = *(const unsigned int *)arg1;
-  unsigned int b = *(const unsigned int *)arg2;
 
-  return ((a > b) - (a < b));
-}
-
-// 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)
 {
-  if (len <= 2)
+  if (numbers == NULL || len < 2) // sonst Index-Auswahl-Dauerschleife
   {
     return 0;
   }
 
   unsigned int *copynumbers = malloc(sizeof(unsigned int) * len);
-
   if (copynumbers == NULL)
   {
     return 0;
   }
-
+  
   for (unsigned int i = 0; i < len; i++)
   {
     copynumbers[i] = numbers[i];
   }
 
-  qsort(copynumbers, len, sizeof(unsigned int), compare);
-
-  // sortnumbers(copynumbers, len);
+  sortnumbers(copynumbers, len);
 
   for (unsigned i = 0; i < len - 1; i++)
   {

numbers.h

@@ -1,12 +1,12 @@
 #ifndef NUMBERS_H
 #define NUMBERS_H
 
+extern unsigned int RANDOM_SEED;
+
 // 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.
 
-int compare(const void *arg1, const void *arg2);
-
 unsigned int setSeed(unsigned int seed);
 
 unsigned int *createNumbers(unsigned int len);

stack.c

@@ -1,65 +1,33 @@
 #include <stdlib.h>
 #include "stack.h"
 
-// TODO: grundlegende Stackfunktionen implementieren:
+//TODO: grundlegende Stackfunktionen implementieren:
 /*  * `push`: legt ein Element oben auf den Stack,
- * `pop`: entfernt das oberste Element,
- * `top`: liefert das oberste Element zurück,
- * `clearStack`: gibt den gesamten Speicher frei. */
-
-static StackNode *createNewElement()
-{
-    return malloc(sizeof(StackNode));
-}
+    * `pop`: entfernt das oberste Element,
+    * `top`: liefert das oberste Element zurück,
+    * `clearStack`: gibt den gesamten Speicher frei. */
 
 // Pushes data as pointer onto the stack.
 StackNode *push(StackNode *stack, void *data)
 {
-    StackNode *node = createNewElement();
-    if (node != NULL)
-    {
-        node->data = data;
-        node->next = stack;
-        return node;
-    }
-    return stack;
+
 }
 
 // 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)
-    {
-        StackNode *currentElement = stack;
-        stack = stack->next;
-        
-        free(currentElement);
-    }
-    return stack;
+
 }
 
 // Returns the data of the top element.
 void *top(StackNode *stack)
 {
-    if (stack != NULL)
-    {
-        return stack->data;
-    }
-    return NULL;
+
 }
 
 // Clears stack and releases all memory.
 void clearStack(StackNode *stack)
 {
-    StackNode *nextElement = stack;
 
-    while (stack != NULL)
-    {
-        nextElement = stack->next;
-
-        free(stack);
-
-        stack = nextElement;
-    }
-}
+}

stack.h

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

test__numbers.c

@@ -0,0 +1,84 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include "unity/unity.h"
+#include "numbers.h"
+
+static unsigned int count_number_occurrence(const unsigned int *arr, unsigned int len, unsigned int value)
+{
+    unsigned int count = 0;
+    for (unsigned int i = 0; i < len; i++)
+    {
+        if (arr[i] == value)
+            count++;
+    }
+    return count;
+}
+
+void test_length_and_duplicate()
+{
+    setSeed(1);
+    unsigned int len = 10;
+    unsigned int *test_numbers = createNumbers(len);
+
+    TEST_ASSERT_NOT_NULL(test_numbers);
+
+    //Bereich checken:
+    for (unsigned int i = 0; i < len; i++)
+    {
+        TEST_ASSERT_TRUE(test_numbers[i] >= 1);
+        TEST_ASSERT_TRUE(test_numbers[i] <= len * 2);
+    }
+
+    //Prüfen, ob genau 1 Wert doppelt vorkommt:
+    unsigned int duplicate = getDuplicate(test_numbers, len);
+    TEST_ASSERT_NOT_EQUAL(0, duplicate);
+
+    unsigned int occurrences = count_number_occurrence(test_numbers, len, duplicate);
+    TEST_ASSERT_EQUAL_UINT(2, occurrences);
+
+    //Prüfen, ob alle anderen Werte nur einmal vorkommen:
+    for (unsigned int i = 1; i <= len * 2; i++)
+    {
+        if (i == duplicate)
+            continue;
+
+        unsigned int c = count_number_occurrence(test_numbers, len, i);
+        TEST_ASSERT_TRUE(c <= 1); //Keine Zahl darf doppelt vorkommen.
+    }
+
+    free(test_numbers);
+}
+
+void test_duplicate_value()
+{
+    unsigned int test_numbers[6] = {1, 2, 3, 4, 5, 5};
+    unsigned int duplicate = 0;
+
+    duplicate = getDuplicate(test_numbers, 6);
+
+    TEST_ASSERT_EQUAL(5, duplicate);
+}
+
+void test_duplicate_value_if_false()
+{
+    unsigned int test_numbers[6] = {1, 2, 3, 4, 5, 6};
+    unsigned int duplicate = 0;
+
+    duplicate = getDuplicate(test_numbers, 6);
+
+    TEST_ASSERT_EQUAL(0, duplicate);
+}
+
+void setUp(void) {}
+
+void tearDown(void) {}
+
+int main(void)
+{
+    UNITY_BEGIN();
+
+    RUN_TEST(test_length_and_duplicate);
+    RUN_TEST(test_duplicate_value);
+    RUN_TEST(test_duplicate_value_if_false);
+    return UNITY_END();
+}

test_bintree.c

@@ -1,51 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "unity/unity.h"
-#include "bintree.h"
-#include "stack.h"
-
-int cmpInt(const void *a, const void *b) {
-    return *(int *)a - *(int *)b;
-}
-
-void test_binary_tree_functions(void)
-{
-    TreeNode *root = NULL;
-    int dup;
-    
-    int values[] = {5, 3, 8, 2, 6};
-    for (int i = 0; i < 5; i++) {
-        root = addToTree(root, &values[i], sizeof(int), cmpInt, &dup);
-        TEST_ASSERT_EQUAL_INT(0, dup); 
-    }
-
-    int testDup = 5;
-    root = addToTree(root, &testDup, sizeof(int), cmpInt, &dup);
-    TEST_ASSERT_EQUAL_INT(1, dup); 
-
-    TEST_ASSERT_EQUAL_UINT(5, treeSize(root));
-
-    int inorderExpected[] = {2, 3, 5, 6, 8};
-    int idx = 0;
-    void *data;
-    for (data = nextTreeData(root); data != NULL; data = nextTreeData(NULL)) {
-        TEST_ASSERT_EQUAL_INT(inorderExpected[idx], *(int *)data);
-        idx++;
-    }
-    TEST_ASSERT_EQUAL_INT(5, idx); 
-
-    clearTree(root);
-    root = NULL;
-    TEST_ASSERT_NULL(root); 
-}
-
-void setUp(void) {}
-void tearDown(void) {}
-
-int main(void)
-{
-    UNITY_BEGIN();
-    RUN_TEST(test_binary_tree_functions);
-    return UNITY_END();
-}

test_numbers.c

@@ -1,56 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "unity/unity.h"
-#include "numbers.h"
-
-void test_createNumbers_create_one_double_number()
-{
-    setSeed(1);
-    unsigned int len = 20;
-    unsigned int *numbers = createNumbers(len);
-
-    qsort(numbers, len, sizeof(unsigned int), compare);
-
-    unsigned int count = 0;
-    for (unsigned int i = 1; i < len; i++)
-    {
-        if (numbers[i] == numbers[i - 1])
-        {
-            count++;
-        }
-    }
-    TEST_ASSERT_EQUAL_UINT(1, count);
-}
-
-void test_getduplicate_returns_corecct_duplicate()
-{
-    unsigned int test_numbers[6] = {1, 2, 3, 4, 5, 5};
-    unsigned int duplicate = 0;
-
-    duplicate = getDuplicate(test_numbers, 6);
-
-    TEST_ASSERT_EQUAL(5, duplicate);
-}
-
-void test_getduplicate_know_if_no_duplicate()
-{
-    unsigned int test_numbers[6] = {1, 2, 3, 4, 5, 6};
-    unsigned int duplicate = 0;
-
-    duplicate = getDuplicate(test_numbers, 6);
-
-    TEST_ASSERT_EQUAL(0, duplicate);
-}
-
-void setUp(void) {}
-void tearDown(void) {}
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(test_createNumbers_create_one_double_number);
-    RUN_TEST(test_getduplicate_returns_corecct_duplicate);
-    RUN_TEST(test_getduplicate_know_if_no_duplicate);
-    return UNITY_END();
-}

test_stack.c

@@ -1,38 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "unity/unity.h"
-#include "stack.h"
-
-void test_stackOrderIsCorrect()
-{
-    int expectedValues[] = {1, 2, 3, 4};
-    const unsigned int exprectedLen = sizeof(expectedValues) / sizeof(expectedValues[0]);
-    unsigned int observedLen = 0;
-    StackNode *stack = NULL;
-
-    for(int i = 0; i < exprectedLen; i++)
-    {
-        stack = push(stack, &expectedValues[i]);
-    }
-
-    for(int i = exprectedLen-1; i >= 0 && stack != NULL; i--)
-    {
-        TEST_ASSERT_EQUAL(expectedValues[i], *(int *)top(stack));
-        observedLen++;
-        stack = pop(stack);
-    }
-    TEST_ASSERT_EQUAL_UINT32(exprectedLen, observedLen);
-
-    clearStack(stack);
-}
-
-void setUp(void) {}
-void tearDown(void) {}
-
-int main(void)
-{
-    UNITY_BEGIN();
-    RUN_TEST(test_stackOrderIsCorrect);
-    return UNITY_END();
-}