From 6d9bdf975aba3cd2f571f4e3695136f2ee85f37f Mon Sep 17 00:00:00 2001
From: Palmer Cox
Date: Sat, 15 Feb 2014 16:15:03 -0500
Subject: Rename all variables that have uppercase characters in their names to
use only lowercase characters
---
src/libstd/rand/distributions/mod.rs | 12 ++++++------
src/libstd/rand/mod.rs | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
(limited to 'src/libstd/rand')
diff --git a/src/libstd/rand/distributions/mod.rs b/src/libstd/rand/distributions/mod.rs
index 7372d171de7..41a106ec887 100644
--- a/src/libstd/rand/distributions/mod.rs
+++ b/src/libstd/rand/distributions/mod.rs
@@ -213,8 +213,8 @@ mod ziggurat_tables;
fn ziggurat(
rng: &mut R,
symmetric: bool,
- X: ziggurat_tables::ZigTable,
- F: ziggurat_tables::ZigTable,
+ x_tab: ziggurat_tables::ZigTable,
+ f_tab: ziggurat_tables::ZigTable,
pdf: 'static |f64| -> f64,
zero_case: 'static |&mut R, f64| -> f64)
-> f64 {
@@ -233,19 +233,19 @@ fn ziggurat(
// u is either U(-1, 1) or U(0, 1) depending on if this is a
// symmetric distribution or not.
let u = if symmetric {2.0 * f - 1.0} else {f};
- let x = u * X[i];
+ let x = u * x_tab[i];
let test_x = if symmetric {num::abs(x)} else {x};
- // algebraically equivalent to |u| < X[i+1]/X[i] (or u < X[i+1]/X[i])
- if test_x < X[i + 1] {
+ // algebraically equivalent to |u| < x_tab[i+1]/x_tab[i] (or u < x_tab[i+1]/x_tab[i])
+ if test_x < x_tab[i + 1] {
return x;
}
if i == 0 {
return zero_case(rng, u);
}
// algebraically equivalent to f1 + DRanU()*(f0 - f1) < 1
- if F[i + 1] + (F[i] - F[i + 1]) * rng.gen() < pdf(x) {
+ if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.gen() < pdf(x) {
return x;
}
}
diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs
index 7218f83d662..20bce8d2058 100644
--- a/src/libstd/rand/mod.rs
+++ b/src/libstd/rand/mod.rs
@@ -803,11 +803,11 @@ mod test {
#[test]
fn test_sample() {
- let MIN_VAL = 1;
- let MAX_VAL = 100;
+ let min_val = 1;
+ let max_val = 100;
let mut r = rng();
- let vals = range(MIN_VAL, MAX_VAL).to_owned_vec();
+ let vals = range(min_val, max_val).to_owned_vec();
let small_sample = r.sample(vals.iter(), 5);
let large_sample = r.sample(vals.iter(), vals.len() + 5);
@@ -815,7 +815,7 @@ mod test {
assert_eq!(large_sample.len(), vals.len());
assert!(small_sample.iter().all(|e| {
- **e >= MIN_VAL && **e <= MAX_VAL
+ **e >= min_val && **e <= max_val
}));
}
--
cgit 1.4.1-3-g733a5