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

priority_queue: make from_vec a static method

Browse Source
This commit is contained in:
Daniel Micay 2012-12-10 15:46:41 -05:00 committed by Brian Anderson
parent 757a2afb6b
commit 285496bd55
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/libstd/priority_queue.rs
View File

@ -91,6 +91,16 @@ impl <T: Copy Ord> PriorityQueue<T> {
q.to_vec()
}
static pub pure fn from_vec(xs: ~[T]) -> PriorityQueue<T> {
let mut q = PriorityQueue{data: xs,};
let mut n = q.len() / 2;
while n > 0 {
n -= 1;
unsafe { q.siftup(n) }; // purity-checking workaround
}
q
}
priv fn siftdown(&mut self, startpos: uint, pos: uint) {
let mut pos = pos;
let newitem = self.data[pos];
@ -133,20 +143,11 @@ impl <T: Copy Ord> PriorityQueue<T> {
}
}
pub pure fn from_vec<T: Copy Ord>(xs: ~[T]) -> PriorityQueue<T> {
let mut q = PriorityQueue{data: xs,};
let mut n = q.len() / 2;
while n > 0 {
n -= 1;
unsafe { q.siftup(n) }; // purity-checking workaround
}
q
}
#[cfg(test)]
mod tests {
use sort::merge_sort;
use core::cmp::le;
use PriorityQueue::from_vec;
#[test]
fn test_top_and_pop() {