wip

makefile

@@ -35,8 +35,8 @@ $(program_obj_filesobj_files): %.o: %.c
 # --------------------------
 # Unit Tests
 # --------------------------
-test_numbers:
-	$(CC) -o test_numbers test__numbers.c numbers.c $(unityfolder)/unity.c $(FLAGS)
+
+
 
 # --------------------------
 # Clean

numbers.c

@@ -5,9 +5,7 @@
 #include "numbers.h"
 #include "bintree.h"
 
-unsigned int seed = 0;
-
-unsigned int *numbers;
+unsigned int RANDOM_SEED = 0;
 
 // TODO: getDuplicate und createNumbers implementieren
 /*  *   * Erzeugen eines Arrays mit der vom Nutzer eingegebenen Anzahl an Zufallszahlen.
@@ -19,13 +17,13 @@ unsigned int *numbers;
 // Returns NULL on errors. Use your implementation of the binary search tree to check for possible duplicates while
 // creating random numbers.
 
-unsigned int setSeed(unsigned int seed_test)
+unsigned int setSeed(unsigned int seed)
 {
-  seed = seed_test;
-  return seed;
+  RANDOM_SEED = seed;
+  return RANDOM_SEED;
 }
 
-void create_unique_random_numbers(unsigned int len, unsigned int numbers[])
+void createchecknumber(unsigned int len, unsigned int numbers[])
 {
   for (unsigned int i = 0; i < len; i++)
   {
@@ -33,9 +31,7 @@ void create_unique_random_numbers(unsigned int len, unsigned int numbers[])
 
     do
     {
-      unsigned int value = 0;
-      value = (rand() % (len * 2) + 1);
-
+      unsigned int value = (rand() % (len * 2) + 1);
       same = 0;
 
       for (unsigned int j = 0; j < i; j++)
@@ -58,48 +54,44 @@ void create_unique_random_numbers(unsigned int len, unsigned int numbers[])
 
 unsigned int *createNumbers(unsigned int len)
 {
-
-  if (len <= 2)
+  if (len <= 2) //sonst Index-Auswahl-Dauerschleife
   {
-    return numbers;
+    return NULL;
   }
 
-  if (seed == 0)
+  if (RANDOM_SEED == 0)
   {
     srand(time(NULL));
   }
   else
   {
-    srand(seed);
+    srand(RANDOM_SEED);
   }
 
-  numbers = malloc(sizeof(unsigned int) * len);
-
-  if (numbers != NULL)
+  unsigned int *numbers = malloc(sizeof(unsigned int) * len);
+  if (numbers == NULL)
   {
-    create_unique_random_numbers(len, numbers);
-
-    unsigned int i = 0;
-    unsigned int j = 0;
-
-    do
-    {
-      i = 0;
-      j = 0;
-
-      i = rand() % len;
-      j = rand() % len;
-
-    } while (i == j || i == j + 1 || i == j - 1);
-
-    numbers[i] = numbers[j];
+    return NULL; 
   }
 
+  createchecknumber(len, numbers);
+
+  unsigned int i = 0;
+  unsigned int j = 0;
+
+  do
+  {
+    i = rand() % len;
+    j = rand() % len;
+
+  } while (i == j);
+
+  numbers[i] = numbers[j];
+
   return numbers;
 }
 
-/*
-void sortnumbers(unsigned int numbers[], unsigned int len) //-> qsort
+void sortnumbers(unsigned int numbers[], unsigned int len)
 {
   for (unsigned int j = 0; j < len - 1; j++)
   {
@@ -115,39 +107,27 @@ void sortnumbers(unsigned int numbers[], unsigned int len) //-> qsort
     }
   }
 }
-*/
 
