Skip to content

Commit 2ed1cfc

Browse files
committed
And I forgot to run the benchmarks after rebasing
1 parent 59e6a4d commit 2ed1cfc

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

src/test/bench/noise.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Perlin noise benchmark from https://gist.github.com/1170424
22

3-
use std::f32;
43
use std::float;
54
use std::int;
65
use std::rand::{Rng, RngUtil};
@@ -20,8 +19,8 @@ fn smooth(v: f32) -> f32 { v * v * (3.0 - 2.0 * v) }
2019
fn random_gradient<R:Rng>(r: &mut R) -> Vec2 {
2120
let v = 2.0 * float::consts::pi * r.gen();
2221
Vec2 {
23-
x: float::cos(v) as f32,
24-
y: float::sin(v) as f32,
22+
x: v.cos() as f32,
23+
y: v.sin() as f32,
2524
}
2625
}
2726

@@ -66,8 +65,8 @@ impl Noise2DContext {
6665
origins: &mut [Vec2, ..4],
6766
x: f32,
6867
y: f32) {
69-
let x0f = f32::floor(x);
70-
let y0f = f32::floor(y);
68+
let x0f = x.floor();
69+
let y0f = y.floor();
7170
let x0 = x0f as int;
7271
let y0 = y0f as int;
7372
let x1 = x0 + 1;

src/test/bench/shootout-nbody.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use std::f64;
21
use std::from_str::FromStr;
32
use std::os;
43
use std::uint::range;
@@ -90,7 +89,7 @@ fn advance(bodies: &mut [Planet, ..N_BODIES], dt: f64, steps: i32) {
9089
d[2] = bodies[i].x[2] - bodies[j].x[2];
9190

9291
let d2 = d[0]*d[0] + d[1]*d[1] + d[2]*d[2];
93-
let mag = dt / (d2 * f64::sqrt(d2));
92+
let mag = dt / (d2 * d2.sqrt());
9493

9594
let a_mass = bodies[i].mass;
9695
let b_mass = bodies[j].mass;
@@ -124,7 +123,7 @@ fn energy(bodies: &[Planet, ..N_BODIES]) -> f64 {
124123
for range(0, 3) |k| {
125124
d[k] = bodies[i].x[k] - bodies[j].x[k];
126125
}
127-
let dist = f64::sqrt(d[0]*d[0] + d[1]*d[1] + d[2]*d[2]);
126+
let dist = (d[0]*d[0] + d[1]*d[1] + d[2]*d[2]).sqrt();
128127
e -= bodies[i].mass * bodies[j].mass / dist;
129128
}
130129
}

src/test/bench/shootout-spectralnorm.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::f64;
1211
use std::from_str::FromStr;
1312
use std::os;
1413
use std::vec;
@@ -62,5 +61,5 @@ fn main() {
6261
mult_AtAv(v, u, tmp);
6362
}
6463

65-
println(fmt!("%.9f", f64::sqrt(dot(u,v) / dot(v,v)) as float));
64+
println(fmt!("%.9f", (dot(u,v) / dot(v,v)).sqrt() as float));
6665
}

0 commit comments

Comments
 (0)