about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-10 22:39:35 +0000
committerbors <bors@rust-lang.org>2015-10-10 22:39:35 +0000
commit9d3e79ad3728f6723f8e49908696e66a68d7db95 (patch)
tree2a7ae87ccb9d7cd466f79a9d8b9e4fa4c0b25891
parentf0ae44ab93b1716caa4951b53b0df42722a6ccd7 (diff)
parent928e4b2541ce3dabc9f5e6d799542bb96a02284d (diff)
Auto merge of #28941 - jcaudle:rustfmt/librand-distributions-normal, r=nrc
This is my first PR to rust and first collaboration on a rust project, but I think the formatting looked ok. If this works out, I hope to go through more of librand.
-rw-r--r--src/librand/distributions/normal.rs38
1 files changed, 23 insertions, 15 deletions
diff --git a/src/librand/distributions/normal.rs b/src/librand/distributions/normal.rs
index cc70a695c8d..7fe8b6e8806 100644
--- a/src/librand/distributions/normal.rs
+++ b/src/librand/distributions/normal.rs
@@ -32,13 +32,13 @@ use distributions::{ziggurat, ziggurat_tables, Sample, IndependentSample};
 pub struct StandardNormal(pub f64);
 
 impl Rand for StandardNormal {
-    fn rand<R:Rng>(rng: &mut R) -> StandardNormal {
+    fn rand<R: Rng>(rng: &mut R) -> StandardNormal {
         #[inline]
         fn pdf(x: f64) -> f64 {
-            (-x*x/2.0).exp()
+            (-x * x / 2.0).exp()
         }
         #[inline]
-        fn zero_case<R:Rng>(rng: &mut R, u: f64) -> f64 {
+        fn zero_case<R: Rng>(rng: &mut R, u: f64) -> f64 {
             // compute a random number in the tail by hand
 
             // strange initial conditions, because the loop is not
@@ -56,15 +56,19 @@ impl Rand for StandardNormal {
                 y = y_.ln();
             }
 
-            if u < 0.0 { x - ziggurat_tables::ZIG_NORM_R } else { ziggurat_tables::ZIG_NORM_R - x }
+            if u < 0.0 {
+                x - ziggurat_tables::ZIG_NORM_R
+            } else {
+                ziggurat_tables::ZIG_NORM_R - x
+            }
         }
 
-        StandardNormal(ziggurat(
-            rng,
-            true, // this is symmetric
-            &ziggurat_tables::ZIG_NORM_X,
-            &ziggurat_tables::ZIG_NORM_F,
-            pdf, zero_case))
+        StandardNormal(ziggurat(rng,
+                                true, // this is symmetric
+                                &ziggurat_tables::ZIG_NORM_X,
+                                &ziggurat_tables::ZIG_NORM_F,
+                                pdf,
+                                zero_case))
     }
 }
 
@@ -89,12 +93,14 @@ impl Normal {
         assert!(std_dev >= 0.0, "Normal::new called with `std_dev` < 0");
         Normal {
             mean: mean,
-            std_dev: std_dev
+            std_dev: std_dev,
         }
     }
 }
 impl Sample<f64> for Normal {
-    fn sample<R: Rng>(&mut self, rng: &mut R) -> f64 { self.ind_sample(rng) }
+    fn sample<R: Rng>(&mut self, rng: &mut R) -> f64 {
+        self.ind_sample(rng)
+    }
 }
 impl IndependentSample<f64> for Normal {
     fn ind_sample<R: Rng>(&self, rng: &mut R) -> f64 {
@@ -110,7 +116,7 @@ impl IndependentSample<f64> for Normal {
 /// std_dev**2)` distributed.
 #[derive(Copy, Clone)]
 pub struct LogNormal {
-    norm: Normal
+    norm: Normal,
 }
 
 impl LogNormal {
@@ -126,7 +132,9 @@ impl LogNormal {
     }
 }
 impl Sample<f64> for LogNormal {
-    fn sample<R: Rng>(&mut self, rng: &mut R) -> f64 { self.ind_sample(rng) }
+    fn sample<R: Rng>(&mut self, rng: &mut R) -> f64 {
+        self.ind_sample(rng)
+    }
 }
 impl IndependentSample<f64> for LogNormal {
     fn ind_sample<R: Rng>(&self, rng: &mut R) -> f64 {
@@ -179,7 +187,7 @@ mod bench {
     use std::prelude::v1::*;
     use self::test::Bencher;
     use std::mem::size_of;
-    use distributions::{Sample};
+    use distributions::Sample;
     use super::Normal;
 
     #[bench]