---

yaml
---
r: 94140
b: refs/heads/try
c: 6155a1c
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: 1ee42912e1c83106082012e9c23090934be4ae69
+refs/heads/try: 6155a1c98012f9565744dad3832660accd135b83
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -225,6 +225,55 @@ impl IndependentSample<f64> for ChiSquared {
     }
 }
 
+/// The Fisher F distribution `F(m, n)`.
+///
+/// This distribution is equivalent to the ratio of two normalised
+/// chi-squared distributions, that is, `F(m,n) = (χ²(m)/m) /
+/// (χ²(n)/n)`.
+///
+/// # Example
+///
+/// ```rust
+/// use std::rand;
+/// use std::rand::distributions::{FisherF, IndependentSample};
+///
+/// fn main() {
+///     let f = FisherF::new(2.0, 32.0);
+///     let v = f.ind_sample(&mut rand::task_rng());
+///     println!("{} is from an F(2, 32) distribution", v)
+/// }
+/// ```
+pub struct FisherF {
+    priv numer: ChiSquared,
+    priv denom: ChiSquared,
+    // denom_dof / numer_dof so that this can just be a straight
+    // multiplication, rather than a division.
+    priv dof_ratio: f64,
+}
+
+impl FisherF {
+    /// Create a new `FisherF` distribution, with the given
+    /// parameter. Fails if either `m` or `n` are not positive.
+    pub fn new(m: f64, n: f64) -> FisherF {
+        assert!(m > 0.0, "FisherF::new called with `m < 0`");
+        assert!(n > 0.0, "FisherF::new called with `n < 0`");
+
+        FisherF {
+            numer: ChiSquared::new(m),
+            denom: ChiSquared::new(n),
+            dof_ratio: n / m
+        }
+    }
+}
+impl Sample<f64> for FisherF {
+    fn sample<R: Rng>(&mut self, rng: &mut R) -> f64 { self.ind_sample(rng) }
+}
+impl IndependentSample<f64> for FisherF {
+    fn ind_sample<R: Rng>(&self, rng: &mut R) -> f64 {
+        self.numer.ind_sample(rng) / self.denom.ind_sample(rng) * self.dof_ratio
+    }
+}
+
 #[cfg(test)]
 mod test {
     use rand::*;
@@ -264,6 +313,16 @@ mod test {
     fn test_log_normal_invalid_dof() {
         ChiSquared::new(-1.0);
     }
+
+    #[test]
+    fn test_f() {
+        let mut f = FisherF::new(2.0, 32.0);
+        let mut rng = task_rng();
+        for _ in range(0, 1000) {
+            f.sample(&mut rng);
+            f.ind_sample(&mut rng);
+        }
+    }
 }
 
 #[cfg(test)]

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

@@ -27,7 +27,7 @@ use rand::{Rng, Rand};
 use clone::Clone;
 
 pub use self::range::Range;
-pub use self::gamma::{Gamma, ChiSquared};
+pub use self::gamma::{Gamma, ChiSquared, FisherF};
 pub use self::normal::{Normal, LogNormal};
 pub use self::exponential::Exp;