Revert CDF test

rust-random · Oct 24, 2024 · 6e8f8d8 · 6e8f8d8
1 parent af3251c
commit 6e8f8d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/rand_distr/src/zipf.rs b/rand_distr/src/zipf.rs
@@ -35,7 +35,7 @@ use rand::Rng;
 /// use rand::prelude::*;
 /// use rand_distr::Zipf;
 ///
-/// let val: f64 = rand::rng().sample(Zipf::new(10, 1.5).unwrap());
+/// let val: f64 = rand::rng().sample(Zipf::new(10.0, 1.5).unwrap());
 /// println!("{}", val);
 /// ```
 ///

diff --git a/rand_distr/tests/cdf.rs b/rand_distr/tests/cdf.rs
@@ -372,22 +372,21 @@ fn zeta() {
 
 #[test]
 fn zipf() {
-    fn cdf(k: f64, n: f64, s: f64) -> f64 {
-        debug_assert!(k.fract() == 0.0 && k < u64::MAX as f64);
-        if k < 1.0 {
+    fn cdf(k: i64, n: u64, s: f64) -> f64 {
+        if k < 1 {
             return 0.0;
         }
-        if k > n {
+        if k > n as i64 {
             return 1.0;
         }
-        gen_harmonic(k as u64, s) / gen_harmonic(n as u64, s)
+        gen_harmonic(k as u64, s) / gen_harmonic(n, s)
     }
 
-    let parameters = [(1000.0, 1.0), (500.0, 2.0), (1000.0, 0.5)];
+    let parameters = [(1000, 1.0), (500, 2.0), (1000, 0.5)];
 
     for (seed, (n, x)) in parameters.into_iter().enumerate() {
-        let dist = rand_distr::Zipf::new(n, x).unwrap();
-        test_continuous(seed as u64, dist, |k| cdf(k, n, x));
+        let dist = rand_distr::Zipf::new(n as f64, x).unwrap();
+        test_discrete(seed as u64, dist, |k| cdf(k, n, x));
     }
 }