From fe4c130d7238ecd785ab5f9cb448453c5afabeb0 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sat, 29 Nov 2025 09:58:23 +0100 Subject: [PATCH 01/13] create initial gitignore with obvious stuff --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eed49f7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*doble* +*.o +*.exe \ No newline at end of file From ef59987f08ae4cf860d3631b919f147ae73a4cf4 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sat, 29 Nov 2025 12:57:07 +0100 Subject: [PATCH 02/13] implement stack with some initial testing --- makefile | 7 +++++-- stack.c | 36 +++++++++++++++++++++++++++++------- stack.h | 10 +++++++--- test_stack.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 test_stack.c diff --git a/makefile b/makefile index 1f15f75..e0626fb 100644 --- a/makefile +++ b/makefile @@ -35,8 +35,11 @@ $(program_obj_filesobj_files): %.o: %.c # -------------------------- # Unit Tests # -------------------------- -unitTests: - echo "needs to be implemented" +TEST_STACK_SOURCES = stack.c test_stack.c $(unityfolder)/unity.c + +stackTests: $(TEST_STACK_SOURCES) stack.h + $(CC) $(FLAGS) -I$(unityfolder) $(TEST_STACK_SOURCES) -o runStackTests + ./runStackTests # -------------------------- # Clean diff --git a/stack.c b/stack.c index e3a90d4..21bc819 100644 --- a/stack.c +++ b/stack.c @@ -1,33 +1,55 @@ #include #include "stack.h" -//TODO: grundlegende Stackfunktionen implementieren: +// TODO: grundlegende Stackfunktionen implementieren: /* * `push`: legt ein Element oben auf den Stack, - * `pop`: entfernt das oberste Element, - * `top`: liefert das oberste Element zurück, - * `clearStack`: gibt den gesamten Speicher frei. */ + * `pop`: entfernt das oberste Element, + * `top`: liefert das oberste Element zurück, + * `clearStack`: gibt den gesamten Speicher frei. */ // Pushes data as pointer onto the stack. StackNode *push(StackNode *stack, void *data) { + // this is the new top node + StackNode *newTopNode = malloc(sizeof(StackNode)); + if (newTopNode == NULL) + { + return NULL; + } + + newTopNode->data = data; + newTopNode->next = stack; + + return newTopNode; } // Deletes the top element of the stack (latest added element) and releases its memory. (Pointer to data has to be // freed by caller.) StackNode *pop(StackNode *stack) { - + if (!stack) + { + return NULL; + } + StackNode *nextNode = stack->next; + free(stack); + return nextNode; } // Returns the data of the top element. void *top(StackNode *stack) { - + if (!stack) + { + return NULL; + } + return stack->data; } // Clears stack and releases all memory. void clearStack(StackNode *stack) { - + while (pop(stack)) + ; } \ No newline at end of file diff --git a/stack.h b/stack.h index f7d542d..83dc6be 100644 --- a/stack.h +++ b/stack.h @@ -1,13 +1,17 @@ #ifndef STACK_H #define STACK_H -/* A stack is a special type of queue which uses the LIFO (last in, first out) principle. -This means that with each new element all other elements are pushed deeper into the stack. +/* A stack is a special type of queue which uses the LIFO (last in, first out) principle. +This means that with each new element all other elements are pushed deeper into the stack. The latest element is taken from the stack. */ #include -//TODO: passenden Datentyp als struct anlegen +typedef struct StackNode +{ + struct StackNode *next; + void *data; +} StackNode; // Pushes data as pointer onto the stack. StackNode *push(StackNode *stack, void *data); diff --git a/test_stack.c b/test_stack.c new file mode 100644 index 0000000..e9843ab --- /dev/null +++ b/test_stack.c @@ -0,0 +1,47 @@ +#include "unity.h" +#include "stack.h" + +int data1 = 10; +int data2 = 20; +int data3 = 30; + +StackNode *stack = NULL; + +void setUp(void) +{ + // set stuff up here +} + +void tearDown(void) +{ + clearStack(stack); +} + +void test_push_and_pop(void) +{ + stack = push(stack, &data1); + stack = push(stack, &data2); + stack = push(stack, &data3); + + TEST_ASSERT_EQUAL_PTR(top(stack), &data3); + stack = pop(stack); + TEST_ASSERT_EQUAL_PTR(top(stack), &data2); + stack = pop(stack); + TEST_ASSERT_EQUAL_PTR(top(stack), &data1); + stack = pop(stack); +} + +void test_handle_NULL(void) +{ + TEST_ASSERT_NULL(pop(stack)); + TEST_ASSERT_NULL(top(stack)); +} + +int main(void) +{ + printf("============================\nStack tests\n============================\n"); + UNITY_BEGIN(); + RUN_TEST(test_push_and_pop); + RUN_TEST(test_handle_NULL); + return UNITY_END(); +} \ No newline at end of file From a48cb6560d4f11e3a528d066b3adbe3392392241 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sat, 29 Nov 2025 12:57:49 +0100 Subject: [PATCH 03/13] update gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index eed49f7..2d7008e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *doble* *.o -*.exe \ No newline at end of file +*.exe +.vscode +run*Tests \ No newline at end of file From fd51eef1fedbe2b19e26b129c1f105c8b3b58b1b Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sat, 29 Nov 2025 17:21:11 +0100 Subject: [PATCH 04/13] initial bintree.c --- bintree.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 123 insertions(+), 4 deletions(-) diff --git a/bintree.c b/bintree.c index 5cf82a9..b9b5e54 100644 --- a/bintree.c +++ b/bintree.c @@ -1,18 +1,82 @@ #include #include "stack.h" #include "bintree.h" +#include -//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 *insertedNode; + // create a new node if the current node is NULL + if (root == NULL) + { + // it's important to zero the pointers for adjacent nodes + insertedNode = calloc(1, sizeof(TreeNode)); + if (!insertedNode) + { + return NULL; + } + + insertedNode->data = malloc(dataSize); + if (!insertedNode->data) + { + return NULL; + } + insertedNode->data = memcpy(insertedNode->data, data, dataSize); + // reset isDuplicate if it exists + if (isDuplicate) + { + *isDuplicate = 0; + } + return insertedNode; + } + + // TODO: what is the correct data type here? + int cmpRes = (*compareFct)(data, root->data); + // insert into the left branch + if (cmpRes < 0 || (cmpRes == 0 && isDuplicate == NULL)) + { + root->left = addToTree(root->left, data, dataSize, compareFct, isDuplicate); + } + // insert into the right branch + else if (cmpRes > 0) + { + root->right = addToTree(root->right, data, dataSize, compareFct, isDuplicate); + } + // the data is equal to the current node + else + { + // the data already exists in the tree and duplicates are ignored (isDuplicate* not NULL) + *isDuplicate = 1; + } + return root; +} + +// push all left descendants from @param node +static void pushLeftDesc(StackNode **stackPtr, TreeNode *node) +{ + if (!stackPtr || !node) + { + return; + } + TreeNode *curNode = node; + while (curNode->left) + { + *stackPtr = push(*stackPtr, curNode->left); + if (!*stackPtr) + { + return; + } + curNode = curNode->left; + } } // 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. @@ -20,17 +84,72 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc // push the top node and push all its left nodes. void *nextTreeData(TreeNode *root) { + // this creates a static variable that maintains an internal state + static StackNode *stack; + // create a new stack + if (root) + { + // clear possibly existing stacks + clearStack(stack); + // init a new stack + stack = push(NULL, root); + // init failed + if (!stack) + { + return NULL; + } + pushLeftDesc(&stack, root); + + // return the first val + return nextTreeData(NULL); + } + + // neither stack nor root exist + if (!stack) + { + return NULL; + } + + // get next val with stack + TreeNode *res = top(stack); + stack = pop(stack); + if (res->right) + { + stack = push(stack, res->right); + pushLeftDesc(&stack, res->right); + } + + return res->data; } // Releases all memory resources (including data copies). void clearTree(TreeNode *root) { + // this check is crucial for recursion + if (!root) + { + // nothing to clear + return; + } + // release the resources of child nodes first + clearTree(root->left); + clearTree(root->right); + + // free the data (it's just a copy created in addToTree()) + free(root->data); + free(root); } // Returns the number of entries in the tree given by root. unsigned int treeSize(const TreeNode *root) { + // there are no nodes + if (!root) + { + return 0; + } + return 1 + treeSize(root->left) + treeSize(root->right); } \ No newline at end of file From ab71a3dd740bad3eb036caec0a6cec46346a7b01 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sat, 29 Nov 2025 17:21:51 +0100 Subject: [PATCH 05/13] setup first test for bintree.c --- makefile | 5 +++++ test_bintree.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 test_bintree.c diff --git a/makefile b/makefile index e0626fb..c4c6314 100644 --- a/makefile +++ b/makefile @@ -36,11 +36,16 @@ $(program_obj_filesobj_files): %.o: %.c # Unit Tests # -------------------------- TEST_STACK_SOURCES = stack.c test_stack.c $(unityfolder)/unity.c +TEST_BINTREE_SOURCES = bintree.c test_bintree.c stack.c $(unityfolder)/unity.c stackTests: $(TEST_STACK_SOURCES) stack.h $(CC) $(FLAGS) -I$(unityfolder) $(TEST_STACK_SOURCES) -o runStackTests ./runStackTests +bintreeTests: $(TEST_BINTREE_SOURCES) stack.h bintree.h + $(CC) $(FLAGS) -I$(unityfolder) $(TEST_BINTREE_SOURCES) -o runBintreeTests + ./runBintreeTests + # -------------------------- # Clean # -------------------------- diff --git a/test_bintree.c b/test_bintree.c new file mode 100644 index 0000000..3ca280d --- /dev/null +++ b/test_bintree.c @@ -0,0 +1,39 @@ +#include "unity.h" +#include "bintree.h" +#include "string.h" + +void setUp(void) +{ + // set stuff up here +} + +void tearDown(void) +{ + // set stuff up here +} + +// this adds some strings and checks if they are returned in the right order +void test_insert_and_retrieve(void) +{ + char *data1 = "a_this"; + char *data2 = "b_is"; + char *data3 = "c_testdata"; + + TreeNode *root = addToTree(NULL, data1, strlen(data1) + 1, (CompareFctType)&strcmp, NULL); + addToTree(root, data2, strlen(data2) + 1, (CompareFctType)&strcmp, NULL); + addToTree(root, data3, strlen(data3) + 1, (CompareFctType)&strcmp, NULL); + + TEST_ASSERT_EQUAL_STRING(data1, (char *)nextTreeData(root)); + TEST_ASSERT_EQUAL_STRING(data2, (char *)nextTreeData(NULL)); + TEST_ASSERT_EQUAL_STRING(data3, (char *)nextTreeData(NULL)); + + clearTree(root); +} + +int main(void) +{ + printf("============================\nBintree tests\n============================\n"); + UNITY_BEGIN(); + RUN_TEST(test_insert_and_retrieve); + return UNITY_END(); +} \ No newline at end of file From 34e5a591968e0e627f2968f19b8b70f3a5aacaf2 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sat, 29 Nov 2025 21:24:11 +0100 Subject: [PATCH 06/13] remove redundant assignment --- bintree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bintree.c b/bintree.c index b9b5e54..4cecb66 100644 --- a/bintree.c +++ b/bintree.c @@ -30,7 +30,7 @@ TreeNode *addToTree(TreeNode *root, const void *data, size_t dataSize, CompareFc { return NULL; } - insertedNode->data = memcpy(insertedNode->data, data, dataSize); + memcpy(insertedNode->data, data, dataSize); // reset isDuplicate if it exists if (isDuplicate) { From 07262a1fe04ff009f38d30fb6aa2587c1e7a76a8 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sat, 29 Nov 2025 21:25:04 +0100 Subject: [PATCH 07/13] fix makefile to allow debugging --- makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/makefile b/makefile index c4c6314..cb05ca2 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,5 @@ CC = gcc -FLAGS = -g -Wall -lm +CFLAGS = -g -Wall -lm ifeq ($(OS),Windows_NT) include makefile_windows.variables @@ -27,10 +27,10 @@ doble_initial: program_obj_files = stack.o bintree.o numbers.o timer.o highscore.o doble : main.o $(program_obj_files) - $(CC) $(FLAGS) $^ -o doble + $(CC) $(CFLAGS) $^ -o doble -$(program_obj_filesobj_files): %.o: %.c - $(CC) -c $(FLAGS) $^ -o $@ +$(program_obj_files): %.o: %.c + $(CC) -c $(CFLAGS) $^ -o $@ # -------------------------- # Unit Tests @@ -39,11 +39,11 @@ TEST_STACK_SOURCES = stack.c test_stack.c $(unityfolder)/unity.c TEST_BINTREE_SOURCES = bintree.c test_bintree.c stack.c $(unityfolder)/unity.c stackTests: $(TEST_STACK_SOURCES) stack.h - $(CC) $(FLAGS) -I$(unityfolder) $(TEST_STACK_SOURCES) -o runStackTests + $(CC) $(CFLAGS) -I$(unityfolder) $(TEST_STACK_SOURCES) -o runStackTests ./runStackTests bintreeTests: $(TEST_BINTREE_SOURCES) stack.h bintree.h - $(CC) $(FLAGS) -I$(unityfolder) $(TEST_BINTREE_SOURCES) -o runBintreeTests + $(CC) $(CFLAGS) -I$(unityfolder) $(TEST_BINTREE_SOURCES) -o runBintreeTests ./runBintreeTests # -------------------------- From a900d2d147e34e8c4178f8638ab24e8800b3dd7f Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sun, 30 Nov 2025 09:06:21 +0100 Subject: [PATCH 08/13] initial implementation for numbers.c with some testing in test_numbers.c numbers.c currently uses the qsort() function from stdlib --- makefile | 5 ++++ numbers.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++--- test_numbers.c | 50 +++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 4 deletions(-) create mode 100644 test_numbers.c diff --git a/makefile b/makefile index cb05ca2..5654302 100644 --- a/makefile +++ b/makefile @@ -37,6 +37,7 @@ $(program_obj_files): %.o: %.c # -------------------------- TEST_STACK_SOURCES = stack.c test_stack.c $(unityfolder)/unity.c TEST_BINTREE_SOURCES = bintree.c test_bintree.c stack.c $(unityfolder)/unity.c +TEST_NUMBERS_SOURCES = stack.c numbers.c bintree.c $(unityfolder)/unity.c test_numbers.c stackTests: $(TEST_STACK_SOURCES) stack.h $(CC) $(CFLAGS) -I$(unityfolder) $(TEST_STACK_SOURCES) -o runStackTests @@ -46,6 +47,10 @@ bintreeTests: $(TEST_BINTREE_SOURCES) stack.h bintree.h $(CC) $(CFLAGS) -I$(unityfolder) $(TEST_BINTREE_SOURCES) -o runBintreeTests ./runBintreeTests +numbersTests: $(TEST_NUMBERS_SOURCES) stack.h bintree.h numbers.h + $(CC) $(CFLAGS) -I$(unityfolder) $(TEST_NUMBERS_SOURCES) -o runNumbersTests + ./runNumbersTests + # -------------------------- # Clean # -------------------------- diff --git a/numbers.c b/numbers.c index f59d9a2..e8e79b4 100644 --- a/numbers.c +++ b/numbers.c @@ -5,22 +5,82 @@ #include "numbers.h" #include "bintree.h" -//TODO: getDuplicate und createNumbers implementieren +static int compareInt(const void *ptr1, const void *ptr2); + +// TODO: getDuplicate und createNumbers implementieren /* * * Erzeugen eines Arrays mit der vom Nutzer eingegebenen Anzahl an Zufallszahlen. - * Sicherstellen, dass beim Befüllen keine Duplikate entstehen. - * Duplizieren eines zufälligen Eintrags im Array. - * in `getDuplicate()`: Sortieren des Arrays und Erkennen der doppelten Zahl durch Vergleich benachbarter Elemente. */ + * Sicherstellen, dass beim Befüllen keine Duplikate entstehen. + * Duplizieren eines zufälligen Eintrags im Array. + * in `getDuplicate()`: Sortieren des Arrays und Erkennen der doppelten Zahl durch Vergleich benachbarter Elemente. */ // 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 // creating random numbers. + +/* +the implemented tree can't efficiently check if it contains a specific number, but we don't actually need that anyways +create numbers just counts and checks if the just inserted number sets the isDuplicate pointer +*/ +// srand should have been called before this function unsigned int *createNumbers(unsigned int len) { + unsigned int *randomNumbers = malloc(len * sizeof(int)); + // including upper limit + int upperLimit = len * 2; + + int numberCnt = 0; + + int isDuplicate = 0; + TreeNode *root = NULL; + // we only need len-1 numbers because 1 will be duplicated + while (numberCnt < len - 1) + { + // numbers up to and including upperLimit without 0 + int randNum = rand() % upperLimit + 1; + // reset isDuplicate + isDuplicate = 0; + // don't forget to set the root here + root = addToTree(root, &randNum, sizeof(randNum), (CompareFctType)compareInt, &isDuplicate); + if (isDuplicate) + { + // number already exists + continue; + } + randomNumbers[numberCnt++] = randNum; + } + + // select which number to duplicate + int dupNum = randomNumbers[rand() % numberCnt]; + // ...and where to insert + int dupNumIdx = rand() % len; + + // move the number currently at the dupNumIdx to the end + // and insert the dupNum at the index + // this also works if the last idx was selected for dupNum + randomNumbers[len - 1] = randomNumbers[dupNumIdx]; + randomNumbers[dupNumIdx] = dupNum; + + // clean up memory + clearTree(root); + return randomNumbers; } // 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) { + qsort((void *)numbers, len, sizeof(int), compareInt); // sort the array + for (int i = 0; i < len - 1; i++) + { + if (numbers[i] == numbers[i + 1]) + return numbers[i]; + } + return 0; // zero on errors +} +static int compareInt(const void *ptr1, const void *ptr2) +{ + int num1 = *(int *)ptr1; + int num2 = *(int *)ptr2; + return num1 - num2; } \ No newline at end of file diff --git a/test_numbers.c b/test_numbers.c new file mode 100644 index 0000000..a7e6872 --- /dev/null +++ b/test_numbers.c @@ -0,0 +1,50 @@ +#include "unity.h" +// #include "bintree.h" +// #include "string.h" +#include "numbers.h" +#include "stdlib.h" + +void setUp(void) +{ + // set stuff up here +} + +void tearDown(void) +{ + // set stuff up here +} + +// getDuplicate on array without duplicats +// expects 0/error +void test_get_duplicate_error(void) +{ + unsigned int input[] = {1, 5, 9, 2, 4}; + unsigned int len = sizeof(input) / sizeof(input[0]); + + TEST_ASSERT_EQUAL_UINT(0, getDuplicate(input, len)); +} + +// this tries to brute force a triple +void test_for_triple(void) +{ + // this test is less effective if srand is called inside createNumbers() + for (int i = 0; i < 100000; i++) + { + unsigned int *numbers = createNumbers(3); + if (numbers[0] == numbers[1] && numbers[1] == numbers[2]) + { + // fail the test + TEST_ASSERT(0); + } + free(numbers); + } +} + +int main(void) +{ + printf("============================\nNumbers tests\n============================\n"); + UNITY_BEGIN(); + RUN_TEST(test_get_duplicate_error); + RUN_TEST(test_for_triple); + return UNITY_END(); +} \ No newline at end of file From 942b38e75d6adc1f430d5069e506eeea061b223c Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sun, 30 Nov 2025 09:11:32 +0100 Subject: [PATCH 09/13] set the seed for the RNG just once at the beginning of the program this improves randomness for tests where createNumbers() is called in rapid succession --- main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main.c b/main.c index 34163d0..d66f071 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,6 @@ #include #include +#include #include "numbers.h" #include "timer.h" #include "highscore.h" @@ -39,6 +40,9 @@ int main(int argc, char *argv[]) { int exitCode = EXIT_FAILURE; + // set seed + srand(time(NULL)); + if(argc != 2) { fprintf(stderr, "Usage: %s \n", argv[0]); From 1c27338be2b4442b94ed165b9a1492d175fba2f6 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sun, 30 Nov 2025 10:34:01 +0100 Subject: [PATCH 10/13] fix: timers on Linux On Linux the clock() function measures cpu time instead of wall time. This change uses the Apple code path for Linux. --- timer.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/timer.c b/timer.c index fd8f6c1..2c80f33 100644 --- a/timer.c +++ b/timer.c @@ -1,6 +1,12 @@ #include "timer.h" -#if __APPLE__ +#ifdef __linux__ +// Defines strict posix compliance for CLOCK_MONOTONIC +#define _POSIX_C_SOURCE 199309L +#include +#endif + +#if __APPLE__ || __linux__ #include static struct timespec start = {0, 0}; @@ -14,14 +20,15 @@ void startTimer() double stopTimer() { struct timespec end; - + clock_gettime(CLOCK_MONOTONIC, &end); unsigned long long delta_us = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_nsec - start.tv_nsec) / 1000; double measuredSeconds = (double)delta_us / 1000000.; - if(start.tv_nsec > 0) { + if (start.tv_nsec > 0) + { start.tv_nsec = 0; start.tv_sec = 0; } @@ -45,7 +52,7 @@ double stopTimer() { double measuredSeconds = (clock() - (double)startClocks) / CLOCKS_PER_SEC; - if(startClocks > 0) + if (startClocks > 0) startClocks = 0; else measuredSeconds = -1; From 50508360202094b62648c7d76ff8c42f42653c87 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sun, 30 Nov 2025 12:12:35 +0100 Subject: [PATCH 11/13] fix: malloc error handling --- numbers.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/numbers.c b/numbers.c index e8e79b4..5211acb 100644 --- a/numbers.c +++ b/numbers.c @@ -26,6 +26,11 @@ unsigned int *createNumbers(unsigned int len) { unsigned int *randomNumbers = malloc(len * sizeof(int)); + if (!randomNumbers) + { + return NULL; + } + // including upper limit int upperLimit = len * 2; From fc3933a993adf6e095394ef2e387b9095b4e9c01 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Sun, 30 Nov 2025 12:15:06 +0100 Subject: [PATCH 12/13] fix: memory leak --- main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/main.c b/main.c index d66f071..669652f 100644 --- a/main.c +++ b/main.c @@ -87,6 +87,7 @@ int main(int argc, char *argv[]) saveHighscores(highscorePath); clearHighscores(); + free(numbers); exitCode = EXIT_SUCCESS; } From 39976279e527fcfd1e23ec5f8bbca3ebe0af7292 Mon Sep 17 00:00:00 2001 From: Simon Wiesend Date: Fri, 5 Dec 2025 08:42:58 +0100 Subject: [PATCH 13/13] reset bintree and numbers --- bintree.c | 127 ++---------------------------------------------------- numbers.c | 73 ++----------------------------- 2 files changed, 8 insertions(+), 192 deletions(-) diff --git a/bintree.c b/bintree.c index 4cecb66..5cf82a9 100644 --- a/bintree.c +++ b/bintree.c @@ -1,82 +1,18 @@ #include #include "stack.h" #include "bintree.h" -#include -// 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 *insertedNode; - // create a new node if the current node is NULL - if (root == NULL) - { - // it's important to zero the pointers for adjacent nodes - insertedNode = calloc(1, sizeof(TreeNode)); - if (!insertedNode) - { - return NULL; - } - - insertedNode->data = malloc(dataSize); - if (!insertedNode->data) - { - return NULL; - } - memcpy(insertedNode->data, data, dataSize); - // reset isDuplicate if it exists - if (isDuplicate) - { - *isDuplicate = 0; - } - return insertedNode; - } - - // TODO: what is the correct data type here? - int cmpRes = (*compareFct)(data, root->data); - // insert into the left branch - if (cmpRes < 0 || (cmpRes == 0 && isDuplicate == NULL)) - { - root->left = addToTree(root->left, data, dataSize, compareFct, isDuplicate); - } - // insert into the right branch - else if (cmpRes > 0) - { - root->right = addToTree(root->right, data, dataSize, compareFct, isDuplicate); - } - // the data is equal to the current node - else - { - // the data already exists in the tree and duplicates are ignored (isDuplicate* not NULL) - *isDuplicate = 1; - } - return root; -} - -// push all left descendants from @param node -static void pushLeftDesc(StackNode **stackPtr, TreeNode *node) -{ - if (!stackPtr || !node) - { - return; - } - TreeNode *curNode = node; - while (curNode->left) - { - *stackPtr = push(*stackPtr, curNode->left); - if (!*stackPtr) - { - return; - } - curNode = curNode->left; - } } // 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. @@ -84,72 +20,17 @@ static void pushLeftDesc(StackNode **stackPtr, TreeNode *node) // push the top node and push all its left nodes. void *nextTreeData(TreeNode *root) { - // this creates a static variable that maintains an internal state - static StackNode *stack; - // create a new stack - if (root) - { - // clear possibly existing stacks - clearStack(stack); - // init a new stack - stack = push(NULL, root); - // init failed - if (!stack) - { - return NULL; - } - pushLeftDesc(&stack, root); - - // return the first val - return nextTreeData(NULL); - } - - // neither stack nor root exist - if (!stack) - { - return NULL; - } - - // get next val with stack - TreeNode *res = top(stack); - stack = pop(stack); - if (res->right) - { - stack = push(stack, res->right); - pushLeftDesc(&stack, res->right); - } - - return res->data; } // Releases all memory resources (including data copies). void clearTree(TreeNode *root) { - // this check is crucial for recursion - if (!root) - { - // nothing to clear - return; - } - // release the resources of child nodes first - clearTree(root->left); - clearTree(root->right); - - // free the data (it's just a copy created in addToTree()) - free(root->data); - free(root); } // Returns the number of entries in the tree given by root. unsigned int treeSize(const TreeNode *root) { - // there are no nodes - if (!root) - { - return 0; - } - return 1 + treeSize(root->left) + treeSize(root->right); } \ No newline at end of file diff --git a/numbers.c b/numbers.c index 5211acb..f59d9a2 100644 --- a/numbers.c +++ b/numbers.c @@ -5,87 +5,22 @@ #include "numbers.h" #include "bintree.h" -static int compareInt(const void *ptr1, const void *ptr2); - -// TODO: getDuplicate und createNumbers implementieren +//TODO: getDuplicate und createNumbers implementieren /* * * Erzeugen eines Arrays mit der vom Nutzer eingegebenen Anzahl an Zufallszahlen. - * Sicherstellen, dass beim Befüllen keine Duplikate entstehen. - * Duplizieren eines zufälligen Eintrags im Array. - * in `getDuplicate()`: Sortieren des Arrays und Erkennen der doppelten Zahl durch Vergleich benachbarter Elemente. */ + * Sicherstellen, dass beim Befüllen keine Duplikate entstehen. + * Duplizieren eines zufälligen Eintrags im Array. + * in `getDuplicate()`: Sortieren des Arrays und Erkennen der doppelten Zahl durch Vergleich benachbarter Elemente. */ // 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 // creating random numbers. - -/* -the implemented tree can't efficiently check if it contains a specific number, but we don't actually need that anyways -create numbers just counts and checks if the just inserted number sets the isDuplicate pointer -*/ -// srand should have been called before this function unsigned int *createNumbers(unsigned int len) { - unsigned int *randomNumbers = malloc(len * sizeof(int)); - if (!randomNumbers) - { - return NULL; - } - - // including upper limit - int upperLimit = len * 2; - - int numberCnt = 0; - - int isDuplicate = 0; - TreeNode *root = NULL; - // we only need len-1 numbers because 1 will be duplicated - while (numberCnt < len - 1) - { - // numbers up to and including upperLimit without 0 - int randNum = rand() % upperLimit + 1; - // reset isDuplicate - isDuplicate = 0; - // don't forget to set the root here - root = addToTree(root, &randNum, sizeof(randNum), (CompareFctType)compareInt, &isDuplicate); - if (isDuplicate) - { - // number already exists - continue; - } - randomNumbers[numberCnt++] = randNum; - } - - // select which number to duplicate - int dupNum = randomNumbers[rand() % numberCnt]; - // ...and where to insert - int dupNumIdx = rand() % len; - - // move the number currently at the dupNumIdx to the end - // and insert the dupNum at the index - // this also works if the last idx was selected for dupNum - randomNumbers[len - 1] = randomNumbers[dupNumIdx]; - randomNumbers[dupNumIdx] = dupNum; - - // clean up memory - clearTree(root); - return randomNumbers; } // 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) { - qsort((void *)numbers, len, sizeof(int), compareInt); // sort the array - for (int i = 0; i < len - 1; i++) - { - if (numbers[i] == numbers[i + 1]) - return numbers[i]; - } - return 0; // zero on errors -} -static int compareInt(const void *ptr1, const void *ptr2) -{ - int num1 = *(int *)ptr1; - int num2 = *(int *)ptr2; - return num1 - num2; } \ No newline at end of file