make_file eingefügt

makefile

@@ -35,11 +35,8 @@ $(program_obj_filesobj_files): %.o: %.c
 # --------------------------
 # Unit Tests
 # --------------------------
-unitTestsStack: stack.o test_stack.c $(unityfolder)/unity.c
-	$(CC) $(FLAGS) -I$(unityfolder) $^ -o $@
-
-
-
+unitTests: numbers.o test_numbers.c $(unityfolder)/unity.c
+	$(CC) $(FLAGS) -I$(unityfolder) -o runtest_numbers test_numbers.c numbers.o $(unityfolder)/unity.c
 # --------------------------
 # Clean
 # --------------------------

numbers.c

@@ -14,13 +14,91 @@
 // 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.
+
+//ohne Binärbaum
+/*unsigned int *createNumbers(unsigned int len)
+{
+  if (len <= 2)
+    return NULL;
+  
+  // Zufallszahlen erzeugen
+  srand(time(NULL));
+  unsigned int *numbers = malloc(len * sizeof(unsigned int));
+  //prüfen, ob Speicher richtig reserviert wurde
+  if(numbers == NULL){
+    printf("Es konnte nicht genügend Speicher reserviert werden");
+    free(numbers);
+    return NULL;
+  }
+  //einsetzen der Zahlen ins array
+  for (size_t i = 0; i < len; i++){
+    numbers[i] = (rand()%(2*len))+1;
+    //stellt sicher, dass keine Duplikate vorhanden sind
+    for(size_t j = 0; j < i; j++){
+      if(numbers[i] == numbers[j]){
+        i--;
+        break;
+      }
+    }
+
+  }
+  numbers[rand()% len] = (rand()% (2* len) )+ 1;
+  return numbers;
+  free(numbers);
+}*/
+
+int compare(const void *a, const void *b) {
+    return (*(int*)a - *(int*)b);
+}
+//mit Binärbaum
 unsigned int *createNumbers(unsigned int len)
 {
+  if (len <= 2)
+    return NULL;
+  
+  // Zufallszahlen erzeugen
+  srand(time(NULL));
+  unsigned int *numbers = malloc(len * sizeof(unsigned int));
+  //prüfen, ob Speicher richtig reserviert wurde
+  if(numbers == NULL){
+    printf("Es konnte nicht genügend Speicher reserviert werden");
+    free(numbers);
+    return NULL;
+  }
 
+  TreeNode *root = NULL;
+  for(size_t i= 0; i < len; i++){
+    unsigned int isDup = 0; 
+    numbers[i] = (rand()%(2*len))+1;
+    root = addToTree(root, &numbers, sizeof(numbers), compare, &isDup);
+    if(isDup != 1){
+      i--;
+    }
+  }
+
+  numbers[rand()% len] = (rand()% (2* len) + 1);
+  return numbers;
+  clearTree(root);
+  free(numbers);
 }
 
 // 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 dobble;
+  // neues Array zum reinkopieren initialisieren 
+  unsigned int *nums = malloc(len * sizeof(unsigned int));
+  for(int l = 0; l < len; l++)
+    nums[l] = numbers[l]; 
 
+  //array sortieren
+  qsort(nums, len, sizeof(unsigned int), compare);
+  for(int k = 0; k < len; k++){
+    if(nums[k] == nums[k+1]){
+      dobble = nums[k];
+      break;
+    }
+  }
+  return dobble;
+  free(nums);
 }

stack.c

@@ -10,54 +10,24 @@
 // Pushes data as pointer onto the stack.
 StackNode *push(StackNode *stack, void *data)
 {
-    // Neues Stack-Element erstellen
-    StackNode *newNode = malloc(sizeof(StackNode));
-    if (!newNode) {
-        return stack; // oder NULL, je nach Fehlerstrategie
-    }
 
-    
-    newNode->data = data;
-    newNode->next = stack; // bisheriger Stack wird nach unten geschoben
-
-    return newNode; // neuer Kopf des Stacks
 }
 
 // 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 == NULL)
-        return NULL;
 
