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

Repair RIMOV damage to benchmarks

Browse Source
This commit is contained in:
Ben Striegel 2013-01-30 23:06:32 -05:00
parent df04bd6c6c
commit b5f61fddde
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/bench/graph500-bfs.rs
View File

@ -121,7 +121,7 @@ fn gen_search_keys(graph: graph, n: uint) -> ~[node_id] {
*/ */
fn bfs(graph: graph, key: node_id) -> bfs_result { fn bfs(graph: graph, key: node_id) -> bfs_result {
let mut marks : ~[node_id] let mut marks : ~[node_id]
= vec::cast_to_mut(vec::from_elem(vec::len(graph), -1i64)); = vec::from_elem(vec::len(graph), -1i64);
let Q = deque::create(); let Q = deque::create();
@ -140,7 +140,7 @@ fn bfs(graph: graph, key: node_id) -> bfs_result {
}; };
} }
vec::cast_from_mut(move marks) move marks
} }
/** /**

10
src/test/bench/sudoku.rs
View File

@ -41,8 +41,8 @@ enum grid_t { grid_ctor(grid), }
fn read_grid(f: io::Reader) -> grid_t { fn read_grid(f: io::Reader) -> grid_t {
assert f.read_line() == ~"9,9"; /* assert first line is exactly "9,9" */ assert f.read_line() == ~"9,9"; /* assert first line is exactly "9,9" */
let g = vec::from_fn(10u, {|_i| let mut g = vec::from_fn(10u, {|_i|
vec::cast_to_mut(vec::from_elem(10u, 0 as u8)) vec::from_elem(10u, 0 as u8)
}); });
while !f.eof() { while !f.eof() {
let comps = str::split_char(str::trim(f.read_line()), ','); let comps = str::split_char(str::trim(f.read_line()), ',');
@ -57,7 +57,7 @@ fn read_grid(f: io::Reader) -> grid_t {
// solve sudoku grid // solve sudoku grid
fn solve_grid(g: grid_t) { fn solve_grid(g: grid_t) {
fn next_color(g: grid, row: u8, col: u8, start_color: u8) -> bool { fn next_color(mut g: grid, row: u8, col: u8, start_color: u8) -> bool {
if start_color < 10u8 { if start_color < 10u8 {
// colors not yet used // colors not yet used
let avail = bitv::Bitv(10u, false); let avail = bitv::Bitv(10u, false);
@ -141,8 +141,8 @@ fn main() {
let grid = if vec::len(args) == 1u { let grid = if vec::len(args) == 1u {
// FIXME create sudoku inline since nested vec consts dont work yet // FIXME create sudoku inline since nested vec consts dont work yet
// (#3733) // (#3733)
let g = vec::from_fn(10u, |_i| { let mut g = vec::from_fn(10u, |_i| {
vec::cast_to_mut(vec::from_elem(10u, 0 as u8)) vec::from_elem(10u, 0 as u8)
}); });
g[0][1] = 4u8; g[0][1] = 4u8;
g[0][3] = 6u8; g[0][3] = 6u8;