update merge-sort to reflect API update.

main.cpp

@@ -3,18 +3,6 @@
 #include "sorting.h"
 
 using namespace std;
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-//from header file
->>>>>>> da94961751a78074e353150eec99910db0c9a8fc
-vector<int> sort_custom(vector<int>& a);
-
-void printVector(vector<int> a);
-=======
-vector<int> sort_custom(vector<int>);
->>>>>>> merge-sort
 
 int main(int argc, char const *argv[])
 {
@@ -27,16 +15,9 @@ int main(int argc, char const *argv[])
 		if (num != -1)
 		a.push_back(num);
 	}
-<<<<<<< HEAD
-	//printVector(a);	
 	a = sort_custom(a);
-=======
->>>>>>> merge-sort
-
-	a = sort_custom(a);
-    for (int i=0;  i <a.size();  i++) 
+    for (int i=0;  i <a.size();  i++)
 	{
 		cout<<a[i]<<" ";
 	}
 }
-

sorting.cpp

-<<<<<<< HEAD
-#include <vector>
-#include "sorting.h"
-//
-using namespace std;
-vector<int> sort_custom(const vector<int>& a)
-{
-      bool swapp = true;
-      while(swapp){
-        swapp = false;
-        for (size_t i = 0; i < a.size()-1; i++) {
-            if (a[i]>a[i+1] ){
-                a[i] += a[i+1];
-                a[i+1] = a[i] - a[i+1];
-                a[i] -=a[i+1];
-                swapp = true;
-            }
-        }
-    }
-     return a;	
-=======
 #include <iostream>
 #include <vector>
 
@@ -48,10 +27,9 @@ vector<int> merge(vector<int> left, vector<int> right)
       }
    }
    return result;
->>>>>>> merge-sort
 }
 
-vector<int> sort_custom(vector<int> m)
+vector<int> sort_custom(vector<int> m, int s, int e)
 {
    if (m.size() <= 1)
       return m;
@@ -59,16 +37,16 @@ vector<int> sort_custom(vector<int> m)
    vector<int> left, right, result;
    int middle = ((int)m.size()+ 1) / 2;
  
-   for (int i = 0; i < middle; i++) {
+   for (int i = s; i < middle; i++) {
       left.push_back(m[i]);
    }
 
-   for (int i = middle; i < (int)m.size(); i++) {
+   for (int i = middle; i < e; i++) {
       right.push_back(m[i]);
    }
  
-   left = sort_custom(left);
-   right = sort_custom(right);
+   left = sort_custom(left, 0, (int)left.size());
+   right = sort_custom(right, 0, (int)right.size());
    result = merge(left, right);
  
    return result;

testfile

-this is a test file to check the mergin of code 
-#kshiti kshingha
-
-
-new changes here
-