Skip to content

1
170050020-170050046-170050058-git
Commit aff5eab6 authored by ='s avatar =
Browse files
Options

update implementation to merge-sort

parent 9c324ffc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sorting.cpp
View file @ aff5eab6
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include<vector> #include<vector>
#include "sorting.h" #include "sorting.h"
using namespace std; using namespace std;
vector<int> merge_fun(vector<int> array1, vector<int> array2){ vector<int> merge_fun(vector<int> array1, vector<int> array2){
...@@ -50,4 +51,4 @@ vector<int> sort_custom(vector<int> inp){ ...@@ -50,4 +51,4 @@ vector<int> sort_custom(vector<int> inp){
vector<int> ans=merge_fun(out1,out2); vector<int> ans=merge_fun(out1,out2);
return ans; return ans;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment