@@ -20,7 +20,7 @@ use std::mem::size_of;
2020use test:: Bencher ;
2121
2222use rand:: prelude:: * ;
23- use rand_distr:: { weighted :: WeightedIndex , * } ;
23+ use rand_distr:: * ;
2424
2525// At this time, distributions are optimised for 64-bit platforms.
2626use rand_pcg:: Pcg64Mcg ;
@@ -116,7 +116,7 @@ distr_float!(distr_cauchy, f64, Cauchy::new(4.2, 6.9).unwrap());
116116distr_float ! ( distr_triangular, f64 , Triangular :: new( 0. , 1. , 0.9 ) . unwrap( ) ) ;
117117distr_int ! ( distr_binomial, u64 , Binomial :: new( 20 , 0.7 ) . unwrap( ) ) ;
118118distr_int ! ( distr_binomial_small, u64 , Binomial :: new( 1000000 , 1e-30 ) . unwrap( ) ) ;
119- distr_int ! ( distr_poisson, u64 , Poisson :: new( 4.0 ) . unwrap( ) ) ;
119+ distr ! ( distr_poisson, f64 , Poisson :: new( 4.0 ) . unwrap( ) ) ;
120120distr ! ( distr_bernoulli, bool , Bernoulli :: new( 0.18 ) . unwrap( ) ) ;
121121distr_arr ! ( distr_circle, [ f64 ; 2 ] , UnitCircle ) ;
122122distr_arr ! ( distr_sphere, [ f64 ; 3 ] , UnitSphere ) ;
@@ -127,11 +127,12 @@ distr_int!(distr_weighted_u32, usize, WeightedIndex::new(&[1u32, 2, 3, 4, 12, 0,
127127distr_int ! ( distr_weighted_f64, usize , WeightedIndex :: new( & [ 1.0f64 , 0.001 , 1.0 /3.0 , 4.01 , 0.0 , 3.3 , 22.0 , 0.001 ] ) . unwrap( ) ) ;
128128distr_int ! ( distr_weighted_large_set, usize , WeightedIndex :: new( ( 0 ..10000 ) . rev( ) . chain( 1 ..10001 ) ) . unwrap( ) ) ;
129129
130- distr_int ! ( distr_weighted_alias_method_i8, usize , weighted :: alias_method :: WeightedIndex :: new( vec![ 1i8 , 2 , 3 , 4 , 12 , 0 , 2 , 1 ] ) . unwrap( ) ) ;
131- distr_int ! ( distr_weighted_alias_method_u32, usize , weighted :: alias_method :: WeightedIndex :: new( vec![ 1u32 , 2 , 3 , 4 , 12 , 0 , 2 , 1 ] ) . unwrap( ) ) ;
132- distr_int ! ( distr_weighted_alias_method_f64, usize , weighted :: alias_method :: WeightedIndex :: new( vec![ 1.0f64 , 0.001 , 1.0 /3.0 , 4.01 , 0.0 , 3.3 , 22.0 , 0.001 ] ) . unwrap( ) ) ;
133- distr_int ! ( distr_weighted_alias_method_large_set, usize , weighted :: alias_method :: WeightedIndex :: new( ( 0 ..10000 ) . rev( ) . chain( 1 ..10001 ) . collect( ) ) . unwrap( ) ) ;
130+ distr_int ! ( distr_weighted_alias_method_i8, usize , WeightedAliasIndex :: new( vec![ 1i8 , 2 , 3 , 4 , 12 , 0 , 2 , 1 ] ) . unwrap( ) ) ;
131+ distr_int ! ( distr_weighted_alias_method_u32, usize , WeightedAliasIndex :: new( vec![ 1u32 , 2 , 3 , 4 , 12 , 0 , 2 , 1 ] ) . unwrap( ) ) ;
132+ distr_int ! ( distr_weighted_alias_method_f64, usize , WeightedAliasIndex :: new( vec![ 1.0f64 , 0.001 , 1.0 /3.0 , 4.01 , 0.0 , 3.3 , 22.0 , 0.001 ] ) . unwrap( ) ) ;
133+ distr_int ! ( distr_weighted_alias_method_large_set, usize , WeightedAliasIndex :: new( ( 0 ..10000 ) . rev( ) . chain( 1 ..10001 ) . collect( ) ) . unwrap( ) ) ;
134134
135+ distr_int ! ( distr_weighted_fldr_i32, i32 , rand_distr:: weighted_fldr:: WeightedIndex :: new( vec![ 1i32 , 2 , 3 , 4 , 12 , 0 , 2 , 1 ] ) . unwrap( ) ) ;
135136
136137#[ bench]
137138fn dist_iter ( b : & mut Bencher ) {
0 commit comments