aufräumen

.gitignore

@@ -6,3 +6,6 @@ runNumbersTest.exe
 numbers.o
 .vscode/launch.json
 .vscode/settings.json
+*.o
+*.exe
+runBintreeTest

bintree.c

@@ -2,17 +2,36 @@
 #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).
 TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFctType compareFct, int *isDuplicate)
 {
+    TreeNode newNode = {data, NULL, NULL};
+    
 
+    if(root == NULL)
+    {
+        return &newNode;
+    }
+
+    if (data < root->data)
+    {
+        root->left = addToTree(root->left, data, dataSize,compareFct, isDuplicate);
+    }
+    else if(data > root->data)
+    {
+       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.
@@ -26,11 +45,36 @@ void *nextTreeData(TreeNode *root)
 // Releases all memory resources (including data copies).
 void clearTree(TreeNode *root)
 {
-
+    if (root == NULL)
+    {
+        return;
+    }
+    
+    if (root->left != NULL)
+    {
+        clearTree(root->left);
+        free(root->left);
+    }
+    else if (root->right != NULL)
+    {
+        clearTree(root->right);
+        free(root->right);
+    }
+    root->data = NULL;
 }
 
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root)
 {
+    int counterL, counterR = 0;
+    if (root->left != NULL)
+    {
+        counterL = treeSize(root->left) + 1;
+    }
+    else if (root->right != NULL)
+    {
+        counterR = treeSize(root->right) + 1;
+    }
 
+    return counterL + counterR;
 }

makefile

@@ -44,6 +44,12 @@ unitTests: stack.o test_stack.c $(unityfolder)/unity.c
 numbersTests: numbers.o test_numbers.c $(unityfolder)/unity.c
 	$(CC) $(FLAGS) -I$(unityfolder) -o runNumbersTest test_numbers.c numbers.o $(unityfolder)/unity.c
 
+# --------------------------
+# bintree.c Tests
+# --------------------------
+bintreeTests: bintree.o test_bintree.c $(unityfolder)/unity.c
+	$(CC) $(FLAGS) -I$(unityfolder) -o runBintreeTest test_bintree.c bintree.o $(unityfolder)/unity.c
+
 # --------------------------
 # Clean
 # --------------------------

numbers.c

@@ -136,6 +136,11 @@ unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
   unsigned int temp[len];
   unsigned int duplicate = 0;
 
+  /*if(numbers == NULL || (sizeof(numbers) / sizeof(typeof(numbers)) != len))
+  {
+    return 0;S
+  }*/
+
   for (int i = 0; i < len; i++)
   {
     temp[i] = numbers[i];

test_bintree.c

@@ -0,0 +1,60 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include "bintree.h"
+#include "unity.h"
+
+
+void treeTest()
+{
+    TreeNode root;
+    TreeNode node1;
+    TreeNode node2;
+
+    int dataRoot = 2;
+    int dataNode1 = 1;
+    int dataNode2 = 3;
+
+
+    root.data = &dataRoot;
+    root.left = &node1;
+    root.right = &node2;
+
+    node1.data = &dataNode1;
+    node1.left = NULL;
+    node1.right = NULL;
+
+    node2.data = &dataNode2;
+    node2.left = NULL;
+    node2.right = NULL;
+
+
+
+    TEST_ASSERT_EQUAL_INT(3,treeSize(&root));
+
+
+    clearTree(&root);
+    TEST_ASSERT_EQUAL_INT(0,treeSize(&root));
+
+    
+}
+
+void setUp(void)
+{
+    // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
+}
+
+void tearDown(void)
+{
+    // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
+}
+
+int main()
+{
+    UNITY_BEGIN();
+
+    printf("============================\nNumbers tests\n============================\n");
+
+    RUN_TEST(treeTest);
+
+    return UNITY_END();
+}