hofmannjo99187/DobleSpiel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uncommented not needed code from test_addToTreeExpandsTreeCorrectly and addToTree

Browse Source
This commit is contained in:
Jonas Hofmann 2025-12-09 01:03:58 +01:00
parent 6b30677698
commit 5dc45f8590
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bintree.c
View File

@ -50,10 +50,10 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
TreeNode *addToTreeRec(TreeNode *currentNode, TreeNode *newNode, CompareFctType compareFct, int *isDuplicate) TreeNode *addToTreeRec(TreeNode *currentNode, TreeNode *newNode, CompareFctType compareFct, int *isDuplicate)
{ {
printf("entered addRec\n"); // printf("entered addRec\n");
if ((currentNode == NULL)) if ((currentNode == NULL))
{ {
printf("currentNode == NULL\n"); // printf("currentNode == NULL\n");
if (isDuplicate == NULL) if (isDuplicate == NULL)
{ {
@ -71,29 +71,29 @@ TreeNode *addToTreeRec(TreeNode *currentNode, TreeNode *newNode, CompareFctType
} }
else if ((compareFct(&currentNode->data, &newNode->data) < 0)) else if ((compareFct(&currentNode->data, &newNode->data) < 0))
{ {
printf("compareFct(currentNode->data, newNode->data) < 0\n"); // printf("compareFct(currentNode->data, newNode->data) < 0\n");
currentNode->left = addToTreeRec(currentNode->left, newNode, compareFct, isDuplicate); currentNode->left = addToTreeRec(currentNode->left, newNode, compareFct, isDuplicate);
} }
else if ((compareFct(&currentNode->data, &newNode->data) > 0)) else if ((compareFct(&currentNode->data, &newNode->data) > 0))
{ {
printf("compareFct(currentNode->data, newNode->data) > 0\n"); // printf("compareFct(currentNode->data, newNode->data) > 0\n");
currentNode->right = addToTreeRec(currentNode->right, newNode, compareFct, isDuplicate); currentNode->right = addToTreeRec(currentNode->right, newNode, compareFct, isDuplicate);
} }
else if ((compareFct(&currentNode->data, &newNode->data) == 0)) else if ((compareFct(&currentNode->data, &newNode->data) == 0))
{ {
//duplicate //duplicate
printf("duplicate\n"); // printf("duplicate\n");
if (isDuplicate == NULL) if (isDuplicate == NULL)
{ {
currentNode->left = addToTreeRec(currentNode->left, newNode, compareFct, isDuplicate); currentNode->left = addToTreeRec(currentNode->left, newNode, compareFct, isDuplicate);
} }
else else
{ {
printf("setDuplicate\n"); // printf("setDuplicate\n");
*isDuplicate = 1; *isDuplicate = 1;
} }
} }
printf("passed everything\n"); // printf("passed everything\n");
return currentNode; return currentNode;
} }

BIN
bintree.o
View File

Binary file not shown.

30
bintreeTests.c
View File

@ -48,61 +48,61 @@ void test_addToTreeExpandsTreeCorrectly(void)
testRoot = addToTree(testRoot, &score1, sizeof(int), compareIntEntries, NULL); testRoot = addToTree(testRoot, &score1, sizeof(int), compareIntEntries, NULL);
printf("add1passed\n"); // printf("add1passed\n");
testRoot = addToTree(testRoot, &score2, sizeof(int), compareIntEntries, NULL); testRoot = addToTree(testRoot, &score2, sizeof(int), compareIntEntries, NULL);
printf("add2passed\n"); // printf("add2passed\n");
testRoot = addToTree(testRoot, &score3, sizeof(int), compareIntEntries, NULL); testRoot = addToTree(testRoot, &score3, sizeof(int), compareIntEntries, NULL);
printf("add3passed\n"); // printf("add3passed\n");
testRoot = addToTree(testRoot, &score4, sizeof(int), compareIntEntries, NULL); testRoot = addToTree(testRoot, &score4, sizeof(int), compareIntEntries, NULL);
printf("add4passed\n"); // printf("add4passed\n");
testRoot = addToTree(testRoot, &score5, sizeof(int), compareIntEntries, NULL); testRoot = addToTree(testRoot, &score5, sizeof(int), compareIntEntries, NULL);
printf("add5passed\n"); // printf("add5passed\n");
testRoot = addToTree(testRoot, &score6, sizeof(int), compareIntEntries, NULL); testRoot = addToTree(testRoot, &score6, sizeof(int), compareIntEntries, NULL);
printf("add6passed\n"); // printf("add6passed\n");
testRoot = addToTree(testRoot, &score7, sizeof(int), compareIntEntries, NULL); testRoot = addToTree(testRoot, &score7, sizeof(int), compareIntEntries, NULL);
printf("add7passed\n"); // printf("add7passed\n");
// Checking the Tree without Doubles // Checking the Tree without Doubles
TEST_ASSERT_NOT_NULL(testRoot); TEST_ASSERT_NOT_NULL(testRoot);
TEST_ASSERT_EQUAL_UINT16(score1, testRoot->data); TEST_ASSERT_EQUAL_UINT16(score1, testRoot->data);
printf("node1passed\n"); // printf("node1passed\n");
TEST_ASSERT_NOT_NULL(testRoot->left); TEST_ASSERT_NOT_NULL(testRoot->left);
TEST_ASSERT_EQUAL_UINT16(score2, testRoot->left->data); TEST_ASSERT_EQUAL_UINT16(score2, testRoot->left->data);
printf("node2passed\n"); // printf("node2passed\n");
TEST_ASSERT_NOT_NULL(testRoot->right); TEST_ASSERT_NOT_NULL(testRoot->right);
TEST_ASSERT_EQUAL_UINT16(score3, testRoot->right->data); TEST_ASSERT_EQUAL_UINT16(score3, testRoot->right->data);
printf("node3passed\n"); // printf("node3passed\n");
TEST_ASSERT_NOT_NULL(testRoot->left->left); TEST_ASSERT_NOT_NULL(testRoot->left->left);
TEST_ASSERT_EQUAL_UINT16(score4, testRoot->left->left->data); TEST_ASSERT_EQUAL_UINT16(score4, testRoot->left->left->data);
printf("node4passed\n"); // printf("node4passed\n");
TEST_ASSERT_NOT_NULL(testRoot->left->right); TEST_ASSERT_NOT_NULL(testRoot->left->right);
TEST_ASSERT_EQUAL_UINT16(score5, testRoot->left->right->data); TEST_ASSERT_EQUAL_UINT16(score5, testRoot->left->right->data);
printf("node5passed\n"); // printf("node5passed\n");
TEST_ASSERT_NOT_NULL(testRoot->right->left); TEST_ASSERT_NOT_NULL(testRoot->right->left);
TEST_ASSERT_EQUAL_UINT16(score6, testRoot->right->left->data); TEST_ASSERT_EQUAL_UINT16(score6, testRoot->right->left->data);
printf("node6passed\n"); // printf("node6passed\n");
TEST_ASSERT_NOT_NULL(testRoot->right->right); TEST_ASSERT_NOT_NULL(testRoot->right->right);
TEST_ASSERT_EQUAL_UINT16(score7, testRoot->right->right->data); TEST_ASSERT_EQUAL_UINT16(score7, testRoot->right->right->data);
printf("node7passed\n"); // printf("node7passed\n");
// Adding Double // Adding Double
testRoot = addToTree(testRoot, &score4, sizeof(int), compareIntEntries, NULL); testRoot = addToTree(testRoot, &score4, sizeof(int), compareIntEntries, NULL);
TEST_ASSERT_NOT_NULL(testRoot->left->left->left); TEST_ASSERT_NOT_NULL(testRoot->left->left->left);
TEST_ASSERT_EQUAL_UINT16(score4, testRoot->left->left->left->data); TEST_ASSERT_EQUAL_UINT16(score4, testRoot->left->left->left->data);
printf("double passed\n"); // printf("double passed\n");
// Trying to add Double while Doubles not Permitted // Trying to add Double while Doubles not Permitted
testRoot = addToTree(testRoot, &score7, sizeof(int), compareIntEntries, &testIsDouble); testRoot = addToTree(testRoot, &score7, sizeof(int), compareIntEntries, &testIsDouble);