treeSize and treeSize test now workingW

bintree.c

@@ -1,36 +1,156 @@
+#include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include "stack.h"
 #include "bintree.h"
 
+
 //TODO: binären Suchbaum implementieren
-/*  * `addToTree`: fügt ein neues Element in den Baum ein (rekursiv),
+/*  * `addToTree`: fügt ein neues Element in den Baum ein (rekursiv),       Done
-    * `clearTree`: gibt den gesamten Baum frei (rekursiv),
+    * `clearTree`: gibt den gesamten Baum frei (rekursiv),                  Done
-    * `treeSize`: zählt die Knoten im Baum (rekursiv),
+    * `treeSize`: zählt die Knoten im Baum (rekursiv),                      Done
     * `nextTreeData`: Traversierung mit Hilfe des zuvor implementierten Stacks. */
 
+
+    static TreeNode *root = NULL;
+
+
+    TreeNode        *addToTree      (TreeNode *root, const void *data, size_t dataSize, CompareFctType compareFct, int *isDuplicate);
+    void            *nextTreeData   (TreeNode *root);
+    void            clearTree       (TreeNode *root);
+    unsigned int    treeSize        (const TreeNode *root);
+
+    // self declared functions
+    TreeNode        *addToTreeRec   (TreeNode *currentNode, TreeNode *newNode, CompareFctType compareFct, int *isDuplicate, const int root);
+    void            clearTreeRec    (TreeNode *currentNode);
+    void            clearNode       (TreeNode *node);
+    int             treeSizeRec     (const TreeNode *currentNode);
+
+
 // 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).
+
+//      returned Value is new root
 TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFctType compareFct, int *isDuplicate)
 {
+    // create a node
+    TreeNode *newNode;
 
+
+    newNode         = calloc(1, sizeof(TreeNode));
+    newNode->data   = calloc(1, dataSize);
+    newNode->left   = NULL;
+    newNode->right  = NULL;
+    memcpy(newNode->data, data, dataSize);
+
+
+    return addToTreeRec(root, newNode, compareFct, isDuplicate, 1);
 }
 
+
+TreeNode *addToTreeRec(TreeNode *currentNode, TreeNode *newNode, CompareFctType compareFct, int *isDuplicate, const int root)
+{
+    if ((currentNode == NULL))
+    {
+        if ((isDuplicate == NULL) || root)
+        {
+            return newNode;
+        }
+        else
+        {
+            return currentNode;
+        }
+    }
+    else if ((compareFct(currentNode->data, newNode->data) < 0))
+    {
+        currentNode->left   = addToTreeRec(currentNode->left, newNode, compareFct, isDuplicate, 0);
+    }
+    else if ((compareFct(currentNode->data, newNode->data) > 0))
+    {
+        currentNode->right  = addToTreeRec(currentNode->right, newNode, compareFct, isDuplicate, 0);
+    }
+    else if ((compareFct(currentNode->data, newNode->data) == 0))
+    {
+        if (isDuplicate == NULL)
+        {
+            currentNode->left = addToTreeRec(currentNode->left, newNode, compareFct, isDuplicate, 0);
+        }
+        else
+        {
+            *isDuplicate = 1;
+        }
+    }
+
+
+    return currentNode;
+}
+ 
+
 // 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.
+
+// Needs stack!!
 void *nextTreeData(TreeNode *root)
 {
 
 }
 
+
 // Releases all memory resources (including data copies).
 void clearTree(TreeNode *root)
 {
-
+    clearTreeRec(root);
 }
 
+
+void clearTreeRec(TreeNode *currentNode)
+{
+    if (currentNode != NULL)
+    {
+        clearTree(currentNode->left);
+        clearTree(currentNode->right);
+        clearNode(currentNode);
+    }
+}
+
+
+void clearNode(TreeNode *node)
+{
+    free(node->data);
+    node->data  = NULL;
+
+    node->left  = NULL;
+    node->right = NULL;
+
+    free(node);
+    node        = NULL;
+}
+
+
 // Returns the number of entries in the tree given by root.
 unsigned int treeSize(const TreeNode *root)
