user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated copyright year on shootout-binarytrees.rs

Browse source
This commit is contained in:
Matthijs Hofstra 2013-06-16 22:22:53 +02:00
parent a4a8a4ac27
commit 3b1ace9f9b
1 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/test/bench/shootout-binarytrees.rs
View file

@ -1,8 +1,4 @@
// xfail-test
// Broken due to arena API problems.
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -15,29 +11,29 @@
extern mod extra;
use extra::arena;
enum tree<'self> {
nil,
node(&'self tree<'self>, &'self tree<'self>, int),
enum Tree<'self> {
Nil,
Node(&'self Tree<'self>, &'self Tree<'self>, int),
}
fn item_check(t: &tree) -> int {
fn item_check(t: &Tree) -> int {
match *t {
nil => { return 0; }
node(left, right, item) => {
Nil => { return 0; }
Node(left, right, item) => {
return item + item_check(left) - item_check(right);
}
}
}
fn bottom_up_tree<'r>(arena: &'r mut arena::Arena, item: int, depth: int)
-> &'r tree<'r> {
fn bottom_up_tree<'r>(arena: &'r arena::Arena, item: int, depth: int)
-> &'r Tree<'r> {
if depth > 0 {
return arena.alloc(
|| node(bottom_up_tree(arena, 2 * item - 1, depth - 1),
|| Node(bottom_up_tree(arena, 2 * item - 1, depth - 1),
bottom_up_tree(arena, 2 * item, depth - 1),
item));
}
return arena.alloc(|| nil);
return arena.alloc(|| Nil);
}
fn main() {
@ -61,25 +57,25 @@ fn main() {
max_depth = n;
}
let mut stretch_arena = arena::Arena();
let stretch_arena = arena::Arena();
let stretch_depth = max_depth + 1;
let stretch_tree = bottom_up_tree(&mut stretch_arena, 0, stretch_depth);
let stretch_tree = bottom_up_tree(&stretch_arena, 0, stretch_depth);
println(fmt!("stretch tree of depth %d\t check: %d",
stretch_depth,
item_check(stretch_tree)));
let mut long_lived_arena = arena::Arena();
let long_lived_tree = bottom_up_tree(&mut long_lived_arena, 0, max_depth);
let long_lived_arena = arena::Arena();
let long_lived_tree = bottom_up_tree(&long_lived_arena, 0, max_depth);
let mut depth = min_depth;
while depth <= max_depth {
let iterations = int::pow(2, (max_depth - depth + min_depth) as uint);
let mut chk = 0;
let mut i = 1;
while i <= iterations {
let mut temp_tree = bottom_up_tree(&mut long_lived_arena, i, depth);
let mut temp_tree = bottom_up_tree(&long_lived_arena, i, depth);
chk += item_check(temp_tree);
temp_tree = bottom_up_tree(&mut long_lived_arena, -i, depth);
temp_tree = bottom_up_tree(&long_lived_arena, -i, depth);
chk += item_check(temp_tree);
i += 1;
}