Fixed new WrappingHabitat for improved Rng

Author: juntyr

necsim/impls/no-std/src/cogs/dispersal_sampler/wrapping_noise.rs

@@ -1,8 +1,8 @@
 use necsim_core::{
     cogs::{
         distribution::{Bernoulli, Normal2D},
-        Backup, DispersalSampler, DistributionSampler, Habitat, MathsCore, Rng,
-        Distribution, SeparableDispersalSampler,
+        Backup, DispersalSampler, Distribution, DistributionSampler, Habitat, MathsCore, Rng,
+        SeparableDispersalSampler,
     },
     landscape::Location,
 };

necsim/impls/no-std/src/cogs/origin_sampler/wrapping_noise.rs

@@ -16,7 +16,7 @@ use crate::cogs::{
 
 #[allow(clippy::module_name_repetitions)]
 pub struct WrappingNoiseOriginSampler<'h, M: MathsCore, I: Iterator<Item = u64>> {
-    pre_sampler: OriginPreSampler<M, I>,
+    pre_sampler: OriginPreSampler<I>,
     last_index: u64,
     location_iterator: Peekable<LocationIterator>,
     habitat: &'h WrappingNoiseHabitat<M>,
@@ -40,7 +40,7 @@ impl<'h, M: MathsCore, I: Iterator<Item = u64>> fmt::Debug
 impl<'h, M: MathsCore, I: Iterator<Item = u64>> WrappingNoiseOriginSampler<'h, M, I> {
     #[must_use]
     pub fn new(
-        pre_sampler: OriginPreSampler<M, I>,
+        pre_sampler: OriginPreSampler<I>,
         habitat: &'h WrappingNoiseHabitat<M>,
         sample: LandscapeExtent,
     ) -> Self {
@@ -65,7 +65,7 @@ impl<'h, M: MathsCore, I: Iterator<Item = u64>> UntrustedOriginSampler<'h, M>
         self.habitat
     }
 
-    fn into_pre_sampler(self) -> OriginPreSampler<M, Self::PreSampler> {
+    fn into_pre_sampler(self) -> OriginPreSampler<Self::PreSampler> {
         self.pre_sampler
     }
 

rustcoalescence/algorithms/cuda/cpu-kernel/src/link.rs

@@ -317,7 +317,10 @@ link_kernel!(
         necsim_impls_cuda::cogs::maths::NvptxMathsCore,
         necsim_impls_cuda::cogs::rng::CudaRng<
             necsim_impls_cuda::cogs::maths::NvptxMathsCore,
-            necsim_impls_no_std::cogs::rng::wyhash::WyHash,
+            necsim_impls_no_std::cogs::rng::simple::SimpleRng<
+                necsim_impls_cuda::cogs::maths::NvptxMathsCore,
+                necsim_impls_no_std::cogs::rng::wyhash::WyHash,
+            >,
         >,
     >,
     necsim_impls_no_std::cogs::turnover_rate::uniform::UniformTurnoverRate,

rustcoalescence/scenarios/src/wrapping_noise.rs

@@ -130,7 +130,7 @@ where
 
     fn sample_habitat<'h, I: Iterator<Item = u64>>(
         habitat: &'h Self::Habitat,
-        pre_sampler: OriginPreSampler<M, I>,
+        pre_sampler: OriginPreSampler<I>,
         (sample,): Self::OriginSamplerAuxiliary,
     ) -> Self::OriginSampler<'_, I>
     where