Skip to content

Commit

Permalink
fix the pointed out by lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@torao
torao committed Jul 12, 2022
1 parent 67d0a3e commit 21ff245
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 52 deletions.
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ mod test {
// from nondeterministic seed
let mut random = TinyMT64::from_entropy();
let rn = random.gen_range(0.0..1.0);
assert!(rn >= 0.0 && rn < 1.0);
assert!((0.0..1.0).contains(&rn));

// from deterministic seed (reproduction of random number sequence is possible)
let mut random = TinyMT64::from_seed(TinyMT64Seed::from(0u64));
let rn = random.gen_range(0.0..1.0);
assert!(rn >= 0.0 && rn < 1.0);
assert!((0.0..1.0).contains(&rn));
}
}
6 changes: 3 additions & 3 deletions tests/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ fn test_try_fill_bytes(random: &mut dyn RngCore) {
/// Performs a chi-square test using the specified histogram of uniform random numbers.
fn verify_chi_squared(histogram: &[u32], expected: f64, threshold: f64) {
let mut chi2: f64 = 0f64;
for i in 0..histogram.len() {
println!("{:2}: {}", i, histogram[i]);
let actual = histogram[i] as f64;
for (i, h) in histogram.iter().enumerate() {
println!("{:2}: {}", i, *h);
let actual = *h as f64;
chi2 += (expected - actual) * (expected - actual) / expected;
}
println!("χ² := {}, expected := {}", chi2, expected);
Expand Down
36 changes: 18 additions & 18 deletions tests/tinymt32.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ fn test_generate_uint32(tinymt: &mut TinyMT32) {
[2193913817, 1080849512, 33160901, 662956935, 642999063],
[3384709977, 1723175122, 3866752252, 521822317, 2292524454],
];
for i in 0..10 {
for j in 0..5 {
assert_eq!(expected[i][j], tinymt32_generate_uint32(tinymt));
for i in &expected {
for j in i {
assert_eq!(*j, tinymt32_generate_uint32(tinymt));
}
}
}
Expand All @@ -57,10 +57,10 @@ fn test_generate_float(tinymt: &mut TinyMT32) {
[0.8592415, 0.8379903, 0.6638085, 0.8796422, 0.8608698],
[0.9255103, 0.6475281, 0.7260162, 0.8757523, 0.0845953],
];
for i in 0..10 {
for j in 0..5 {
for i in &expected {
for j in i {
let actual = tinymt32_generate_float(tinymt);
assert_eq!(format!("{:.7}", expected[i][j]), format!("{:.7}", actual));
assert_eq!(format!("{:.7}", *j), format!("{:.7}", actual));
}
}
}
Expand All @@ -79,10 +79,10 @@ fn test_generate_float12(tinymt: &mut TinyMT32) {
[1.2322005, 1.3248408, 1.6282554, 1.6237093, 1.9553823],
[1.2515985, 1.2902025, 1.8261194, 1.7116343, 1.0828516],
];
for i in 0..10 {
for j in 0..5 {
for i in &expected {
for j in i {
let actual = tinymt32_generate_float12(tinymt);
assert_eq!(format!("{:.7}", expected[i][j]), format!("{:.7}", actual));
assert_eq!(format!("{:.7}", *j), format!("{:.7}", actual));
}
}
}
Expand All @@ -101,10 +101,10 @@ fn test_generate_float_oc(tinymt: &mut TinyMT32) {
[0.6015150, 0.4173800, 0.2261215, 0.5006371, 0.2059622],
[0.1784128, 0.4403929, 0.5902822, 0.2307619, 0.4184512],
];
for i in 0..10 {
for j in 0..5 {
for i in &expected {
for j in i {
let actual = tinymt32_generate_float_oc(tinymt);
assert_eq!(format!("{:.7}", expected[i][j]), format!("{:.7}", actual));
assert_eq!(format!("{:.7}", *j), format!("{:.7}", actual));
}
}
}
Expand All @@ -123,10 +123,10 @@ fn test_generate_float_oo(tinymt: &mut TinyMT32) {
[0.1003662, 0.8295220, 0.6224557, 0.9157780, 0.4195939],
[0.2126821, 0.8094529, 0.1176151, 0.1643153, 0.2755433],
];
for i in 0..10 {
for j in 0..5 {
for i in &expected {
for j in i {
let actual = tinymt32_generate_float_oo(tinymt);
assert_eq!(format!("{:.7}", expected[i][j]), format!("{:.7}", actual));
assert_eq!(format!("{:.7}", *j), format!("{:.7}", actual));
}
}
}
Expand All @@ -145,10 +145,10 @@ fn test_generate_32double(tinymt: &mut TinyMT32) {
[0.6132142, 0.2425692, 0.9836005, 0.5532928, 0.4105124],
[0.5009801, 0.8399252, 0.7654016, 0.6735107, 0.8542220],
];
for i in 0..10 {
for j in 0..5 {
for i in &expected {
for j in i {
let actual = tinymt32_generate_32double(tinymt);
assert_eq!(format!("{:.7}", expected[i][j]), format!("{:.7}", actual));
assert_eq!(format!("{:.7}", *j), format!("{:.7}", actual));
}
}
}
58 changes: 29 additions & 29 deletions tests/tinymt64.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ fn test_generate_uint64(tinymt: &mut TinyMT64) {
[10700258834832712655, 13440132573874649640, 15190104899818839732],
[14179849157427519166, 10328306841423370385, 9266343271776906817],
];
for i in 0..10 {
for j in 0..3 {
assert_eq!(expected[i][j], tinymt64_generate_uint64(tinymt));
for i in &expected {
for j in i {
assert_eq!(*j, tinymt64_generate_uint64(tinymt));
}
}
}
Expand All @@ -62,9 +62,9 @@ fn test_generate_double(tinymt: &mut TinyMT64) {
[0.12756425652308678, 0.9863577232725115, 0.5371878217659848, 0.23544098948491765],
[0.7000063536628773, 0.8580450245315596, 0.13056501891409378, 0.17396590319565852],
];
for i in 0..12 {
for j in 0..4 {
assert_eq!(expected[i][j], tinymt64_generate_double(tinymt));
for i in &expected {
for j in i {
assert_eq!(*j, tinymt64_generate_double(tinymt));
}
}
}
Expand All @@ -74,21 +74,21 @@ fn test_generate_double12(tinymt: &mut TinyMT64) {
let expected = [
[1.437679237017648, 1.239536785901373, 1.140298949383057, 1.776408301859232],
[1.152013609994736, 1.791233026870471, 1.212111221146196, 1.829985488180836],
[1.081512125943717, 1.363201836673650, 1.417933283495315, 1.814826826183523],
[1.081512125943717, 1.36320183667365, 1.417933283495315, 1.814826826183523],
[1.969922345279833, 1.053208264502199, 1.741205427976973, 1.837349090361589],
[1.406622310957582, 1.510698317360325, 1.829965206684917, 1.859153888163104],
[1.759271635641173, 1.824888617384633, 1.237637472413003, 1.367109059723164],
[1.976389381199251, 1.989991431835970, 1.044503045383735, 1.769751873156083],
[1.859046544898330, 1.218170930629463, 1.308291384260259, 1.694324347868131],
[1.976389381199251, 1.98999143183597, 1.044503045383735, 1.769751873156083],
[1.85904654489833, 1.218170930629463, 1.308291384260259, 1.694324347868131],
[1.458264916022492, 1.128833025697983, 1.205547655611532, 1.909188848740936],
[1.562083063485982, 1.333329220907858, 1.665680038183793, 1.001161742007127],
[1.667546697634258, 1.296057871298311, 1.461095987795535, 1.459580681054313],
[1.556093077958318, 1.916051394545249, 1.267046730316243, 1.147033584842960],
[1.556093077958318, 1.916051394545249, 1.267046730316243, 1.14703358484296],
];
for i in 0..12 {
for j in 0..4 {
for i in &expected {
for j in i {
let actual = tinymt64_generate_double12(tinymt);
assert_eq!(format!("{:.15}", expected[i][j]), format!("{:.15}", actual));
assert_eq!(format!("{:.15}", *j), format!("{:.15}", actual));
}
}
}
Expand All @@ -98,21 +98,21 @@ fn test_generate_double_oc(tinymt: &mut TinyMT64) {
let expected = [
[0.231189305675805, 0.800078680337062, 0.839012626265816, 0.439830027924101],
[0.287094637016178, 0.588065859945908, 0.979935435454641, 0.153150392249384],
[0.730008781559804, 0.811897304025850, 0.213940001686070, 0.803418052576349],
[0.872859727831960, 0.620437548528132, 0.978150212926246, 0.101173021131322],
[0.730008781559804, 0.81189730402585, 0.21394000168607, 0.803418052576349],
[0.87285972783196, 0.620437548528132, 0.978150212926246, 0.101173021131322],
[0.910550586203282, 0.225948191636215, 0.374316722183833, 0.305990832583114],
[0.349868211955804, 0.617675089001072, 0.977990275060935, 0.453879799720974],
[0.894692817941832, 0.247166853705171, 0.639918430646982, 0.187528433375713],
[0.098449225468909, 0.630303237374302, 0.080830809996716, 0.578706622599148],
[0.734493648961771, 0.082578413837076, 0.287252902600609, 0.148892860351310],
[0.734493648961771, 0.082578413837076, 0.287252902600609, 0.14889286035131],
[0.032585155152626, 0.974545363240716, 0.115296495734384, 0.779122282518212],
[0.217374280466345, 0.109080092606533, 0.926570354675966, 0.740322917071261],
[0.751484666825263, 0.287404891102534, 0.652825666825707, 0.715421981731271],
];
for i in 0..12 {
for j in 0..4 {
for i in &expected {
for j in i {
let actual = tinymt64_generate_double_oc(tinymt);
assert_eq!(format!("{:.15}", expected[i][j]), format!("{:.15}", actual));
assert_eq!(format!("{:.15}", *j), format!("{:.15}", actual));
}
}
}
Expand All @@ -121,22 +121,22 @@ fn test_generate_double_oc(tinymt: &mut TinyMT64) {
fn test_generate_double_oo(tinymt: &mut TinyMT64) {
let expected = [
[0.777528512172794, 0.427164705471249, 0.646272649811224, 0.544192399276788],
[0.055887665337890, 0.341700406526459, 0.711593276934271, 0.834779506059920],
[0.05588766533789, 0.341700406526459, 0.711593276934271, 0.83477950605992],
[0.300433789431423, 0.551665825454914, 0.408923581859956, 0.087661367648074],
[0.778332952183721, 0.987791992333503, 0.372489630499866, 0.814160794049290],
[0.778332952183721, 0.987791992333503, 0.372489630499866, 0.81416079404929],
[0.729786510846933, 0.759103094898038, 0.126259258963777, 0.126254138650957],
[0.959804243067140, 0.297513369134440, 0.080559577448319, 0.759676389010768],
[0.299289034712620, 0.930880432389953, 0.453686608702271, 0.051097960521366],
[0.190779343357538, 0.668131291883840, 0.568395939590751, 0.051087427533098],
[0.531001654494900, 0.863620810621520, 0.713312386789292, 0.079647214591833],
[0.95980424306714, 0.29751336913444, 0.080559577448319, 0.759676389010768],
[0.29928903471262, 0.930880432389953, 0.453686608702271, 0.051097960521366],
[0.190779343357538, 0.66813129188384, 0.568395939590751, 0.051087427533098],
[0.5310016544949, 0.86362081062152, 0.713312386789292, 0.079647214591833],
[0.503865458699875, 0.649652561747019, 0.651303365948799, 0.423447062299514],
[0.383204776309473, 0.325776002558352, 0.917474566663556, 0.612145094607316],
[0.785176513330525, 0.046217567933767, 0.445326162565375, 0.426594677789800],
[0.785176513330525, 0.046217567933767, 0.445326162565375, 0.4265946777898],
];
for i in 0..12 {
for j in 0..4 {
for i in &expected {
for j in i {
let actual = tinymt64_generate_double_oo(tinymt);
assert_eq!(format!("{:.15}", expected[i][j]), format!("{:.15}", actual));
assert_eq!(format!("{:.15}", *j), format!("{:.15}", actual));
}
}
}

0 comments on commit 21ff245

Please sign in to comment.