change implementation to merge-sort

sorting.cpp

+
 #include <iostream>
 #include "sorting.h"
 using namespace std;
-
-vector<int> sort_custom(vector<int> v)
+vector<int> merge(vector<int> left, vector<int> right)
 {
-    for(int i = 0; i < v.size(); i++)
-    {
-        int count = 0;
-        for(int j = 0; j < v.size()-1; j++)
-        {
-            if (v[j] > v[j+1]) {
-                count++;
-                int temp = v[j];
-                v[j] = v[j+1];
-                v[j+1] = temp;
-            }
-        }
-        if (count==0) {
-            return v;
-        }
-    }
-    return v;
+   vector<int> result;
+   while ((int)left.size() > 0 || (int)right.size() > 0) {
+      if ((int)left.size() > 0 && (int)right.size() > 0) {
+         if ((int)left.front() <= (int)right.front()) {
+            result.push_back((int)left.front());
+            left.erase(left.begin());
+         } 
+   else {
+            result.push_back((int)right.front());
+            right.erase(right.begin());
+         }
+      }  else if ((int)left.size() > 0) {
+            for (int i = 0; i < (int)left.size(); i++)
+               result.push_back(left[i]);
+            break;
+      }  else if ((int)right.size() > 0) {
+            for (int i = 0; i < (int)right.size(); i++)
+               result.push_back(right[i]);
+            break;
+      }
+   }
+   return result;
 }
+
+
+vector<int> sort_custom(vector<int> m)
+{
+   if (m.size() <= 1)
+      return m;
+ 
+   vector<int> left, right, result;
+   int middle = ((int)m.size()+ 1) / 2;
+ 
+   for (int i = 0; i < middle; i++) {
+      left.push_back(m[i]);
+   }
+
+   for (int i = middle; i < (int)m.size(); i++) {
+      right.push_back(m[i]);
+   }
+ 
+   left = sort_custom(left);
+   right = sort_custom(right);
+   result = merge(left, right);
+ 
+   return result;
+}
\ No newline at end of file