-    StackNode *newTop = stack->next;
-
-    // Daten gehen verloren!
-    // Caller KANN sie nicht freigeben.
-    free(stack);
-
-    return newTop;
 }
 
 // Returns the data of the top element.
 void *top(StackNode *stack)
 {
-    if (stack == NULL)
-        return NULL;   // kein Element im Stack
 
-    return stack->data;
 }
 
 // Clears stack and releases all memory.
 void clearStack(StackNode *stack)
 {
-    StackNode *current = stack;
-
-    while (current != NULL) 
-    {
-        StackNode *next = current->next;
-        free(current);
-        current = next;
-    }
 
 }

stack.h

@@ -8,10 +8,6 @@ The latest element is taken from the stack. */
 #include <stdlib.h>
 
 //TODO: passenden Datentyp als struct anlegen
-typedef struct Node {
-    void *data;
-    struct Node *next;
-} StackNode;
 
 // Pushes data as pointer onto the stack.
 StackNode *push(StackNode *stack, void *data);

test_numbers.c

@@ -0,0 +1,54 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
+#include "numbers.h"
+#include "bintree.h"
+#include "unity.h"
+
+//überprüft, dass die Funktion nicht NULL zurückgibt
+void test_create_Numbers_notNull(void){
+    unsigned int* numbers = createNumbers(10);
+    TEST_ASSERT_NOT_NULL(numbers);
+    free(numbers);
+}
+// überprüft, ob die generierten Zufallszahlen innerhalb des Intervalls sind
+void test_create_Numbers_randoms_inside_Value_range(void){
+    unsigned int len = 10;
+    unsigned int* numbers = createNumbers(len);
+
+    for(size_t i = 0; i < len; i++)
+        TEST_ASSERT_LESS_OR_EQUAL(2 * len + 1, numbers[i]);
+
+    free(numbers);
+}
+
+// überprüft, ob getDuplicate,die richtige doppelte Zahl findet
+void test_get_duplicate_returns_correct_dobble(void){
+    unsigned int numbers [5] = {1,2,3,4,2};
+    unsigned int len = 5;
+    unsigned int expected_result = 2;
+    unsigned int result = getDuplicate(numbers, len);
+    TEST_ASSERT_EQUAL_UINT32(expected_result, result);
+}
+
+
+void setUp(void) {
+    
+}
+
+void tearDown(void) {
+    
+}
+
+
+int main()
+{
+    UNITY_BEGIN();
+    
+    printf("\n============================\nNumbers tests\n============================\n");
+    RUN_TEST(test_get_duplicate_returns_correct_dobble);
+    RUN_TEST(test_create_Numbers_notNull);
+    RUN_TEST(test_create_Numbers_randoms_inside_Value_range);
+    return UNITY_END();
+}

test_stack.c

@@ -1,78 +0,0 @@
-#include <stdlib.h>
-#include "stack.h"
-#include "unity.h"
-
-void test_push_and_top(void);
-
-void test_pop(void);
-
-void test_clearStack(void);
-
-void setUp(void) {}
-
-void tearDown(void) {}
-
-
-int main(void)
-{
-    UNITY_BEGIN();
-
-    RUN_TEST(test_push_and_top);
-    RUN_TEST(test_pop);
-    RUN_TEST(test_clearStack);
-
-    return UNITY_END();
-}
-
-
-void test_push_and_top(void)
-{
-    StackNode *stack = NULL;
-
-    int a = 10;
-    int b = 20;
-    int c = 30;
-
-    stack = push(stack, &a);
-    stack = push(stack, &b);
-    stack = push(stack, &c);
-
-    TEST_ASSERT_EQUAL_INT(30, *(int*)top(stack));
-
-    clearStack(stack);
-    TEST_ASSERT_NULL(stack);
-}
-
-void test_pop(void)
-{
-    StackNode *stack = NULL;
-
-    int x = 111;
-    int y = 222;
-
-    stack = push(stack, &x);
-    stack = push(stack, &y);
-
-    // pop removes y
-    stack = pop(stack);
-    TEST_ASSERT_EQUAL_INT(111, *(int*)top(stack));
-
-    // pop removes x
-    stack = pop(stack);
-    TEST_ASSERT_NULL(stack);
-}
-
-void test_clearStack(void)
-{
-    StackNode *stack = NULL;
-
-    int x = 5;
-    int y = 6;
-
-    stack = push(stack, &x);
-    stack = push(stack, &y);
-
-    clearStack(stack);
-
-    TEST_ASSERT_NULL(stack);
-}