progress

Author: cscherrer

src/data/mod.rs

@@ -578,7 +578,6 @@ mod tests {
                 &self,
                 _x: &crate::data::GaussianData<f64>,
             ) -> Self::PpCache {
-                ()
             }
 
             fn ln_pp_with_cache(

src/dist/scaled_prior.rs

@@ -1,3 +1,4 @@
+use crate::data::extract_stat_then;
 use crate::data::{DataOrSuffStat, ScaledSuffStat};
 use crate::dist::Scaled;
 use crate::traits::*;
@@ -200,15 +201,10 @@ where
         &self,
         x: &DataOrSuffStat<f64, Scaled<Fx>>,
     ) -> Self::PpCache {
-        // For now, we'll just compute from data
-        let data: Vec<f64> = match x {
-            DataOrSuffStat::Data(xs) => {
-                xs.iter().map(|&x| x * self.rate).collect()
-            }
-            DataOrSuffStat::SuffStat(_) => vec![], // Not handling suffstat for now
-        };
-
-        self.parent.ln_pp_cache(&DataOrSuffStat::Data(&data))
+        extract_stat_then(self, x, |stat| {
+            self.parent
+                .ln_pp_cache(&DataOrSuffStat::SuffStat(stat.parent()))
+        })
     }
 
     fn ln_pp_with_cache(&self, cache: &Self::PpCache, y: &f64) -> f64 {
@@ -224,8 +220,7 @@ where
 mod tests {
     use super::*;
     use crate::data::DataOrSuffStat;
-    use crate::dist::{Gaussian, NormalInvChiSquared, Scaled};
-    use crate::traits::*;
+    use crate::dist::{NormalInvChiSquared};
     use rand::SeedableRng;
     use rand_xoshiro::Xoshiro256Plus;
 

src/dist/shifted_prior.rs

@@ -207,8 +207,7 @@ where
 mod tests {
     use super::*;
     use crate::data::DataOrSuffStat;
-    use crate::dist::{Gaussian, NormalInvChiSquared, Shifted};
-    use crate::traits::*;
+    use crate::dist::{NormalInvChiSquared};
     use rand::SeedableRng;
     use rand_xoshiro::Xoshiro256Plus;
 

src/dist/vonmises.rs

@@ -641,7 +641,7 @@ mod tests {
 
     #[test]
     fn slice_step_vs_draw_test() {
-        let n_samples = 1000000;
+        let n_samples = 1_000_000;
         let mut rng = rand::thread_rng();
         let mu = 1.5;
         let k = 2.0;

src/test.rs

@@ -10,8 +10,8 @@ macro_rules! test_serde_params {
     ($fx: expr, $fx_ty: ty, $x_ty: ty) => {
         #[test]
         fn test_serde_ln_f() {
-            use ::serde::Deserialize;
-            use ::serde::Serialize;
+            // use ::serde::Deserialize;
+            // use ::serde::Serialize;
             use $crate::traits::HasDensity;
             use $crate::traits::Sampleable;
 
@@ -636,17 +636,17 @@ where
     Ok(p_value)
 }
 
-mod tests {
-    use crate::prelude::Exponential;
-    use crate::prelude::Gaussian;
-    use crate::test::density_histogram_test;
-    use crate::traits::HasDensity;
-    use crate::traits::Sampleable;
-    use rand::SeedableRng;
-    use rand_xoshiro::Xoshiro256Plus;
+mod tests {   
 
     #[test]
     fn test_density_histogram_gaussian() {
+        use crate::prelude::Gaussian;
+        use crate::test::density_histogram_test;   
+        use crate::traits::HasDensity;
+        use crate::traits::Sampleable;
+        use rand_xoshiro::Xoshiro256Plus;
+        use rand::SeedableRng;
+
         let mut rng = Xoshiro256Plus::seed_from_u64(1);
         let dist = Gaussian::default();
 
@@ -670,6 +670,13 @@ mod tests {
 
     #[test]
     fn test_density_histogram_exponential() {
+        use crate::prelude::Exponential;
+        use crate::traits::Sampleable;
+        use crate::traits::HasDensity;
+        use crate::test::density_histogram_test;     
+        use rand_xoshiro::Xoshiro256Plus;
+        use rand::SeedableRng;
+
         let mut rng = Xoshiro256Plus::seed_from_u64(1);
         let dist = Exponential::default();