Compare commits

...
2 Commits
7 changed files with 40 additions and 14 deletions

No files matched your search

+2 -2
View File
@@ -29,11 +29,11 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc
} }
if(compareFct(data, root->data) > 0) if(compareFct(data, root->data) > 0)
{ {
root->right = addToTree((root->right), data, dataSize, compareFct, isDuplicate); root->left = addToTree((root->left), data, dataSize, compareFct, isDuplicate);
} }
else if(compareFct(data, root->data) < 0) else if(compareFct(data, root->data) < 0)
{ {
root->left = addToTree((root->left), data, dataSize, compareFct, isDuplicate); root->right = addToTree((root->right), data, dataSize, compareFct, isDuplicate);
} }
else else
{ {
+3 -9
View File
@@ -1,9 +1,3 @@
HeldDerSteine;69 Player1;2996
Gunter11;121 Player2;2988
MaxiMustermann;316 Player3;2939
MillaMusterfrau;420
testspieler68;2996
testspieler69;2997
testspieler67;2997
testspieler1;2997
testspieler68;4991
+2 -2
View File
@@ -39,8 +39,8 @@ stackTests: stack.o test_stack.c $(unityfolder)/unity.c
$(CC) $(CFLAGS) -I$(unityfolder) -o runStackTests test_stack.c stack.o $(unityfolder)/unity.c $(CC) $(CFLAGS) -I$(unityfolder) -o runStackTests test_stack.c stack.o $(unityfolder)/unity.c
echo "needs to be implemented" echo "needs to be implemented"
numbersTests: numbers.o numbersTests.c $(unityfolder)/unity.c numbersTests: numbers.o numbersTests.c bintree.c bintree.h stack.o $(unityfolder)/unity.c
$(CC) $(CFLAGS) -I$(unityfolder) -o runNumbersTests numbersTests.c numbers.o $(unityfolder)/unity.c $(CC) $(CFLAGS) -I$(unityfolder) -o runNumbersTests numbersTests.c numbers.o bintree.o stack.o $(unityfolder)/unity.c
# -------------------------- # --------------------------
# Clean # Clean
+28 -1
View File
@@ -51,7 +51,7 @@ unsigned int *createNumbers(unsigned int len){
return numbers; return numbers;
} }
/*
// Returns only the only number in numbers which is present twice. Returns zero on errors. // 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) unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
{ {
@@ -103,3 +103,30 @@ unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
return duplicate; return duplicate;
} }
*/
unsigned int getDuplicate(const unsigned int *numbers, unsigned int len)
{
TreeNode *root = NULL;
int buffer = 0;
int counter = 0;
for(int i = 0; i < len; i++)
{
int isDuplicat = 0;
root = addToTree(root, numbers + i, sizeof(unsigned int), checkIfBigger, &isDuplicat);
if(isDuplicat)
{
buffer = *(numbers + i);
counter += 1;
}
}
clearTree(root);
if(counter == 1)
return buffer;
return 0;
}
//Just a compare function needed for getDuplicate
int checkIfBigger(const void *char1, const void *char2)
{
return *((int *)char1) - *((int *)char2);
}
+4
View File
@@ -1,6 +1,8 @@
#ifndef NUMBERS_H #ifndef NUMBERS_H
#define NUMBERS_H #define NUMBERS_H
#include "bintree.h"
// Returns len random numbers between 1 and 2x len in random order which are all different, except for two entries. // 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 // Returns NULL on errors. Use your implementation of the binary search tree to check for possible duplicates while
// creating random numbers. // creating random numbers.
@@ -9,4 +11,6 @@ unsigned int *createNumbers(unsigned int len);
// Returns only the only number in numbers which is present twice. Returns zero on errors. // 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); unsigned int getDuplicate(const unsigned int *numbers, unsigned int len);
//Just a compare function needed for getDuplicate
int checkIfBigger(const void *char1, const void *char2);
#endif #endif
+1
View File
@@ -42,6 +42,7 @@ void test_getDouplicateReturnsZeroWhenThereAreMultipleDuplicates(void){
void test_CreateNumbersCreatesDuplicatein2LenArray(void){ void test_CreateNumbersCreatesDuplicatein2LenArray(void){
unsigned int *testArray = createNumbers(2); unsigned int *testArray = createNumbers(2);
unsigned int testValue = getDuplicate(testArray, 2); unsigned int testValue = getDuplicate(testArray, 2);
printf("\nTestvalue: %d\n", testValue);
if(!testValue) if(!testValue)
testValue = 0; testValue = 0;
Binary file not shown.