+{   
+    unsigned int amountOfNodes = 0;
+
+    
+    amountOfNodes = treeSizeRec(root);
+
+
+    return amountOfNodes;
+}
+
+
+int treeSizeRec(const TreeNode *currentNode)
 {
+    int nodeCount = 0;
+
+
+    if (currentNode != NULL)
+    {
+        nodeCount += treeSizeRec(currentNode->left);
+        nodeCount += treeSizeRec(currentNode->right);
+        return nodeCount + 1;
+    }
+}
 
-}

bintreeTests.c

@@ -0,0 +1,188 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "unity.h"
+#include "bintree.h"
+
+#define MAX_TEST_NAME_LEN 10
+
+
+void setUp(void) {
+    // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
+}
+
+
+void tearDown(void) {
+    // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
+}
+
+
+static int compareIntEntries(const void *arg1, const void *arg2)
+{
+    const int *entry1 = (const void *)arg1;
+    const int *entry2 = (const void *)arg2;
+
+    int result = *entry2 - *entry1;
+
+
+    return result;
+}
+
+
+// test if addToTree expands tree correctly
+//      by going down the path where the given pice of data is expected
+//      and checking if the pice of data is found there
+void test_addToTreeExpandsTreeCorrectly(void)
+{
+    TreeNode    *testRoot       = NULL;
+    int         testIsDouble    = 0;
+    int         score1          = 12;
+    int         score2          = 6;
+    int         score3          = 18;
+    int         score4          = 3;
+    int         score5          = 9;
+    int         score6          = 15;
+    int         score7          = 21;
+
+
+    testRoot = addToTree(testRoot, &score1, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score2, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score3, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score4, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score5, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score6, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score7, sizeof(int), compareIntEntries, NULL);
+
+    // Checking the Tree without Doubles
+    TEST_ASSERT_NOT_NULL(testRoot);
+    TEST_ASSERT_EQUAL(score1, *(int *)testRoot->data);
+    
+    TEST_ASSERT_NOT_NULL(testRoot->left);
+    TEST_ASSERT_EQUAL(score2, *(int *)testRoot->left->data);
+    TEST_ASSERT_NOT_NULL(testRoot->right);
+    TEST_ASSERT_EQUAL(score3, *(int *)testRoot->right->data);
+    TEST_ASSERT_NOT_NULL(testRoot->left->left);
+    TEST_ASSERT_EQUAL(score4, *(int *)testRoot->left->left->data);
+    TEST_ASSERT_NOT_NULL(testRoot->left->right);
+    TEST_ASSERT_EQUAL(score5, *(int *)testRoot->left->right->data);
+    TEST_ASSERT_NOT_NULL(testRoot->right->left);
+    TEST_ASSERT_EQUAL(score6, *(int *)testRoot->right->left->data);
+    TEST_ASSERT_NOT_NULL(testRoot->right->right);
+    TEST_ASSERT_EQUAL(score7, *(int *)testRoot->right->right->data);
+    
+    // Adding Double
+    testRoot = addToTree(testRoot, &score4, sizeof(int), compareIntEntries, NULL);
+    TEST_ASSERT_NOT_NULL(testRoot->left->left->left);
+    TEST_ASSERT_EQUAL_UINT16(score4, *(int *)testRoot->left->left->left->data);
+
+    // Trying to add Double while Doubles not Permitted
+    testRoot = addToTree(testRoot, &score7, sizeof(int), compareIntEntries, &testIsDouble);
+    TEST_ASSERT_NULL(testRoot->right->right->left);
+    TEST_ASSERT_EQUAL_UINT16(1, testIsDouble);
+    
+
+    clearTree(testRoot);
+}
+
+
+// test if nextTreeData returns the next pice of data correctly
+//      needs Stack!!!
+void test_nextTreeDataReturnsNextDataCorrectly(void)
+{
+
+}
+
+
+// test if clear Tree frees all node.name and node memory AND sets them to zero
+//      aditionally tests if the memoryspaces have been cleared
+void test_clearTreeworksLikeExpected(void)
+{
+    TreeNode    *testRoot       = NULL;
+    int         score1          = 12;
+    int         score2          = 6;
+    int         score3          = 18;
+    int         score4          = 3;
+    int         score5          = 9;
+    int         score6          = 15;
+    int         score7          = 21;
+
+
+    testRoot = addToTree(testRoot, &score1, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score2, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score3, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score4, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score5, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score6, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score7, sizeof(int), compareIntEntries, NULL);
+
+    // Save all Adresses
+    TreeNode *node1 = testRoot;
+    TreeNode *node2 = testRoot->left;
+    TreeNode *node3 = testRoot->left->left;
+    TreeNode *node4 = testRoot->left->right;
+    TreeNode *node5 = testRoot->right;
+    TreeNode *node6 = testRoot->right->left;
+    TreeNode *node7 = testRoot->right->right;
+
+    clearTree(testRoot);
+    
+    // Check if everything has been set to NULL
+    TEST_ASSERT_NULL(node1->data);
+    TEST_ASSERT_NULL(node1->data);
+    TEST_ASSERT_NULL(node2->data);
+    TEST_ASSERT_NULL(node3->data);
+    TEST_ASSERT_NULL(node4->data);
+    TEST_ASSERT_NULL(node5->data);
+    TEST_ASSERT_NULL(node6->data);
+    TEST_ASSERT_NULL(node7->data);
+}
+
+
+// tests if treeSize returns correct amount of nodes in Tree
+//      by using addToTree a given number of times and testing to see if 
+//      the treeSize matches the number of nodes added
+void test_treeSizeWorkingLikeExpected(void)
+{
+    TreeNode        *testRoot       = NULL;
+    int             nodeCount       = 7;
+    unsigned int    testTreeSize    = 0;
+    int             score1          = 12;
+    int             score2          = 6;
+    int             score3          = 18;
+    int             score4          = 3;
+    int             score5          = 9;
+    int             score6          = 15;
+    int             score7          = 21;
+
+
+    // Fill Tree
+    testRoot = addToTree(testRoot, &score1, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score2, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score3, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score4, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score5, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score6, sizeof(int), compareIntEntries, NULL);
+    testRoot = addToTree(testRoot, &score7, sizeof(int), compareIntEntries, NULL);
+
+    testTreeSize = treeSize(testRoot);
+
+    TEST_ASSERT_EQUAL(nodeCount, testTreeSize);
+
+    clearTree(testRoot);
+}
+
+
+// main, strings together all tests
+int main()
+{
+    UNITY_BEGIN();
+
+    printf("\n============================\nBinary Tree tests\n============================\n");
+    RUN_TEST(test_addToTreeExpandsTreeCorrectly);
+    // RUN_TEST(test_nextTreeDataReturnsNextDataCorrectly);
+    RUN_TEST(test_clearTreeworksLikeExpected);
+    RUN_TEST(test_treeSizeWorkingLikeExpected);
+
+    return UNITY_END();
+}
+

