Skip to content

Remove {UnitSphereSurface, UnitCircle}::new #776

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.

Sign up for GitHub

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

Merged
dhardy merged 2 commits into from
Apr 17, 2019
Merged

Remove {UnitSphereSurface, UnitCircle}::new #776

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b04dbd
Remove `{UnitSphereSurface, UnitCircle}::new`
vks Apr 15, 2019
10474c9
Fix benchmarks
vks Apr 15, 2019
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
21 changes: 5 additions & 16 deletions rand_distr/src/unit_circle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ use crate::{Distribution, Uniform};
/// ```
/// use rand_distr::{UnitCircle, Distribution};
///
/// let circle = UnitCircle::new();
/// let v = circle.sample(&mut rand::thread_rng());
/// let v = UnitCircle.sample(&mut rand::thread_rng());
/// println!("{:?} is from the unit circle.", v)
/// ```
///
Expand All @@ -31,14 +30,6 @@ use crate::{Distribution, Uniform};
#[derive(Clone, Copy, Debug)]
pub struct UnitCircle;

impl UnitCircle {
/// Construct a new `UnitCircle` distribution.
#[inline]
pub fn new() -> UnitCircle {
UnitCircle
}
}

impl Distribution<[f64; 2]> for UnitCircle {
#[inline]
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> [f64; 2] {
Expand Down Expand Up @@ -83,19 +74,17 @@ mod tests {
#[test]
fn norm() {
let mut rng = crate::test::rng(1);
let dist = UnitCircle::new();
for _ in 0..1000 {
let x = dist.sample(&mut rng);
let x = UnitCircle.sample(&mut rng);
assert_almost_eq!(x[0]*x[0] + x[1]*x[1], 1., 1e-15);
}
}

#[test]
fn value_stability() {
let mut rng = crate::test::rng(2);
let dist = UnitCircle::new();
assert_eq!(dist.sample(&mut rng), [-0.8032118336637037, 0.5956935036263119]);
assert_eq!(dist.sample(&mut rng), [-0.4742919588505423, -0.880367615130018]);
assert_eq!(dist.sample(&mut rng), [0.9297328981467168, 0.368234623716601]);
assert_eq!(UnitCircle.sample(&mut rng), [-0.8032118336637037, 0.5956935036263119]);
assert_eq!(UnitCircle.sample(&mut rng), [-0.4742919588505423, -0.880367615130018]);
assert_eq!(UnitCircle.sample(&mut rng), [0.9297328981467168, 0.368234623716601]);
}
}
21 changes: 5 additions & 16 deletions rand_distr/src/unit_sphere.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ use crate::{Distribution, Uniform};
/// ```
/// use rand_distr::{UnitSphereSurface, Distribution};
///
/// let sphere = UnitSphereSurface::new();
/// let v = sphere.sample(&mut rand::thread_rng());
/// let v = UnitSphereSurface.sample(&mut rand::thread_rng());
/// println!("{:?} is from the unit sphere surface.", v)
/// ```
///
Expand All @@ -30,14 +29,6 @@ use crate::{Distribution, Uniform};
#[derive(Clone, Copy, Debug)]
pub struct UnitSphereSurface;

impl UnitSphereSurface {
/// Construct a new `UnitSphereSurface` distribution.
#[inline]
pub fn new() -> UnitSphereSurface {
UnitSphereSurface
}
}

impl Distribution<[f64; 3]> for UnitSphereSurface {
#[inline]
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> [f64; 3] {
Expand Down Expand Up @@ -78,22 +69,20 @@ mod tests {
#[test]
fn norm() {
let mut rng = crate::test::rng(1);
let dist = UnitSphereSurface::new();
for _ in 0..1000 {
let x = dist.sample(&mut rng);
let x = UnitSphereSurface.sample(&mut rng);
assert_almost_eq!(x[0]*x[0] + x[1]*x[1] + x[2]*x[2], 1., 1e-15);
}
}

#[test]
fn value_stability() {
let mut rng = crate::test::rng(2);
let dist = UnitSphereSurface::new();
assert_eq!(dist.sample(&mut rng),
assert_eq!(UnitSphereSurface.sample(&mut rng),
[-0.24950027180862533, -0.7552572587896719, 0.6060825747478084]);
assert_eq!(dist.sample(&mut rng),
assert_eq!(UnitSphereSurface.sample(&mut rng),
[0.47604534507233487, -0.797200864987207, -0.3712837328763685]);
assert_eq!(dist.sample(&mut rng),
assert_eq!(UnitSphereSurface.sample(&mut rng),
[0.9795722330927367, 0.18692349236651176, 0.07414747571708524]);
}
}