Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Pareto distribution #495

Merged
merged 5 commits into from
Jun 7, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/distributions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
//! [`Normal`]: struct.Normal.html
//! [`Open01`]: struct.Open01.html
//! [`OpenClosed01`]: struct.OpenClosed01.html
//! [`Pareto`]: struct.Pareto.html
//! [`Poisson`]: struct.Poisson.html
//! [`Standard`]: struct.Standard.html
//! [`StandardNormal`]: struct.StandardNormal.html
Expand All @@ -177,6 +178,8 @@ pub use self::uniform::Uniform as Range;
#[doc(inline)] pub use self::normal::{Normal, LogNormal, StandardNormal};
#[cfg(feature="std")]
#[doc(inline)] pub use self::exponential::{Exp, Exp1};
#[cfg(feature="std")]
#[doc(inline)] pub use self::pareto::Pareto;
#[cfg(feature = "std")]
#[doc(inline)] pub use self::poisson::Poisson;
#[cfg(feature = "std")]
Expand All @@ -192,6 +195,8 @@ pub mod uniform;
#[doc(hidden)] pub mod normal;
#[cfg(feature="std")]
#[doc(hidden)] pub mod exponential;
#[cfg(feature="std")]
#[doc(hidden)] pub mod pareto;
#[cfg(feature = "std")]
#[doc(hidden)] pub mod poisson;
#[cfg(feature = "std")]
Expand Down
73 changes: 73 additions & 0 deletions src/distributions/pareto.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// https://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

//! The Pareto distribution.

use Rng;
use distributions::{Distribution, OpenClosed01};

/// Samples floating-point numbers according to the Pareto distribution
///
/// # Example
/// ```
/// use rand::prelude::*;
/// use rand::distributions::Pareto;
///
/// let val: f64 = SmallRng::from_entropy().sample(Pareto::new(1., 2.));
/// println!("{}", val);
/// ```
#[derive(Clone, Copy, Debug)]
pub struct Pareto {
scale: f64,
shape: f64,
}

impl Pareto {
/// Construct a new Pareto distribution with given `scale` and `shape`.
///
/// In the literature, `scale` is commonly written as x<sub>m</sub> or k and
/// `shape` is often written as α.
///
/// # Panics
///
/// `scale` and `shape` have to be non-zero and positive.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be worth mentioning common variable names such as k, x_m and α.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree and added those to the docs.

pub fn new(scale: f64, shape: f64) -> Pareto {
assert!((scale > 0.) & (shape > 0.));
Pareto { scale, shape }
}
}

impl Distribution<f64> for Pareto {
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> f64 {
let u: f64 = rng.sample(OpenClosed01);
self.scale * u.powf(-1.0 / self.shape)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be equivalent to store -1 / shape as a field which should speed up sampling.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point! Done.

}
}

#[cfg(test)]
mod tests {
use distributions::Distribution;
use super::Pareto;

#[test]
#[should_panic]
fn invalid() {
Pareto::new(0., 0.);
}

#[test]
fn sample() {
let d = Pareto::new(1.0, 2.0);
let mut rng = ::test::rng(1);
for _ in 0..1000 {
d.sample(&mut rng);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory the sample must never be less than the shape parameter, so you should either test this or give some small allowance for rounding (but hopefully this isn't necessary).

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume you meant the scale parameter? Done.

}
}
}