highscores.txt

@@ -1,2 +1 @@
-player_name;9943
 player1;3999

makefile

@@ -35,14 +35,15 @@ $(program_obj_filesobj_files): %.o: %.c
 # --------------------------
 # Unit Tests
 # --------------------------
-unitTests:
+# unitTests:
-	echo "needs to be implemented"
+#	echo "needs to be implemented"
 
-stack: stack.c
+bintree: bintree.c
-	$(CC) $(FLAGS) -c stack stack.c 
+	$(CC) $(FLAGS) -c bintree bintree.c 
+
+bintreeTests: bintree.o bintreeTests.c $(unityfolder)/unity.c
+	$(CC) $(FLAGS) -o runbintreeTests bintreeTests.c bintree.o $(unityfolder)/unity.c
 
-test_stack: stack.o test_stack.c $(unityfolder)/unity.c
-	$(CC) $(FLAGS) -o runstackTests test_stack.c stack.o $(unityfolder)/unity.c
 # --------------------------
 # Clean
 # --------------------------

test_stack.c

@@ -1,30 +1,24 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "unity.h"
 #include "stack.h"
 
-void setUp(void) {
-    // Falls notwendig, kann hier Vorbereitungsarbeit gemacht werden
-}
-
-void tearDown(void) {
-    // Hier kann Bereinigungsarbeit nach jedem Test durchgeführt werden
-}
-
-
-
 void testeStackBeschreiben()
 {
-    //printf("=== Test: push() ===\n");
+    printf("=== Test: push() ===\n");
 
     StackNode *stack = NULL;
     int wert1 = 42;
     stack = push(stack, &wert1);
 
     int *topValue = (int *)(stack->data);
-
+    if(topValue != NULL && *topValue == 42)
-    TEST_ASSERT_NOT_NULL(topValue);
+    {
-    TEST_ASSERT_EQUAL_INT(42, *topValue);
+        printf("Test 1: Erstes Element erfolgreich gepusht!\n");
+    }
+    else
+    {
+        printf("Test 1: FEHLGESCHLAGEN!\n");
+    }
 
 
     int wert2 = 12;
@@ -33,19 +27,23 @@ void testeStackBeschreiben()
     topValue = (int *)(stack->data);
     int *secondValue = (int *)((stack->next)->data);
 
-    TEST_ASSERT_NOT_NULL(topValue);
+    if(topValue != NULL && *topValue == 12.25 && secondValue != NULL && *secondValue == 42)
-    TEST_ASSERT_EQUAL_INT(12, *topValue);
+    {
-    TEST_ASSERT_NOT_NULL(secondValue);
+        printf("Test 2: Zweites Element erfolgreich gepusht!\n");
-    TEST_ASSERT_EQUAL_INT(42, *secondValue);
+    }
+    else
+    {
+        printf("Test 2: FEHLGESCHLAGEN!\n");
+    }
 
 
-    //printf("=== Ende Test: push() ===\n\n");
+    printf("=== Ende Test: push() ===\n\n");
     return;
 }
 
 void testepop()
 {
-    //printf("=== Test: pop() ===\n");
+    printf("=== Test: pop() ===\n");
 
     StackNode *stack = NULL;
     int wert1 = 20;
@@ -58,15 +56,21 @@ void testepop()
 
     int *topValue = (int *)(stack->data);
 
-    TEST_ASSERT_NOT_NULL(topValue);
+    if(topValue != NULL && *topValue == 20)
-    TEST_ASSERT_EQUAL_INT(20, *topValue);
+    {
+        printf("Test: Erstes Element erfolgreich gelöscht!\n");
+    }
+    else
+    {
+        printf("Test 1: FEHLGESCHLAGEN!\n");
+    }
 
-    //printf("=== Ende Test: pop() ===\n\n");
+    printf("=== Ende Test: pop() ===\n\n");
 }
 
 void testetop()
 {
-    //printf("=== Test: top() ===\n");
+    printf("=== Test: top() ===\n");
     
     StackNode *stack = NULL;
     int wert1 = 20;
@@ -77,15 +81,21 @@ void testetop()
 
     int *topValue = top(stack);
 
-    TEST_ASSERT_NOT_NULL(topValue);
+    if(topValue != NULL && *topValue == 74)
-    TEST_ASSERT_EQUAL_INT(74, *topValue);
+    {
+        printf("Test: top() gibt korrektes Element zurück!\n");
+    }
+    else
+    {
+        printf("Test: FEHLGESCHLAGEN!\n");
+    }
 
-    //printf("=== Ende Test: top() ===\n\n");
+    printf("=== Ende Test: top() ===\n\n");
 }
 
 void testeclearStack()
 {
-    //printf("=== Test: clearStack() ===\n");
+    printf("=== Test: clearStack() ===\n");
 
     StackNode *stack = NULL;
     int wert1 = 20;
@@ -96,25 +106,16 @@ void testeclearStack()
 
     clearStack(stack);
 
-    //printf("Test: clearStack() aufgerufen. Speicher freigegeben.\n");
+    printf("Test: clearStack() aufgerufen. Speicher freigegeben.\n");
-    //printf("=== Ende Test: clearStack() ===\n\n");
+    printf("=== Ende Test: clearStack() ===\n\n");
 }
 
 int main()
 {
-    UNITY_BEGIN();
+    testeStackBeschreiben();
-
-    //printf("...");
-
-    RUN_TEST(testeStackBeschreiben);
-    RUN_TEST(testepop);
-    RUN_TEST(testetop);
-    RUN_TEST(testeclearStack);
-
-    /*testeStackBeschreiben();
     testepop();
     testetop();
-    testeclearStack();*/
+    testeclearStack();
 
-    return UNITY_END();
+    return 0;
 }