From 44bea036147debabe22d148a55cb2ca6280e350e Mon Sep 17 00:00:00 2001 From: Eric Holk Date: Tue, 22 May 2012 11:06:59 -0700 Subject: [PATCH] Updating bfs to work with the new random methods. --- src/test/bench/graph500-bfs.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs index f1e150d1a99..97ecff1a516 100644 --- a/src/test/bench/graph500-bfs.rs +++ b/src/test/bench/graph500-bfs.rs @@ -10,7 +10,6 @@ import std::map; import std::map::hashmap; import std::deque; import std::deque::t; -//import std::par; import io::writer_util; import comm::*; import int::abs; @@ -76,7 +75,7 @@ fn make_edges(scale: uint, edgefactor: uint) -> [(node_id, node_id)] { let j = j * 2; let scale = scale - 1u; - let x = r.next_float(); + let x = r.gen_float(); if x < A { choose_edge(i, j, scale, r) @@ -123,14 +122,8 @@ fn gen_search_keys(graph: graph, n: uint) -> [node_id] { let keys = map::int_hash(); let r = rand::rng(); - impl methods for rand::rng { - fn r64() -> u64 { - self.next() as u64 << 32u + self.next() as u64 - } - } - while keys.size() < n { - let k = r.r64() % graph.len() as node_id; + let k = r.gen_u64() % graph.len() as node_id; if graph[k].len() > 0u && vec::any(graph[k]) {|i| i != k