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

std: Camel case sort

Browse Source
This commit is contained in:
Brian Anderson 2012-09-04 14:37:47 -07:00
parent a04cb8ebb7
commit 8182497359
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/sort.rs
View File

@ -11,7 +11,7 @@ export quick_sort;
export quick_sort3; export quick_sort3;
export Sort; export Sort;
type le<T> = pure fn(v1: &T, v2: &T) -> bool; type Le<T> = pure fn(v1: &T, v2: &T) -> bool;
/** /**
* Merge sort. Returns a new vector containing the sorted list. * Merge sort. Returns a new vector containing the sorted list.
@ -19,12 +19,12 @@ type le<T> = pure fn(v1: &T, v2: &T) -> bool;
* Has worst case O(n log n) performance, best case O(n), but * Has worst case O(n log n) performance, best case O(n), but
* is not space efficient. This is a stable sort. * is not space efficient. This is a stable sort.
*/ */
fn merge_sort<T: copy>(le: le<T>, v: &[const T]) -> ~[T] { fn merge_sort<T: copy>(le: Le<T>, v: &[const T]) -> ~[T] {
type slice = (uint, uint); type Slice = (uint, uint);
return merge_sort_(le, v, (0u, len(v))); return merge_sort_(le, v, (0u, len(v)));
fn merge_sort_<T: copy>(le: le<T>, v: &[const T], slice: slice) fn merge_sort_<T: copy>(le: Le<T>, v: &[const T], slice: Slice)
-> ~[T] { -> ~[T] {
let begin = slice.first(); let begin = slice.first();
let end = slice.second(); let end = slice.second();
@ -39,7 +39,7 @@ fn merge_sort<T: copy>(le: le<T>, v: &[const T]) -> ~[T] {
return merge(le, merge_sort_(le, v, a), merge_sort_(le, v, b)); return merge(le, merge_sort_(le, v, a), merge_sort_(le, v, b));
} }
fn merge<T: copy>(le: le<T>, a: &[T], b: &[T]) -> ~[T] { fn merge<T: copy>(le: Le<T>, a: &[T], b: &[T]) -> ~[T] {
let mut rs = ~[]; let mut rs = ~[];
vec::reserve(rs, len(a) + len(b)); vec::reserve(rs, len(a) + len(b));
let a_len = len(a); let a_len = len(a);
@ -58,7 +58,7 @@ 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, fn part<T: copy>(compare_func: Le<T>, arr: &[mut T], left: uint,
right: uint, pivot: uint) -> uint { right: uint, pivot: uint) -> uint {
let pivot_value = arr[pivot]; let pivot_value = arr[pivot];
arr[pivot] <-> arr[right]; arr[pivot] <-> arr[right];
@ -75,7 +75,7 @@ fn part<T: copy>(compare_func: le<T>, arr: &[mut T], left: uint,
return storage_index; return storage_index;
} }
fn qsort<T: copy>(compare_func: le<T>, arr: &[mut T], left: uint, fn qsort<T: copy>(compare_func: Le<T>, arr: &[mut T], left: uint,
right: uint) { right: uint) {
if right > left { if right > left {
let pivot = (left + right) / 2u; let pivot = (left + right) / 2u;
@ -94,7 +94,7 @@ 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). * Has worst case O(n^2) performance, average case O(n log n).
* This is an unstable sort. * This is an unstable sort.
*/ */
fn quick_sort<T: copy>(compare_func: le<T>, arr: &[mut T]) { fn quick_sort<T: copy>(compare_func: Le<T>, arr: &[mut T]) {
if len::<T>(arr) == 0u { return; } if len::<T>(arr) == 0u { return; }
qsort::<T>(compare_func, arr, 0u, len::<T>(arr) - 1u); qsort::<T>(compare_func, arr, 0u, len::<T>(arr) - 1u);
} }

1
src/libstd/std.rc
View File

@ -67,7 +67,6 @@ mod map;
mod rope; mod rope;
#[allow(non_camel_case_types)] // XXX #[allow(non_camel_case_types)] // XXX
mod smallintmap; mod smallintmap;
#[allow(non_camel_case_types)] // XXX
mod sort; mod sort;
mod treemap; mod treemap;