diff options
Diffstat (limited to 'DTQuickSort.c')
| -rw-r--r-- | DTQuickSort.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/DTQuickSort.c b/DTQuickSort.c index 7434263..8f480ca 100644 --- a/DTQuickSort.c +++ b/DTQuickSort.c @@ -17,17 +17,17 @@ global func SortNumericInverse(int a, int b) return -SortNumeric(a, b); } -global func QSort(array& data, callback) // WARNING: Can cause stack-overflow with too much data +global func QSort(array& data, callback, callbackArgs) // WARNING: Can cause stack-overflow with too much data { if(callback == true) { callback = GlobalCallback("SortNumericInverse"); } - QSort_Part(data, callback || GlobalCallback("SortNumeric"), 0, GetLength(data) - 1); + QSort_Part(data, callback || GlobalCallback("SortNumeric"), 0, GetLength(data) - 1, callbackArgs); return data; } -global func QSort_Part(array& data, callback, int left, int right) +global func QSort_Part(array& data, callback, int left, int right, callbackArgs) { if(left < right) { @@ -35,16 +35,16 @@ global func QSort_Part(array& data, callback, int left, int right) var pPos = RandomX(left, right); var p = data[pPos]; var tmp; - + tmp = data[pPos]; data[pPos] = data[right]; data[right] = tmp; pPos = right; - + var i = left - 1; for(var j = left; j <= right; ++j) { - if(Call(callback, data[j], p) < 0) + if(Call(callback, data[j], p, callbackArgs) < 0) { ++i; tmp = data[i]; @@ -52,15 +52,15 @@ global func QSort_Part(array& data, callback, int left, int right) data[j] = tmp; } } - + ++i; - + tmp = data[i]; data[i] = data[pPos]; data[pPos] = tmp; // ----- - - QSort_Part(data, callback, left, i - 1); - QSort_Part(data, callback, i + 1, right); + + QSort_Part(data, callback, left, i - 1, callbackArgs); + QSort_Part(data, callback, i + 1, right, callbackArgs); } } |