OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch '14427/incoming'

Browse Source 
Conflicts:
	src/libstd/sort.rs
This commit is contained in:
Brian Anderson 2012-10-25 11:24:02 -07:00
commit a9d7642b5d
10 changed files with 861 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargo/cargo.rs
View File

@ -1491,7 +1491,7 @@ fn print_pkg(s: @Source, p: &Package) {
fn print_source(s: @Source) {
info(s.name + ~" (" + s.url + ~")");
let pks = sort::merge_sort(sys::shape_lt, s.packages.get());
let pks = sort::merge_sort(s.packages.get(), sys::shape_lt);
let l = vec::len(pks);
print(io::with_str_writer(|writer| {

875
src/libstd/sort.rs
View File

@ -3,6 +3,7 @@
use vec::{len, push};
use core::cmp::{Eq, Ord};
use dvec::DVec;
type Le<T> = pure fn(v1: &T, v2: &T) -> bool;
@ -12,12 +13,12 @@ type Le<T> = pure fn(v1: &T, v2: &T) -> bool;
* Has worst case O(n log n) performance, best case O(n), but
* is not space efficient. This is a stable sort.
*/
pub fn merge_sort<T: Copy>(le: Le<T>, v: &[const T]) -> ~[T] {
pub fn merge_sort<T: Copy>(v: &[const T], le: Le<T>) -> ~[T] {
type Slice = (uint, uint);
return merge_sort_(le, v, (0, len(v)));
return merge_sort_(v, (0u, len(v)), le);
fn merge_sort_<T: Copy>(le: Le<T>, v: &[const T], slice: Slice)
fn merge_sort_<T: Copy>(v: &[const T], slice: Slice, le: Le<T>)
-> ~[T] {
let begin = slice.first();
let end = slice.second();
@ -29,7 +30,7 @@ pub fn merge_sort<T: Copy>(le: Le<T>, v: &[const T]) -> ~[T] {
let mid = v_len / 2 + begin;
let a = (begin, mid);
let b = (mid, end);
return merge(le, merge_sort_(le, v, a), merge_sort_(le, v, b));
return merge(le, merge_sort_(v, a, le), merge_sort_(v, b, le));
}
fn merge<T: Copy>(le: Le<T>, a: &[T], b: &[T]) -> ~[T] {
@ -50,8 +51,8 @@ pub fn merge_sort<T: Copy>(le: Le<T>, v: &[const T]) -> ~[T] {
}
}
fn part<T: Copy>(compare_func: Le<T>, arr: &[mut T], left: uint,
right: uint, pivot: uint) -> uint {
fn part<T: Copy>(arr: &[mut T], left: uint,
right: uint, pivot: uint, compare_func: Le<T>) -> uint {
let pivot_value = arr[pivot];
arr[pivot] <-> arr[right];
let mut storage_index: uint = left;
@ -67,16 +68,16 @@ fn part<T: Copy>(compare_func: Le<T>, arr: &[mut T], left: uint,
return storage_index;
}
fn qsort<T: Copy>(compare_func: Le<T>, arr: &[mut T], left: uint,
right: uint) {
fn qsort<T: Copy>(arr: &[mut T], left: uint,
right: uint, compare_func: Le<T>) {
if right > left {
let pivot = (left + right) / 2;
let new_pivot = part::<T>(compare_func, arr, left, right, pivot);
if new_pivot != 0 {
let pivot = (left + right) / 2u;
let new_pivot = part::<T>(arr, left, right, pivot, compare_func);
if new_pivot != 0u {
// Need to do this check before recursing due to overflow
qsort::<T>(compare_func, arr, left, new_pivot - 1);
qsort::<T>(arr, left, new_pivot - 1u, compare_func);
}
qsort::<T>(compare_func, arr, new_pivot + 1, right);
qsort::<T>(arr, new_pivot + 1u, right, compare_func);
}
}
@ -86,9 +87,9 @@ fn qsort<T: Copy>(compare_func: Le<T>, arr: &[mut T], left: uint,
* Has worst case O(n^2) performance, average case O(n log n).
* This is an unstable sort.
*/
pub fn quick_sort<T: Copy>(compare_func: Le<T>, arr: &[mut T]) {
if len::<T>(arr) == 0 { return; }
qsort::<T>(compare_func, arr, 0, len::<T>(arr) - 1);
pub fn quick_sort<T: Copy>(arr: &[mut T], compare_func: Le<T>) {
if len::<T>(arr) == 0u { return; }
qsort::<T>(arr, 0u, len::<T>(arr) - 1u, compare_func);
}
fn qsort3<T: Copy Ord Eq>(arr: &[mut T], left: int, right: int) {
@ -161,6 +162,543 @@ impl<T: Copy Ord Eq> &[mut T] : Sort {
fn qsort(self) { quick_sort3(self); }
}
const MIN_MERGE: uint = 64;
const MIN_GALLOP: uint = 7;
const INITIAL_TMP_STORAGE: uint = 128;
pub fn tim_sort<T: Copy Ord>(array: &[mut T]) {
let size = array.len();
if size < 2 {
return;
}
if size < MIN_MERGE {
let init_run_len = count_run_ascending(array);
binarysort(array, init_run_len);
return;
}
let ms = &MergeState();
let min_run = min_run_length(size);
let mut idx = 0;
let mut remaining = size;
loop {
let arr = vec::mut_view(array, idx, size);
let mut run_len: uint = count_run_ascending(arr);
if run_len < min_run {
let force = if remaining <= min_run {remaining} else {min_run};
let slice = vec::mut_view(arr, 0, force);
binarysort(slice, run_len);
run_len = force;
}
ms.push_run(idx, run_len);
ms.merge_collapse(array);
idx += run_len;
remaining -= run_len;
if remaining == 0 { break; }
}
ms.merge_force_collapse(array);
}
fn binarysort<T: Copy Ord>(array: &[mut T], start: uint) {
let size = array.len();
let mut start = start;
assert start <= size;
if start == 0 { start += 1; }
while start < size {
let pivot = array[start];
let mut left = 0;
let mut right = start;
assert left <= right;
while left < right {
let mid = (left + right) >> 1;
if pivot < array[mid] {
right = mid;
} else {
left = mid+1;
}
}
assert left == right;
let mut n = start-left;
copy_vec(array, left+1, array, left, n);
array[left] = move pivot;
start += 1;
}
}
// Reverse the order of elements in a slice, in place
fn reverse_slice<T>(v: &[mut T], start: uint, end:uint) {
let mut i = start;
while i < end / 2 {
util::swap(&mut v[i], &mut v[end - i - 1]);
i += 1;
}
}
pure fn min_run_length(n: uint) -> uint {
let mut n = n;
let mut r = 0; // becomes 1 if any 1 bits are shifted off
while n >= MIN_MERGE {
r |= n & 1;
n >>= 1;
}
return n + r;
}
fn count_run_ascending<T: Copy Ord>(array: &[mut T]) -> uint {
let size = array.len();
assert size > 0;
if size == 1 { return 1; }
let mut run = 2;
if array[1] < array[0] {
while run < size && array[run] < array[run-1] {
run += 1;
}
reverse_slice(array, 0, run);
} else {
while run < size && array[run] >= array[run-1] {
run += 1;
}
}
return run;
}
pure fn gallop_left<T: Copy Ord>(key: &const T, array: &[const T],
hint: uint) -> uint {
let size = array.len();
assert size != 0 && hint < size;
let mut last_ofs = 0;
let mut ofs = 1;
if *key > array[hint] {
// Gallop right until array[hint+last_ofs] < key <= array[hint+ofs]
let max_ofs = size - hint;
while ofs < max_ofs && *key > array[hint+ofs] {
last_ofs = ofs;
ofs = (ofs << 1) + 1;
if ofs < last_ofs { ofs = max_ofs; } // uint overflow guard
}
if ofs > max_ofs { ofs = max_ofs; }
last_ofs += hint;
ofs += hint;
} else {
let max_ofs = hint + 1;
while ofs < max_ofs && *key <= array[hint-ofs] {
last_ofs = ofs;
ofs = (ofs << 1) + 1;
if ofs < last_ofs { ofs = max_ofs; } // uint overflow guard
}
if ofs > max_ofs { ofs = max_ofs; }
let tmp = last_ofs;
last_ofs = hint - ofs;
ofs = hint - tmp;
}
assert (last_ofs < ofs || last_ofs+1 < ofs+1) && ofs <= size;
last_ofs += 1;
while last_ofs < ofs {
let m = last_ofs + ((ofs - last_ofs) >> 1);
if *key > array[m] {
last_ofs = m+1;
} else {
ofs = m;
}
}
assert last_ofs == ofs;
return ofs;
}
pure fn gallop_right<T: Copy Ord>(key: &const T, array: &[const T],
hint: uint) -> uint {
let size = array.len();
assert size != 0 && hint < size;
let mut last_ofs = 0;
let mut ofs = 1;
if *key >= array[hint] {
// Gallop right until array[hint+last_ofs] <= key < array[hint+ofs]
let max_ofs = size - hint;
while ofs < max_ofs && *key >= array[hint+ofs] {
last_ofs = ofs;
ofs = (ofs << 1) + 1;
if ofs < last_ofs { ofs = max_ofs; }
}
if ofs > max_ofs { ofs = max_ofs; }
last_ofs += hint;
ofs += hint;
} else {
// Gallop left until array[hint-ofs] <= key < array[hint-last_ofs]
let max_ofs = hint + 1;
while ofs < max_ofs && *key < array[hint-ofs] {
last_ofs = ofs;
ofs = (ofs << 1) + 1;
if ofs < last_ofs { ofs = max_ofs; }
}
if ofs > max_ofs { ofs = max_ofs; }
let tmp = last_ofs;
last_ofs = hint - ofs;
ofs = hint - tmp;
}
assert (last_ofs < ofs || last_ofs+1 < ofs+1) && ofs <= size;
last_ofs += 1;
while last_ofs < ofs {
let m = last_ofs + ((ofs - last_ofs) >> 1);
if *key >= array[m] {
last_ofs = m + 1;
} else {
ofs = m;
}
}
assert last_ofs == ofs;
return ofs;
}
struct RunState {
base: uint,
len: uint,
}
struct MergeState<T> {
mut min_gallop: uint,
runs: DVec<RunState>,
}
// Fixme (#3853) Move into MergeState
fn MergeState<T>() -> MergeState<T> {
MergeState {
min_gallop: MIN_GALLOP,
runs: DVec(),
}
}
impl<T: Copy Ord> MergeState<T> {
fn push_run(&self, run_base: uint, run_len: uint) {
let tmp = RunState{base: run_base, len: run_len};
self.runs.push(tmp);
}
fn merge_at(&self, n: uint, array: &[mut T]) {
let mut size = self.runs.len();
assert size >= 2;
assert n == size-2 || n == size-3;
do self.runs.borrow_mut |arr| {
let mut b1 = arr[n].base;
let mut l1 = arr[n].len;
let b2 = arr[n+1].base;
let l2 = arr[n+1].len;
assert l1 > 0 && l2 > 0;
assert b1 + l1 == b2;
arr[n].len = l1 + l2;
if n == size-3 {
arr[n+1].base = arr[n+2].base;
arr[n+1].len = arr[n+2].len;
}
let slice = vec::mut_view(array, b1, b1+l1);
let k = gallop_right(&const array[b2], slice, 0);
b1 += k;
l1 -= k;
if l1 != 0 {
let slice = vec::mut_view(array, b2, b2+l2);
let l2 = gallop_left(
&const array[b1+l1-1],slice,l2-1);
if l2 > 0 {
if l1 <= l2 {
self.merge_lo(array, b1, l1, b2, l2);
} else {
self.merge_hi(array, b1, l1, b2, l2);
}
}
}
}
self.runs.pop();
}
fn merge_lo(&self, array: &[mut T], base1: uint, len1: uint,
base2: uint, len2: uint) {
assert len1 != 0 && len2 != 0 && base1+len1 == base2;
let tmp = vec::to_mut(vec::slice(array, base1, base1+len1));
let mut c1 = 0;
let mut c2 = base2;
let mut dest = base1;
let mut len1 = len1;
let mut len2 = len2;
array[dest] <-> array[c2];
dest += 1; c2 += 1; len2 -= 1;
if len2 == 0 {
copy_vec(array, dest, tmp, 0, len1);
return;
}
if len1 == 1 {
copy_vec(array, dest, array, c2, len2);
array[dest+len2] <-> tmp[c1];
return;
}
let mut min_gallop = self.min_gallop;
loop {
let mut count1 = 0;
let mut count2 = 0;
let mut break_outer = false;
loop {
assert len1 > 1 && len2 != 0;
if array[c2] < tmp[c1] {
array[dest] <-> array[c2];
dest += 1; c2 += 1; len2 -= 1;
count2 += 1; count1 = 0;
if len2 == 0 {
break_outer = true;
}
} else {
array[dest] <-> tmp[c1];
dest += 1; c1 += 1; len1 -= 1;
count1 += 1; count2 = 0;
if len1 == 1 {
break_outer = true;
}
}
if break_outer || ((count1 | count2) >= min_gallop) {
break;
}
}
if break_outer { break; }
// Start to gallop
loop {
assert len1 > 1 && len2 != 0;
let tmp_view = vec::const_view(tmp, c1, c1+len1);
count1 = gallop_right(&const array[c2], tmp_view, 0);
if count1 != 0 {
copy_vec(array, dest, tmp, c1, count1);
dest += count1; c1 += count1; len1 -= count1;
if len1 <= 1 { break_outer = true; break; }
}
array[dest] <-> array[c2];
dest += 1; c2 += 1; len2 -= 1;
if len2 == 0 { break_outer = true; break; }
let tmp_view = vec::const_view(array, c2, c2+len2);
count2 = gallop_left(&const tmp[c1], tmp_view, 0);
if count2 != 0 {
copy_vec(array, dest, array, c2, count2);
dest += count2; c2 += count2; len2 -= count2;
if len2 == 0 { break_outer = true; break; }
}
array[dest] <-> tmp[c1];
dest += 1; c1 += 1; len1 -= 1;
if len1 == 1 { break_outer = true; break; }
min_gallop -= 1;
if !(count1 >= MIN_GALLOP || count2 >= MIN_GALLOP) {
break;
}
}
if break_outer { break; }
if min_gallop < 0 { min_gallop = 0; }
min_gallop += 2; // Penalize for leaving gallop
}
self.min_gallop = if min_gallop < 1 { 1 } else { min_gallop };
if len1 == 1 {
assert len2 > 0;
copy_vec(array, dest, array, c2, len2);
array[dest+len2] <-> tmp[c1];
} else if len1 == 0 {
fail ~"Comparison violates its contract!";
} else {
assert len2 == 0;
assert len1 > 1;
copy_vec(array, dest, tmp, c1, len1);
}
}
fn merge_hi(&self, array: &[mut T], base1: uint, len1: uint,
base2: uint, len2: uint) {
assert len1 != 1 && len2 != 0 && base1 + len1 == base2;
let tmp = vec::to_mut(vec::slice(array, base2, base2+len2));
let mut c1 = base1 + len1 - 1;
let mut c2 = len2 - 1;
let mut dest = base2 + len2 - 1;
let mut len1 = len1;
let mut len2 = len2;
array[dest] <-> array[c1];
dest -= 1; c1 -= 1; len1 -= 1;
if len1 == 0 {
copy_vec(array, dest-(len2-1), tmp, 0, len2);
return;
}
if len2 == 1 {
dest -= len1;
c1 -= len1;
copy_vec(array, dest+1, array, c1+1, len1);
array[dest] <-> tmp[c2];
return;
}
let mut min_gallop = self.min_gallop;
loop {
let mut count1 = 0;
let mut count2 = 0;
let mut break_outer = false;
loop {
assert len1 != 0 && len2 > 1;
if tmp[c2] < array[c1] {
array[dest] <-> array[c1];
dest -= 1; c1 -= 1; len1 -= 1;
count1 += 1; count2 = 0;
if len1 == 0 {
break_outer = true;
}
} else {
array[dest] <-> tmp[c2];
dest -= 1; c2 -= 1; len2 -= 1;
count2 += 1; count1 = 0;
if len2 == 1 {
break_outer = true;
}
}
if break_outer || ((count1 | count2) >= min_gallop) {
break;
}
}
if break_outer { break; }
// Start to gallop
loop {
assert len2 > 1 && len1 != 0;
let tmp_view = vec::mut_view(array, base1, base1+len1);
count1 = len1 - gallop_right(
&const tmp[c2], tmp_view, len1-1);
if count1 != 0 {
dest -= count1; c1 -= count1; len1 -= count1;
copy_vec(array, dest+1, array, c1+1, count1);
if len1 == 0 { break_outer = true; break; }
}
array[dest] <-> tmp[c2];
dest -= 1; c2 -= 1; len2 -= 1;
if len2 == 1 { break_outer = true; break; }
let tmp_view = vec::mut_view(tmp, 0, len2);
let count2 = len2 - gallop_left(&const array[c1],
tmp_view, len2-1);
if count2 != 0 {
dest -= count2; c2 -= count2; len2 -= count2;
copy_vec(array, dest+1, tmp, c2+1, count2);
if len2 <= 1 { break_outer = true; break; }
}
array[dest] <-> array[c1];
dest -= 1; c1 -= 1; len1 -= 1;
if len1 == 0 { break_outer = true; break; }
min_gallop -= 1;
if !(count1 >= MIN_GALLOP || count2 >= MIN_GALLOP) {
break;
}
}
if break_outer { break; }
if min_gallop < 0 { min_gallop = 0; }
min_gallop += 2; // Penalize for leaving gallop
}
self.min_gallop = if min_gallop < 1 { 1 } else { min_gallop };
if len2 == 1 {
assert len1 > 0;
dest -= len1;
c1 -= len1;
copy_vec(array, dest+1, array, c1+1, len1);
array[dest] <-> tmp[c2];
} else if len2 == 0 {
fail ~"Comparison violates its contract!";
} else {
assert len1 == 0;
assert len2 != 0;
copy_vec(array, dest-(len2-1), tmp, 0, len2);
}
}
fn merge_collapse(&self, array: &[mut T]) {
while self.runs.len() > 1 {
let mut n = self.runs.len()-2;
let chk = do self.runs.borrow |arr| {
if n > 0 && arr[n-1].len <= arr[n].len + arr[n+1].len {
if arr[n-1].len < arr[n+1].len { n -= 1; }
true
} else if arr[n].len <= arr[n+1].len {
true
} else {
false
}
};
if !chk { break; }
self.merge_at(n, array);
}
}
fn merge_force_collapse(&self, array: &[mut T]) {
while self.runs.len() > 1 {
let mut n = self.runs.len()-2;
if n > 0 {
do self.runs.borrow |arr| {
if arr[n-1].len < arr[n+1].len {
n -= 1;
}
}
}
self.merge_at(n, array);
}
}
}
#[inline(always)]
fn copy_vec<T: Copy>(dest: &[mut T], s1: uint,
from: &[const T], s2: uint, len: uint) {
assert s1+len <= dest.len() && s2+len <= from.len();
let slice = vec::slice(from, s2, s2+len);
for slice.eachi |i, v| {
dest[s1+i] = *v;
}
}
#[cfg(test)]
mod test_qsort3 {
#[legacy_exports];
@ -207,8 +745,8 @@ mod test_qsort {
fn check_sort(v1: &[mut int], v2: &[mut int]) {
let len = vec::len::<int>(v1);
pure fn leual(a: &int, b: &int) -> bool { *a <= *b }
quick_sort::<int>(leual, v1);
let mut i = 0;
quick_sort::<int>(v1, leual);
let mut i = 0u;
while i < len {
log(debug, v2[i]);
assert (v2[i] == v1[i]);
@ -248,7 +786,7 @@ mod test_qsort {
let expected = ~[1, 2, 3];
sort::quick_sort(|x, y| { int::le(*x, *y) }, names);
do sort::quick_sort(names) |x, y| { int::le(*x, *y) };
let immut_names = vec::from_mut(move names);
@ -269,8 +807,8 @@ mod tests {
let len = vec::len::<int>(v1);
pub pure fn le(a: &int, b: &int) -> bool { *a <= *b }
let f = le;
let v3 = merge_sort::<int>(f, v1);
let mut i = 0;
let v3 = merge_sort::<int>(v1, f);
let mut i = 0u;
while i < len {
log(debug, v3[i]);
assert (v3[i] == v2[i]);
@ -299,7 +837,7 @@ mod tests {
fn test_merge_sort_mutable() {
pub pure fn le(a: &int, b: &int) -> bool { *a <= *b }
let v1 = ~[mut 3, 2, 1];
let v2 = merge_sort(le, v1);
let v2 = merge_sort(v1, le);
assert v2 == ~[1, 2, 3];
}
@ -309,7 +847,7 @@ mod tests {
// tjc: funny that we have to use parens
pure fn ile(x: &(&static/str), y: &(&static/str)) -> bool
{
unsafe // to_lower is not pure...
unsafe // to_lower is not pure...
{
let x = x.to_lower();
let y = y.to_lower();
@ -321,11 +859,300 @@ mod tests {
"Sally Mae", "JOE BOB", "Alex Andy"];
let names2 = ~["Alex Andy", "Jack Brown", "joe bob", "Joe Bob",
"JOE Bob", "JOE BOB", "Sally Mae"];
let names3 = merge_sort(ile, names1);
let names3 = merge_sort(names1, ile);
assert names3 == names2;
}
}
#[cfg(test)]
mod test_tim_sort {
struct CVal {
val: ~float,
}
impl CVal: Ord {
pure fn lt(other: &CVal) -> bool {
unsafe {
let rng = rand::Rng();
if rng.gen_float() > 0.995 { fail ~"It's happening!!!"; }
}
self.val < other.val
}
pure fn le(other: &CVal) -> bool { self.val <= other.val }
pure fn gt(other: &CVal) -> bool { self.val > other.val }
pure fn ge(other: &CVal) -> bool { self.val >= other.val }
}
fn check_sort(v1: &[mut int], v2: &[mut int]) {
let len = vec::len::<int>(v1);
tim_sort::<int>(v1);
let mut i = 0u;
while i < len {
log(debug, v2[i]);
assert (v2[i] == v1[i]);
i += 1u;
}
}
#[test]
fn test() {
{
let v1 = ~[mut 3, 7, 4, 5, 2, 9, 5, 8];
let v2 = ~[mut 2, 3, 4, 5, 5, 7, 8, 9];
check_sort(v1, v2);
}
{
let v1 = ~[mut 1, 1, 1];
let v2 = ~[mut 1, 1, 1];
check_sort(v1, v2);
}
{
let v1: ~[mut int] = ~[mut];
let v2: ~[mut int] = ~[mut];
check_sort(v1, v2);
}
{ let v1 = ~[mut 9]; let v2 = ~[mut 9]; check_sort(v1, v2); }
{
let v1 = ~[mut 9, 3, 3, 3, 9];
let v2 = ~[mut 3, 3, 3, 9, 9];
check_sort(v1, v2);
}
}
#[test]
#[should_fail]
fn crash_test() {
let rng = rand::Rng();
let mut arr = do vec::from_fn(1000) |_i| {
let randVal = rng.gen_float();
CVal { val: ~randVal }
};
tim_sort(arr);
fail ~"Guarantee the fail";
}
struct DVal { val: ~uint }
impl DVal: Ord {
pure fn lt(_x: &DVal) -> bool { true }
pure fn le(_x: &DVal) -> bool { true }
pure fn gt(_x: &DVal) -> bool { true }
pure fn ge(_x: &DVal) -> bool { true }
}
#[test]
fn test_bad_Ord_impl() {
let rng = rand::Rng();
let mut arr = do vec::from_fn(500) |_i| {
let randVal = rng.gen_uint();
DVal { val: ~randVal }
};
tim_sort(arr);
}
}
#[cfg(test)]
mod big_tests {
#[test]
fn test_unique() {
let low = 5;
let high = 10;
tabulate_unique(low, high);
}
#[test]
fn test_managed() {
let low = 5;
let high = 10;
tabulate_managed(low, high);
}
fn multiplyVec<T: Copy>(arr: &[const T], num: uint) -> ~[mut T] {
let size = arr.len();
let res = do vec::from_fn(num) |i| {
arr[i % size]
};
vec::to_mut(move res)
}
fn makeRange(n: uint) -> ~[uint] {
let one = do vec::from_fn(n) |i| { i };
let mut two = copy one;
vec::reverse(two);
vec::append(move two, one)
}
fn tabulate_unique(lo: uint, hi: uint) {
fn isSorted<T: Ord>(arr: &[const T]) {
for uint::range(0, arr.len()-1) |i| {
if arr[i] > arr[i+1] {
fail ~"Array not sorted";
}
}
}
let rng = rand::Rng();
for uint::range(lo, hi) |i| {
let n = 1 << i;
let arr = do vec::from_fn(n) |_i| {
~rng.gen_float()
};
let arr = vec::to_mut(move arr);
tim_sort(arr); // *sort
isSorted(arr);
vec::reverse(arr);
tim_sort(arr); // \sort
isSorted(arr);
tim_sort(arr); // /sort
isSorted(arr);
for 3.times {
let i1 = rng.gen_uint_range(0, n);
let i2 = rng.gen_uint_range(0, n);
arr[i1] <-> arr[i2];
}
tim_sort(arr); // 3sort
isSorted(arr);
if n >= 10 {
let size = arr.len();
let mut idx = 1;
while idx <= 10 {
arr[size-idx] = ~rng.gen_float();
idx += 1;
}
}
tim_sort(arr); // +sort
isSorted(arr);
for (n/100).times {
let idx = rng.gen_uint_range(0, n);
arr[idx] = ~rng.gen_float();
}
tim_sort(arr);
isSorted(arr);
let arr = if n > 4 {
let part = vec::view(arr, 0, 4);
multiplyVec(part, n)
} else { move arr };
tim_sort(arr); // ~sort
isSorted(arr);
let mut arr = vec::from_elem(n, ~(-0.5));
tim_sort(arr); // =sort
isSorted(arr);
let half = n / 2;
let mut arr = makeRange(half).map(|i| ~(*i as float));
tim_sort(arr); // !sort
isSorted(arr);
}
}
fn tabulate_managed(lo: uint, hi: uint) {
fn isSorted<T: Ord>(arr: &[const @T]) {
for uint::range(0, arr.len()-1) |i| {
if arr[i] > arr[i+1] {
fail ~"Array not sorted";
}
}
}
let rng = rand::Rng();
for uint::range(lo, hi) |i| {
let n = 1 << i;
let arr = do vec::from_fn(n) |_i| {
@rng.gen_float()
};
let arr = vec::to_mut(move arr);
tim_sort(arr); // *sort
isSorted(arr);
vec::reverse(arr);
tim_sort(arr); // \sort
isSorted(arr);
tim_sort(arr); // /sort
isSorted(arr);
for 3.times {
let i1 = rng.gen_uint_range(0, n);
let i2 = rng.gen_uint_range(0, n);
arr[i1] <-> arr[i2];
}
tim_sort(arr); // 3sort
isSorted(arr);
if n >= 10 {
let size = arr.len();
let mut idx = 1;
while idx <= 10 {
arr[size-idx] = @rng.gen_float();
idx += 1;
}
}
tim_sort(arr); // +sort
isSorted(arr);
for (n/100).times {
let idx = rng.gen_uint_range(0, n);
arr[idx] = @rng.gen_float();
}
tim_sort(arr);
isSorted(arr);
let arr = if n > 4 {
let part = vec::view(arr, 0, 4);
multiplyVec(part, n)
} else { move arr };
tim_sort(arr); // ~sort
isSorted(arr);
let mut arr = vec::from_elem(n, @(-0.5));
tim_sort(arr); // =sort
isSorted(arr);
let half = n / 2;
let mut arr = makeRange(half).map(|i| @(*i as float));
tim_sort(arr); // !sort
isSorted(arr);
}
}
struct LVal {
val: uint,
key: fn(@uint),
drop {
let x = unsafe { task::local_data::local_data_get(self.key) };
match x {
Some(@y) => {
unsafe {
task::local_data::local_data_set(self.key, @(y+1));
}
}
_ => fail ~"Expected key to work",
}
}
}
impl LVal: Ord {
pure fn lt(other: &LVal) -> bool { self.val < other.val }
pure fn le(other: &LVal) -> bool { self.val <= other.val }
pure fn gt(other: &LVal) -> bool { self.val > other.val }
pure fn ge(other: &LVal) -> bool { self.val >= other.val }
}
}
// Local Variables:
// mode: rust;
// fill-column: 78;

4
src/libstd/test.rs
View File

@ -218,7 +218,7 @@ fn print_failures(st: ConsoleTestState) {
st.out.write_line(~"\nfailures:");
let failures = copy st.failures;
let failures = vec::map(failures, |test| test.name);
let failures = sort::merge_sort(|x, y| str::le(*x, *y), failures);
let failures = do sort::merge_sort(failures) |x, y| { str::le(*x, *y) };
for vec::each(failures) |name| {
st.out.write_line(fmt!(" %s", *name));
}
@ -371,7 +371,7 @@ fn filter_tests(opts: &TestOpts,
pure fn lteq(t1: &TestDesc, t2: &TestDesc) -> bool {
str::le(t1.name, t2.name)
}
sort::merge_sort(lteq, filtered)
sort::merge_sort(filtered, lteq)
};
move filtered

2
src/libsyntax/attr.rs
View File

@ -279,7 +279,7 @@ fn sort_meta_items(+items: ~[@ast::meta_item]) -> ~[@ast::meta_item] {
// This is sort of stupid here, converting to a vec of mutables and back
let v: ~[mut @ast::meta_item] = vec::to_mut(items);
std::sort::quick_sort(lteq, v);
std::sort::quick_sort(v, lteq);
vec::from_mut(move v)
}

2
src/libsyntax/ext/qquote.rs
View File

@ -127,7 +127,7 @@ fn gather_anti_quotes<N: qq_helper>(lo: uint, node: N) -> aq_ctxt
pure fn by_lo(a: &gather_item, b: &gather_item) -> bool {
a.lo < b.lo
}
std::sort::merge_sort(by_lo, v)
std::sort::merge_sort(v, by_lo)
};
return cx;
}

2
src/rustc/metadata/cstore.rs
View File

@ -166,7 +166,7 @@ fn get_dep_hashes(cstore: CStore) -> ~[~str] {
result.push({name: cdata.name, hash: hash});
};
pure fn lteq(a: &crate_hash, b: &crate_hash) -> bool {a.name <= b.name}
let sorted = std::sort::merge_sort(lteq, result);
let sorted = std::sort::merge_sort(result, lteq);
debug!("sorted:");
for sorted.each |x| {
debug!(" hash[%s]: %s", x.name, x.hash);

2
src/rustc/metadata/encoder.rs
View File

@ -1079,7 +1079,7 @@ fn encode_crate_deps(ecx: @encode_ctxt, ebml_w: ebml::Serializer,
pure fn lteq(kv1: &numdep, kv2: &numdep) -> bool {
kv1.cnum <= kv2.cnum
}
std::sort::quick_sort(lteq, deps);
std::sort::quick_sort(deps, lteq);
// Sanity-check the crate numbers
let mut expected_cnum = 1;

2
src/rustdoc/sort_pass.rs
View File

@ -36,7 +36,7 @@ fn fold_mod(
) -> doc::ModDoc {
let doc = fold::default_any_fold_mod(fold, doc);
doc::ModDoc_({
items: sort::merge_sort(fold.ctxt, doc.items),
items: sort::merge_sort(doc.items, fold.ctxt),
.. *doc
})
}

2
src/test/bench/shootout-k-nucleotide-pipes.rs
View File

@ -34,7 +34,7 @@ fn sort_and_fmt(mm: HashMap<~[u8], uint>, total: uint) -> ~str {
// sort by key, then by value
fn sortKV<TT: Copy Ord, UU: Copy Ord>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] {
return sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig));
return sort::merge_sort(sort::merge_sort(orig, le_by_key), le_by_val);
}
let mut pairs = ~[];

2
src/test/bench/shootout-k-nucleotide.rs
View File

@ -31,7 +31,7 @@ fn sort_and_fmt(mm: HashMap<~[u8], uint>, total: uint) -> ~str {
// sort by key, then by value
fn sortKV<TT: Copy Ord, UU: Copy Ord>(orig: ~[(TT,UU)]) -> ~[(TT,UU)] {
return sort::merge_sort(le_by_val, sort::merge_sort(le_by_key, orig));
return sort::merge_sort(sort::merge_sort(orig, le_by_key), le_by_val);
}
let mut pairs = ~[];