fixed filling the array

bintree.c

@@ -54,27 +54,19 @@ void clearTree(TreeNode *root)
     {
         clearTree(root->left);
         free(root->left);
+        root->left = NULL;
     }
-    else if (root->right != NULL)
+    if (root->right != NULL)
     {
         clearTree(root->right);
         free(root->right);
+        root->right = NULL;
     }
-    root->data = NULL;
+    root = NULL;
 }
 
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root)
 {
-    int counterL, counterR = 0;
+    return root == NULL ? 0 : treeSize(root->left) + treeSize(root->right) + 1;
-    if (root->left != NULL)
-    {
-        counterL = treeSize(root->left) + 1;
-    }
-    else if (root->right != NULL)
-    {
-        counterR = treeSize(root->right) + 1;
-    }
-
-    return counterL + counterR;
 }

highscores.txt

@@ -1 +0,0 @@
-player1;3999

numbers.c

@@ -23,6 +23,8 @@ unsigned int checkArray(unsigned int *array, unsigned int len, unsigned int numb
     if (array[i] == number)
     {
       free = 0;
+      break;
+      
     }
   }
 
@@ -33,32 +35,37 @@ unsigned int *createNumbers(unsigned int len)
 {
   srand(time(NULL));
   unsigned int *array = (unsigned int *)malloc(len * sizeof(unsigned int));
-  int randomNr, counter;
+  int randomNr, randomPos, filler;
+  
 
   if (array == NULL)
   {
-    return NULL;
+    return NULL; // Fehler
+  }
+
+  for (int i = 0; i < len; i++)
+  {
+    array[i] = 0;
   }
   
   for (int i = 0; i < len; i++)
   {
-    counter = 0;
     do
     {
-      if (counter == 9)
+      array[i] = (rand() % (2 * len))+ 1;
+    } while (!checkArray(array, i, array[i]));
+  }
+
+  randomPos = rand() % len;
+  randomNr = array[randomPos];
+
+  filler = randomPos;
+  while(filler == randomPos)
   {
-        return NULL;
+    filler = rand() % len;
   }
+  array[filler] = randomNr;
   
-      randomNr = rand() % (2 * len + 1);
-      counter++;
-    } while (!checkArray(array, i, randomNr));
-
-    array[i] = randomNr;
-    printf("%u ", array[i]);
-  }
-
-  printf("\n");
   return array;
 }
 

test_bintree.c

@@ -4,38 +4,57 @@
 #include "unity.h"
 
 
-void treeTest()
+void sizeTest()
 {
-    TreeNode root;
+    TreeNode *root = (TreeNode *)malloc(sizeof(TreeNode));
-    TreeNode node1;
+    TreeNode *node1 = (TreeNode *)malloc(sizeof(TreeNode));
-    TreeNode node2;
+    TreeNode *node2 = (TreeNode *)malloc(sizeof(TreeNode));
 
     int dataRoot = 2;
     int dataNode1 = 1;
     int dataNode2 = 3;
 
+    root->data = &dataRoot;
+    root->left = (TreeNode *)node1;
+    root->right = (TreeNode *)node2;
 
-    root.data = &dataRoot;
+    node1->data = &dataNode1;
-    root.left = &node1;
+    node1->left = NULL;
-    root.right = &node2;
+    node1->right = NULL;
 
-    node1.data = &dataNode1;
+    node2->data = &dataNode2;
-    node1.left = NULL;
+    node2->left = NULL;
-    node1.right = NULL;
+    node2->right = NULL;
 
-    node2.data = &dataNode2;
+    TEST_ASSERT_EQUAL_INT(3,treeSize(root));
-    node2.left = NULL;
+}
-    node2.right = NULL;
 
+void clearTest()
+{
+    TreeNode *root = (TreeNode *)malloc(sizeof(TreeNode));
+    TreeNode *node1 = (TreeNode *)malloc(sizeof(TreeNode));
+    TreeNode *node2 = (TreeNode *)malloc(sizeof(TreeNode));
 
+    int dataRoot = 2;
+    int dataNode1 = 1;
+    int dataNode2 = 3;
 
-    TEST_ASSERT_EQUAL_INT(3,treeSize(&root));
+    root->data = &dataRoot;
+    root->left = (TreeNode *)node1;
+    root->right = (TreeNode *)node2;
 
+    node1->data = &dataNode1;
+    node1->left = NULL;
+    node1->right = NULL;
 
-    clearTree(&root);
+    node2->data = &dataNode2;
-    TEST_ASSERT_EQUAL_INT(0,treeSize(&root));
+    node2->left = NULL;
+    node2->right = NULL;
 
+    TreeNode *ptr = root;
 
+    clearTree(ptr);
+    TEST_ASSERT_EQUAL_INT(0,treeSize(root));
 }
 
 void setUp(void)
@@ -54,7 +73,8 @@ int main()
 
     printf("============================\nNumbers tests\n============================\n");
 
-    RUN_TEST(treeTest);
+    RUN_TEST(sizeTest);
+    RUN_TEST(clearTest);
 
     return UNITY_END();
 }