---

yaml
---
r: 94138
b: refs/heads/try
c: 1d986de
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 9d5639d11ba5d3ef4ca6be323d6604a5b9e0caaa
+refs/heads/try: 1d986de2488249763f730ba83fd3d8235391e74d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/rand/distributions/mod.rs

@@ -28,7 +28,7 @@ use clone::Clone;
 
 pub use self::range::Range;
 pub use self::gamma::Gamma;
-pub use self::normal::Normal;
+pub use self::normal::{Normal, LogNormal};
 pub use self::exponential::Exp;
 
 pub mod range;

branches/try/src/libstd/rand/distributions/normal.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! The normal distribution.
+//! The normal and derived distributions.
 
 use rand::{Rng, Rand, Open01};
 use rand::distributions::{ziggurat, ziggurat_tables, Sample, IndependentSample};
@@ -108,6 +108,46 @@ impl IndependentSample<f64> for Normal {
     }
 }
 
+
+/// The log-normal distribution `ln N(mean, std_dev**2)`.
+///
+/// If `X` is log-normal distributed, then `ln(X)` is `N(mean,
+/// std_dev**2)` distributed.
+///
+/// # Example
+///
+/// ```rust
+/// use std::rand;
+/// use std::rand::distributions::{LogNormal, IndependentSample};
+///
+/// fn main() {
+///     // mean 2, standard deviation 3
+///     let log_normal = LogNormal::new(2.0, 3.0);
+///     let v = normal.ind_sample(&mut rand::task_rng());
+///     println!("{} is from an ln N(2, 9) distribution", v)
+/// }
+/// ```
+pub struct LogNormal {
+    priv norm: Normal
+}
+
+impl LogNormal {
+    /// Construct a new `LogNormal` distribution with the given mean
+    /// and standard deviation. Fails if `std_dev < 0`.
+    pub fn new(mean: f64, std_dev: f64) -> LogNormal {
+        assert!(std_dev >= 0.0, "LogNormal::new called with `std_dev` < 0");
+        LogNormal { norm: Normal::new(mean, std_dev) }
+    }
+}
+impl Sample<f64> for LogNormal {
+    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 {
+        self.norm.ind_sample(rng).exp()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use rand::*;
@@ -129,6 +169,22 @@ mod tests {
     fn test_normal_invalid_sd() {
         Normal::new(10.0, -1.0);
     }
+
+
+    #[test]
+    fn test_log_normal() {
+        let mut lnorm = LogNormal::new(10.0, 10.0);
+        let mut rng = task_rng();
+        for _ in range(0, 1000) {
+            lnorm.sample(&mut rng);
+            lnorm.ind_sample(&mut rng);
+        }
+    }
+    #[test]
+    #[should_fail]
+    fn test_log_normal_invalid_sd() {
+        LogNormal::new(10.0, -1.0);
+    }
 }
 
 #[cfg(test)]