Fixed a bug in the new implemented merge sort, and implemented the unit test.

Author: MostafaTwfiq

Algorithms/Sorting/Sources/MergeSort.c

@@ -180,22 +180,26 @@ void mergeSortHelper(char *arr, int length, int elemSize, int (*cmp)(const void
     mergeSortHelper(arr, firstHalfLength, elemSize, cmp);
     mergeSortHelper(arr + firstHalfLength * elemSize, secondHalfLength, elemSize, cmp);
 
-    char *tempArr = (char *) malloc(length * elemSize);
+    char *tempArr = (char *) malloc(length * elemSize), *firstHalfPointer = arr;
     int counter = 0;
-    short firstHalfCopiedBool = 0;
+
     for (int i = firstHalfLength; i < length; i++) {
 
-        if (!firstHalfCopiedBool  && cmp(arr + i * elemSize, arr) > 0) {
-            for (int j = 0; j < firstHalfLength; j++) {
-                memcpy(tempArr + counter++ * elemSize, arr + j * elemSize, elemSize);
-            }
-            firstHalfCopiedBool = 1;
+        while (firstHalfPointer != arr + firstHalfLength * elemSize &&
+        cmp(arr + i * elemSize, firstHalfPointer) > 0) {
+            memcpy(tempArr + counter++ * elemSize, firstHalfPointer, elemSize);
+            firstHalfPointer += elemSize;
         }
 
         memcpy(tempArr + counter++ * elemSize, arr + i * elemSize, elemSize);
 
     }
 
+    while (firstHalfPointer != arr + firstHalfLength * elemSize) {
+        memcpy(tempArr + counter++ * elemSize, firstHalfPointer, elemSize);
+        firstHalfPointer += elemSize;
+    }
+
     for (int i = 0; i < length; i++) {
         memcpy(arr + i * elemSize , tempArr + i * elemSize, elemSize);
     }

CMakeLists.txt

@@ -15,9 +15,9 @@ add_executable(C_DataStructures
         "Unit Test/CuTest"
         "Unit Test/CuTest/CuTest.c"
         "Unit Test/CuTest/CuTest.h"
-        #"Unit Test/CuTest/AllTests.c"
-        #"Unit Test/CuTest/CuTestTest.c"
-        #"Unit Test/ErrorsTestStruct.h"
+        "Unit Test/CuTest/AllTests.c"
+        "Unit Test/CuTest/CuTestTest.c"
+        "Unit Test/ErrorsTestStruct.h"
 
         DataStructure/Stacks/Sources/Stack.c
         DataStructure/Stacks/Headers/Stack.h

Unit Test/Tests/AlgorithmsTests/SortAlgTests/SortAlgTest.c

@@ -122,6 +122,29 @@ void testMergeSort(CuTest *cuTest) {
     for (int i = 9; i >= 0; i--)
         CuAssertIntEquals(cuTest, i + 1, arr[9 - i]);
 
+    int arr2[] = {5, 3, 9, 7, 6, 1, 2, 4, 10, 8};
+
+    mergeSortWS(NULL, 0, 0, NULL);
+    CuAssertIntEquals(cuTest, NULL_POINTER, ERROR_TEST->errorCode);
+
+    mergeSortWS(arr2, -1, 0, NULL);
+    CuAssertIntEquals(cuTest, INVALID_ARG, ERROR_TEST->errorCode);
+
+    mergeSortWS(arr2, 1, 0, NULL);
+    CuAssertIntEquals(cuTest, INVALID_ARG, ERROR_TEST->errorCode);
+
+    mergeSortWS(arr2, 1, 1, NULL);
+    CuAssertIntEquals(cuTest, INVALID_ARG, ERROR_TEST->errorCode);
+
+    mergeSortWS(arr2, 10, sizeof(int), intCompareFunSoAT1);
+
+    for (int i = 0; i < 10; i++)
+        CuAssertIntEquals(cuTest, i + 1, arr2[i]);
+
+    mergeSortWS(arr2, 10, sizeof(int), intCompareFunSoAT2);
+    for (int i = 9; i >= 0; i--)
+        CuAssertIntEquals(cuTest, i + 1, arr2[9 - i]);
+
 }
 
 

main.c

@@ -20,8 +20,9 @@
 // ██░░░░░░░░░░██                      ██░░░░░░░░████ ██░░░░░░░░░░██                      ██░░██  ██░░██ ██░░░░░░░░░░██
 // ██████████████                      ████████████   ██████████████                      ██████  ██████ ██████████████
 
-int main(void) {
 
+
+int main(void) {
     return 0;
 }