-int compare(const void *arg1, const void *arg2)
-{
-  unsigned int a = *(const unsigned int *)arg1;
-  unsigned int b = *(const unsigned int *)arg2;
 
-  return ((a > b) - (a < b));
-}
-
-// 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)
 {
-  if (len <= 2)
+  if (numbers == NULL || len < 2) // sonst Index-Auswahl-Dauerschleife
   {
     return 0;
   }
 
   unsigned int *copynumbers = malloc(sizeof(unsigned int) * len);
-
   if (copynumbers == NULL)
   {
     return 0;
   }
-
+  
   for (unsigned int i = 0; i < len; i++)
   {
     copynumbers[i] = numbers[i];
   }
 
-  qsort(copynumbers, len, sizeof(unsigned int), compare);
-
-  // sortnumbers(copynumbers, len);
+  sortnumbers(copynumbers, len);
 
   for (unsigned i = 0; i < len - 1; i++)
   {

numbers.h

@@ -1,12 +1,12 @@
 #ifndef NUMBERS_H
 #define NUMBERS_H
 
+extern unsigned int RANDOM_SEED;
+
 // 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.
 
-int compare(const void *arg1, const void *arg2);
-
 unsigned int setSeed(unsigned int seed);
 
 unsigned int *createNumbers(unsigned int len);

stack.c

@@ -8,12 +8,6 @@
     * `clearStack`: gibt den gesamten Speicher frei. */
 
 // Pushes data as pointer onto the stack.
-typedef struct stackNode
-{
-    void *data;
-    struct stackNode *next;
-} StackNode;
-
 StackNode *push(StackNode *stack, void *data)
 {
 

test__numbers.c

@@ -3,26 +3,53 @@
 #include "unity/unity.h"
 #include "numbers.h"
 
-void test_createNumbers_create_one_double_number()
+static unsigned int count_number_occurrence(const unsigned int *arr, unsigned int len, unsigned int value)
 {
-    setSeed(1);
-    unsigned int len = 20;
-    unsigned int *numbers = createNumbers(len);
-
-    qsort(numbers, len, sizeof(unsigned int), compare);
-
     unsigned int count = 0;
-    for (unsigned int i = 1; i < len; i++)
+    for (unsigned int i = 0; i < len; i++)
     {
-        if (numbers[i] == numbers[i - 1])
-        {
+        if (arr[i] == value)
             count++;
-        }
     }
-    TEST_ASSERT_EQUAL_UINT(1, count);
+    return count;
 }
 
-void test_getduplicate_returns_corecct_duplicate()
+void test_length_and_duplicate()
+{
+    setSeed(1);
+    unsigned int len = 10;
+    unsigned int *test_numbers = createNumbers(len);
+
+    TEST_ASSERT_NOT_NULL(test_numbers);
+
+    //Bereich checken:
+    for (unsigned int i = 0; i < len; i++)
+    {
+        TEST_ASSERT_TRUE(test_numbers[i] >= 1);
+        TEST_ASSERT_TRUE(test_numbers[i] <= len * 2);
+    }
+
+    //Prüfen, ob genau 1 Wert doppelt vorkommt:
+    unsigned int duplicate = getDuplicate(test_numbers, len);
+    TEST_ASSERT_NOT_EQUAL(0, duplicate);
+
+    unsigned int occurrences = count_number_occurrence(test_numbers, len, duplicate);
+    TEST_ASSERT_EQUAL_UINT(2, occurrences);
+
+    //Prüfen, ob alle anderen Werte nur einmal vorkommen:
+    for (unsigned int i = 1; i <= len * 2; i++)
+    {
+        if (i == duplicate)
+            continue;
+
+        unsigned int c = count_number_occurrence(test_numbers, len, i);
+        TEST_ASSERT_TRUE(c <= 1); //Keine Zahl darf doppelt vorkommen.
+    }
+
+    free(test_numbers);
+}
+
+void test_duplicate_value()
 {
     unsigned int test_numbers[6] = {1, 2, 3, 4, 5, 5};
     unsigned int duplicate = 0;
@@ -32,7 +59,7 @@ void test_getduplicate_returns_corecct_duplicate()
     TEST_ASSERT_EQUAL(5, duplicate);
 }
 
-void test_getduplicate_know_if_no_duplicate()
+void test_duplicate_value_if_false()
 {
     unsigned int test_numbers[6] = {1, 2, 3, 4, 5, 6};
     unsigned int duplicate = 0;
@@ -43,14 +70,15 @@ void test_getduplicate_know_if_no_duplicate()
 }
 
 void setUp(void) {}
+
 void tearDown(void) {}
 
 int main(void)
 {
     UNITY_BEGIN();
 
-    RUN_TEST(test_createNumbers_create_one_double_number);
-    RUN_TEST(test_getduplicate_returns_corecct_duplicate);
-    RUN_TEST(test_getduplicate_know_if_no_duplicate);
+    RUN_TEST(test_length_and_duplicate);
+    RUN_TEST(test_duplicate_value);
+    RUN_TEST(test_duplicate_value_if_false);
     return UNITY_END();
 }