added comp argument and test for stability

This commit is contained in:
Ahmet Inan 2024-03-08 13:00:40 +01:00
commit 389fcc3bd8
2 changed files with 37 additions and 18 deletions

31
sort.hh
View file

@ -13,7 +13,18 @@ static void insertion_sort(TYPE *a, int n)
{
for (int i = 1, j; i < n; ++i) {
TYPE t = a[i];
for (j = i; j > 0 && a[j-1] > t; --j)
for (j = i; j > 0 && t < a[j-1]; --j)
a[j] = a[j-1];
a[j] = t;
}
}
template <typename TYPE, typename COMP>
static void insertion_sort(TYPE *a, int n, COMP comp)
{
for (int i = 1, j; i < n; ++i) {
TYPE t = a[i];
for (j = i; j > 0 && comp(t, a[j-1]); --j)
a[j] = a[j-1];
a[j] = t;
}
@ -25,7 +36,7 @@ static void insertion_sort(INDEX *p, TYPE *a, int n)
p[0] = 0;
for (int i = 1, j; i < n; ++i) {
TYPE t = a[i];
for (j = i; j > 0 && a[j-1] > t; --j) {
for (j = i; j > 0 && t < a[j-1]; --j) {
a[j] = a[j-1];
p[j] = p[j-1];
}
@ -38,27 +49,33 @@ template <typename TYPE, int MAX_N, int M = 32>
class MergeSort
{
TYPE tmp[MAX_N];
void merge(TYPE *a, int n, int left, int right, int end)
template <typename COMP>
void merge(TYPE *a, int n, int left, int right, int end, COMP comp)
{
if (right > n)
right = n;
if (end > n)
end = n;
for (int i = left, j = right, k = left; k < end; ++k)
tmp[k] = (i < right && (j >= end || a[i] <= a[j])) ? a[i++] : a[j++];
tmp[k] = (i >= right || (j < end && comp(a[j], a[i]))) ? a[j++] : a[i++];
}
public:
void operator()(TYPE *a, int n)
template <typename COMP>
void operator()(TYPE *a, int n, COMP comp)
{
for (int i = 0; i < n; i += M)
insertion_sort(a+i, i > n-M ? n-i : M);
insertion_sort(a+i, i > n-M ? n-i : M, comp);
for (int l = M; l < n; l *= 2) {
for (int i = 0; i < n; i += 2*l)
merge(a, n, i, i+l, i+2*l);
merge(a, n, i, i+l, i+2*l, comp);
for (int i = 0; i < n; ++i)
a[i] = tmp[i];
}
}
void operator()(TYPE *a, int n)
{
operator()(a, n, [](TYPE x, TYPE y){ return x < y; });
}
};
}