wip

numbers.c

@@ -31,9 +31,7 @@ void createchecknumber(unsigned int len, unsigned int numbers[])
 
     do
     {
-      unsigned int value = 0;
+      unsigned int value = (rand() % (len * 2) + 1);
-      value = (rand() % (len * 2) + 1);
-
       same = 0;
 
       for (unsigned int j = 0; j < i; j++)
@@ -56,6 +54,11 @@ void createchecknumber(unsigned int len, unsigned int numbers[])
 
 unsigned int *createNumbers(unsigned int len)
 {
+  if (len <= 2) //sonst Index-Auswahl-Dauerschleife
+  {
+    return NULL;
+  }
+
   if (RANDOM_SEED == 0)
   {
     srand(time(NULL));
@@ -68,7 +71,7 @@ unsigned int *createNumbers(unsigned int len)
   unsigned int *numbers = malloc(sizeof(unsigned int) * len);
   if (numbers == NULL)
   {
-    return 0;
+    return NULL; 
   }
 
   createchecknumber(len, numbers);
@@ -78,9 +81,6 @@ unsigned int *createNumbers(unsigned int len)
 
   do
   {
-    i = 0;
-    j = 0;
-
     i = rand() % len;
     j = rand() % len;
 
@@ -89,7 +89,6 @@ unsigned int *createNumbers(unsigned int len)
   numbers[i] = numbers[j];
 
   return numbers;
-
 }
 
 void sortnumbers(unsigned int numbers[], unsigned int len)
@@ -109,15 +108,20 @@ void sortnumbers(unsigned int numbers[], unsigned int len)
   }
 }
 
-// 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 (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];
@@ -127,15 +131,15 @@ unsigned int getDuplicate(const unsigned int numbers[], unsigned int len)
 
   for (unsigned i = 0; i < len - 1; i++)
   {
-    if (copynumbers[i] == copynumbers[i+1])
+    if (copynumbers[i] == copynumbers[i + 1])
     {
       unsigned int a = copynumbers[i];
-      free (copynumbers);
+      free(copynumbers);
       return a;
     }
   }
 
-  free (copynumbers);
+  free(copynumbers);
 
   return 0;
 }

test__numbers.c

@@ -1,67 +1,78 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 #include "unity/unity.h"
 #include "numbers.h"
 
+static unsigned int count_number_occurrence(const unsigned int *arr, unsigned int len, unsigned int value)
+{
+    unsigned int count = 0;
+    for (unsigned int i = 0; i < len; i++)
+    {
+        if (arr[i] == value)
+            count++;
+    }
+    return count;
+}
+
 void test_length_and_duplicate()
 {
     setSeed(1);
     unsigned int len = 10;
     unsigned int *test_numbers = createNumbers(len);
 
-    if (test_numbers == NULL)
+    TEST_ASSERT_NOT_NULL(test_numbers);
-    {
-        return;
-    }
-
-    /*
-    setSeed(1);
-    unsigned int len = 10;
-    unsigned int *test_numbers = createNumbers(len);
-
-    if (test_numbers == NULL)
-    {
-        return;
-    }
-
-    unsigned int expected[10] = {20, 8, 13, 19, 17, 16, 12, 0, 15, 14};
 
+    //Bereich checken:
     for (unsigned int i = 0; i < len; i++)
     {
-        if (test_numbers[i] != expected[i])
+        TEST_ASSERT_TRUE(test_numbers[i] >= 1);
-        {
+        TEST_ASSERT_TRUE(test_numbers[i] <= len * 2);
-            free(test_numbers);
+    }
-            return;
+
-        }
+    //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 dupli = 0;
+    unsigned int duplicate = 0;
 
-    dupli = getDuplicate(test_numbers, 6);
+    duplicate = getDuplicate(test_numbers, 6);
-
-    TEST_ASSERT_EQUAL(5, dupli);
 
+    TEST_ASSERT_EQUAL(5, duplicate);
 }
 
 void test_duplicate_value_if_false()
 {
     unsigned int test_numbers[6] = {1, 2, 3, 4, 5, 6};
-    unsigned int dupli = 0;
+    unsigned int duplicate = 0;
 
-    dupli = getDuplicate(test_numbers, 6);
+    duplicate = getDuplicate(test_numbers, 6);
-
-    TEST_ASSERT_EQUAL(0, dupli);
 
+    TEST_ASSERT_EQUAL(0, duplicate);
 }
 
+void setUp(void) {}
+
+void tearDown(void) {}
+
 int main(void)
 {
     UNITY_BEGIN();
@@ -70,4 +81,4 @@ int main(void)
     RUN_TEST(test_duplicate_value);
     RUN_TEST(test_duplicate_value_if_false);
     return UNITY_END();
-}
+}