Seq sample code: increase error bounds in test, simplify sample code

Author: dhardy

benches/seq.rs

@@ -116,7 +116,7 @@ impl<I: ExactSizeIterator + Iterator + Clone> Iterator for WindowHintedIterator<
 }
 
 #[bench]
-fn seq_iter_unhinted_choose_from_100(b: &mut Bencher) {
+fn seq_iter_unhinted_choose_from_1000(b: &mut Bencher) {
     let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
     let x : &[usize] = &[1; 1000];
     b.iter(|| {
@@ -125,9 +125,9 @@ fn seq_iter_unhinted_choose_from_100(b: &mut Bencher) {
 }
 
 #[bench]
-fn seq_iter_window_hinted_choose_from_100(b: &mut Bencher) {
+fn seq_iter_window_hinted_choose_from_1000(b: &mut Bencher) {
     let mut rng = SmallRng::from_rng(thread_rng()).unwrap();
-    let x : &[usize] = &[1; 100];
+    let x : &[usize] = &[1; 1000];
     b.iter(|| {
         WindowHintedIterator { iter: x.iter(), window_size: 7 }.choose(&mut rng)
     })

src/seq/mod.rs

@@ -191,17 +191,7 @@ pub trait IteratorRandom: Iterator + Sized {
         let mut result = None;
 
         if upper == Some(lower) {
-            // Remove this once we can specialize on ExactSizeIterator
             return if lower == 0 { None } else { self.nth(rng.gen_range(0, lower)) };
-        } else if lower <= 1 {
-            result = self.next();
-            if result.is_none() {
-                return result;
-            }
-            consumed = 1;
-            let hint = self.size_hint();
-            lower = hint.0;
-            upper = hint.1;
         }
 
         // Continue until the iterator is exhausted
@@ -617,8 +607,9 @@ mod test {
             }
             for count in chosen.iter() {
                 // Samples should follow Binomial(1000, 1/9)
-                let err = *count - 1000 / 9;
-                assert!(-30 <= err && err <= 30);
+                // Octave: binopdf(x, 1000, 1/9) gives the prob of *count == x
+                // Note: have seen 153, which is unlikely but not impossible.
+                assert!(72 < *count && *count < 154, "count not close to 1000/9: {}", count);
             }
         }