diff --git a/rustcoalescence/algorithms/cuda/cpu-kernel/src/link.rs b/rustcoalescence/algorithms/cuda/cpu-kernel/src/link.rs index c4a99ac6f..e232fcd51 100644 --- a/rustcoalescence/algorithms/cuda/cpu-kernel/src/link.rs +++ b/rustcoalescence/algorithms/cuda/cpu-kernel/src/link.rs @@ -325,7 +325,7 @@ link_kernel!( necsim_impls_no_std::cogs::habitat::in_memory::InMemoryHabitat< necsim_impls_cuda::cogs::maths::NvptxMathsCore >, - necsim_impls_no_std::cogs::dispersal_sampler::in_memory::packed_alias::InMemoryPackedAliasDispersalSampler< + necsim_impls_no_std::cogs::dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler< necsim_impls_cuda::cogs::maths::NvptxMathsCore, necsim_impls_no_std::cogs::habitat::in_memory::InMemoryHabitat< necsim_impls_cuda::cogs::maths::NvptxMathsCore @@ -346,7 +346,7 @@ link_kernel!( necsim_impls_no_std::cogs::habitat::in_memory::InMemoryHabitat< necsim_impls_cuda::cogs::maths::NvptxMathsCore >, - necsim_impls_no_std::cogs::dispersal_sampler::in_memory::packed_alias::InMemoryPackedAliasDispersalSampler< + necsim_impls_no_std::cogs::dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler< necsim_impls_cuda::cogs::maths::NvptxMathsCore, necsim_impls_no_std::cogs::habitat::in_memory::InMemoryHabitat< necsim_impls_cuda::cogs::maths::NvptxMathsCore diff --git a/rustcoalescence/algorithms/cuda/src/initialiser/fixup.rs b/rustcoalescence/algorithms/cuda/src/initialiser/fixup.rs index 6c8dee90a..705a4fd06 100644 --- a/rustcoalescence/algorithms/cuda/src/initialiser/fixup.rs +++ b/rustcoalescence/algorithms/cuda/src/initialiser/fixup.rs @@ -13,7 +13,7 @@ use necsim_impls_no_std::cogs::{ resuming::lineage::{ExceptionalLineage, SplitExceptionalLineages}, }, dispersal_sampler::{ - in_memory::packed_alias::InMemoryPackedAliasDispersalSampler, + in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, trespassing::{ uniform::UniformAntiTrespassingDispersalSampler, TrespassingDispersalSampler, }, @@ -48,7 +48,8 @@ impl< > CudaLineageStoreSampleInitialiser> for FixUpInitialiser where O::Habitat: RustToCuda + Sync, - O::DispersalSampler>: RustToCuda + Sync, + O::DispersalSampler>: + RustToCuda + Sync, O::TurnoverRate: RustToCuda + Sync, O::SpeciationProbability: RustToCuda + Sync, { @@ -71,7 +72,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >; @@ -86,7 +87,7 @@ where self, origin_sampler: T, dispersal_sampler: O::DispersalSampler< - InMemoryPackedAliasDispersalSampler, + InMemoryPackedSeparableAliasDispersalSampler, >, _event_time_sampler: J, ) -> Result< diff --git a/rustcoalescence/algorithms/cuda/src/initialiser/genesis.rs b/rustcoalescence/algorithms/cuda/src/initialiser/genesis.rs index 72b836902..a760c3836 100644 --- a/rustcoalescence/algorithms/cuda/src/initialiser/genesis.rs +++ b/rustcoalescence/algorithms/cuda/src/initialiser/genesis.rs @@ -7,7 +7,7 @@ use necsim_impls_no_std::cogs::{ active_lineage_sampler::independent::{ event_time_sampler::EventTimeSampler, IndependentActiveLineageSampler, }, - dispersal_sampler::in_memory::packed_alias::InMemoryPackedAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, lineage_store::independent::IndependentLineageStore, origin_sampler::TrustedOriginSampler, }; @@ -27,7 +27,8 @@ impl + RustToCuda + Sync, O: Scenario for GenesisInitialiser where O::Habitat: RustToCuda + Sync, - O::DispersalSampler>: RustToCuda + Sync, + O::DispersalSampler>: + RustToCuda + Sync, O::TurnoverRate: RustToCuda + Sync, O::SpeciationProbability: RustToCuda + Sync, { @@ -47,7 +48,7 @@ where J, >; type DispersalSampler = - O::DispersalSampler>; + O::DispersalSampler>; fn init< 'h, @@ -60,7 +61,7 @@ where self, origin_sampler: T, dispersal_sampler: O::DispersalSampler< - InMemoryPackedAliasDispersalSampler, + InMemoryPackedSeparableAliasDispersalSampler, >, event_time_sampler: J, ) -> Result< diff --git a/rustcoalescence/algorithms/cuda/src/initialiser/mod.rs b/rustcoalescence/algorithms/cuda/src/initialiser/mod.rs index 8a0d9a27c..f85f3995a 100644 --- a/rustcoalescence/algorithms/cuda/src/initialiser/mod.rs +++ b/rustcoalescence/algorithms/cuda/src/initialiser/mod.rs @@ -8,7 +8,7 @@ use necsim_impls_no_std::cogs::{ independent::event_time_sampler::EventTimeSampler, singular::SingularActiveLineageSampler, }, coalescence_sampler::independent::IndependentCoalescenceSampler, - dispersal_sampler::in_memory::packed_alias::InMemoryPackedAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, event_sampler::independent::IndependentEventSampler, immigration_entry::never::NeverImmigrationEntry, lineage_store::independent::IndependentLineageStore, @@ -33,7 +33,8 @@ pub trait CudaLineageStoreSampleInitialiser< Error: From, > where O::Habitat: RustToCuda + Sync, - O::DispersalSampler>: RustToCuda + Sync, + O::DispersalSampler>: + RustToCuda + Sync, O::TurnoverRate: RustToCuda + Sync, O::SpeciationProbability: RustToCuda + Sync, { @@ -66,7 +67,7 @@ pub trait CudaLineageStoreSampleInitialiser< self, origin_sampler: T, dispersal_sampler: O::DispersalSampler< - InMemoryPackedAliasDispersalSampler, + InMemoryPackedSeparableAliasDispersalSampler, >, event_time_sampler: J, ) -> Result< diff --git a/rustcoalescence/algorithms/cuda/src/initialiser/resume.rs b/rustcoalescence/algorithms/cuda/src/initialiser/resume.rs index 478690d96..2ec9bff39 100644 --- a/rustcoalescence/algorithms/cuda/src/initialiser/resume.rs +++ b/rustcoalescence/algorithms/cuda/src/initialiser/resume.rs @@ -9,7 +9,7 @@ use necsim_impls_no_std::cogs::{ independent::{event_time_sampler::EventTimeSampler, IndependentActiveLineageSampler}, resuming::lineage::ExceptionalLineage, }, - dispersal_sampler::in_memory::packed_alias::InMemoryPackedAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, lineage_store::independent::IndependentLineageStore, origin_sampler::{resuming::ResumingOriginSampler, TrustedOriginSampler}, }; @@ -37,7 +37,8 @@ impl< > CudaLineageStoreSampleInitialiser> for ResumeInitialiser where O::Habitat: RustToCuda + Sync, - O::DispersalSampler>: RustToCuda + Sync, + O::DispersalSampler>: + RustToCuda + Sync, O::TurnoverRate: RustToCuda + Sync, O::SpeciationProbability: RustToCuda + Sync, { @@ -57,7 +58,7 @@ where J, >; type DispersalSampler = - O::DispersalSampler>; + O::DispersalSampler>; fn init< 'h, @@ -70,7 +71,7 @@ where self, origin_sampler: T, dispersal_sampler: O::DispersalSampler< - InMemoryPackedAliasDispersalSampler, + InMemoryPackedSeparableAliasDispersalSampler, >, event_time_sampler: J, ) -> Result< diff --git a/rustcoalescence/algorithms/cuda/src/launch.rs b/rustcoalescence/algorithms/cuda/src/launch.rs index 44e0e66f6..69cffc124 100644 --- a/rustcoalescence/algorithms/cuda/src/launch.rs +++ b/rustcoalescence/algorithms/cuda/src/launch.rs @@ -11,7 +11,7 @@ use necsim_impls_no_std::{ cogs::{ active_lineage_sampler::independent::event_time_sampler::exp::ExpEventTimeSampler, coalescence_sampler::independent::IndependentCoalescenceSampler, - dispersal_sampler::in_memory::packed_alias::InMemoryPackedAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, emigration_exit::never::NeverEmigrationExit, event_sampler::independent::IndependentEventSampler, immigration_entry::never::NeverImmigrationEntry, @@ -97,7 +97,8 @@ pub fn initialise_and_simulate< ) -> Result, Error> where O::Habitat: RustToCuda + Sync, - O::DispersalSampler>: RustToCuda + Sync, + O::DispersalSampler>: + RustToCuda + Sync, O::TurnoverRate: RustToCuda + Sync, O::SpeciationProbability: RustToCuda + Sync, { @@ -108,7 +109,7 @@ where speciation_probability, origin_sampler_auxiliary, decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = IndependentCoalescenceSampler::default(); let event_sampler = IndependentEventSampler::default(); diff --git a/rustcoalescence/algorithms/cuda/src/lib.rs b/rustcoalescence/algorithms/cuda/src/lib.rs index 06b0a68da..93066ac3b 100644 --- a/rustcoalescence/algorithms/cuda/src/lib.rs +++ b/rustcoalescence/algorithms/cuda/src/lib.rs @@ -21,7 +21,7 @@ use necsim_impls_no_std::cogs::{ }, coalescence_sampler::independent::IndependentCoalescenceSampler, dispersal_sampler::{ - in_memory::packed_alias::InMemoryPackedAliasDispersalSampler, + in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, trespassing::{ uniform::UniformAntiTrespassingDispersalSampler, TrespassingDispersalSampler, }, @@ -87,7 +87,8 @@ impl< > AlgorithmDispatch for CudaAlgorithm where O::Habitat: RustToCuda + Sync, - O::DispersalSampler>: RustToCuda + Sync, + O::DispersalSampler>: + RustToCuda + Sync, O::TurnoverRate: RustToCuda + Sync, O::SpeciationProbability: RustToCuda + Sync, SimulationKernelPtx< @@ -96,7 +97,7 @@ where G, IndependentLineageStore, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, IndependentCoalescenceSampler, O::TurnoverRate, O::SpeciationProbability, @@ -105,7 +106,7 @@ where O::Habitat, G, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, O::TurnoverRate, O::SpeciationProbability, >, @@ -115,7 +116,7 @@ where O::Habitat, G, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, O::TurnoverRate, O::SpeciationProbability, ExpEventTimeSampler, @@ -129,7 +130,7 @@ where G, IndependentLineageStore, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, IndependentCoalescenceSampler, O::TurnoverRate, O::SpeciationProbability, @@ -138,7 +139,7 @@ where O::Habitat, G, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, O::TurnoverRate, O::SpeciationProbability, >, @@ -148,7 +149,7 @@ where O::Habitat, G, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, O::TurnoverRate, O::SpeciationProbability, ExpEventTimeSampler, @@ -167,7 +168,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >, IndependentCoalescenceSampler, @@ -182,7 +183,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >, O::TurnoverRate, @@ -198,7 +199,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >, O::TurnoverRate, @@ -218,7 +219,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >, IndependentCoalescenceSampler, @@ -233,7 +234,9 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, UniformAntiTrespassingDispersalSampler, >, O::TurnoverRate, @@ -249,7 +252,9 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, UniformAntiTrespassingDispersalSampler, >, O::TurnoverRate, @@ -287,7 +292,8 @@ impl< > Algorithm<'p, M, G, O, R, P> for CudaAlgorithm where O::Habitat: RustToCuda + Sync, - O::DispersalSampler>: RustToCuda + Sync, + O::DispersalSampler>: + RustToCuda + Sync, O::TurnoverRate: RustToCuda + Sync, O::SpeciationProbability: RustToCuda + Sync, SimulationKernelPtx< @@ -296,7 +302,7 @@ where G, IndependentLineageStore, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, IndependentCoalescenceSampler, O::TurnoverRate, O::SpeciationProbability, @@ -305,7 +311,7 @@ where O::Habitat, G, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, O::TurnoverRate, O::SpeciationProbability, >, @@ -315,7 +321,7 @@ where O::Habitat, G, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, O::TurnoverRate, O::SpeciationProbability, ExpEventTimeSampler, @@ -329,7 +335,7 @@ where G, IndependentLineageStore, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, IndependentCoalescenceSampler, O::TurnoverRate, O::SpeciationProbability, @@ -338,7 +344,7 @@ where O::Habitat, G, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, O::TurnoverRate, O::SpeciationProbability, >, @@ -348,7 +354,7 @@ where O::Habitat, G, NeverEmigrationExit, - O::DispersalSampler>, + O::DispersalSampler>, O::TurnoverRate, O::SpeciationProbability, ExpEventTimeSampler, @@ -367,7 +373,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >, IndependentCoalescenceSampler, @@ -382,7 +388,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >, O::TurnoverRate, @@ -398,7 +404,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >, O::TurnoverRate, @@ -418,7 +424,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >, IndependentCoalescenceSampler, @@ -433,7 +439,9 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, UniformAntiTrespassingDispersalSampler, >, O::TurnoverRate, @@ -449,7 +457,9 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, UniformAntiTrespassingDispersalSampler, >, O::TurnoverRate, diff --git a/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/fixup.rs b/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/fixup.rs index 661b792d9..d88acde35 100644 --- a/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/fixup.rs +++ b/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/fixup.rs @@ -19,7 +19,7 @@ use necsim_impls_no_std::cogs::{ }, coalescence_sampler::conditional::ConditionalCoalescenceSampler, dispersal_sampler::{ - in_memory::separable_alias::InMemorySeparableAliasDispersalSampler, + in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, trespassing::{ uniform::UniformAntiTrespassingDispersalSampler, TrespassingDispersalSampler, }, @@ -48,7 +48,7 @@ pub struct FixUpInitialiser> { impl, M: MathsCore, G: RngCore, O: Scenario> EventSkippingLineageStoreSampleInitialiser> for FixUpInitialiser where - O::DispersalSampler>: + O::DispersalSampler>: SeparableDispersalSampler, { type ActiveLineageSampler< @@ -103,7 +103,7 @@ where M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >; @@ -120,7 +120,7 @@ where self, origin_sampler: T, dispersal_sampler: O::DispersalSampler< - InMemorySeparableAliasDispersalSampler, + InMemoryPackedSeparableAliasDispersalSampler, >, coalescence_sampler: &ConditionalCoalescenceSampler, turnover_rate: &O::TurnoverRate, diff --git a/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/genesis.rs b/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/genesis.rs index 079a47cd3..a7176cf46 100644 --- a/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/genesis.rs +++ b/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/genesis.rs @@ -9,7 +9,7 @@ use necsim_core::{ use necsim_impls_no_std::cogs::{ active_lineage_sampler::alias::location::LocationAliasActiveLineageSampler, coalescence_sampler::conditional::ConditionalCoalescenceSampler, - dispersal_sampler::in_memory::separable_alias::InMemorySeparableAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, event_sampler::gillespie::conditional::ConditionalGillespieEventSampler, origin_sampler::TrustedOriginSampler, }; @@ -25,7 +25,7 @@ pub struct GenesisInitialiser; impl, O: Scenario> EventSkippingLineageStoreSampleInitialiser for GenesisInitialiser where - O::DispersalSampler>: + O::DispersalSampler>: SeparableDispersalSampler, { type ActiveLineageSampler< @@ -55,7 +55,7 @@ where I, >; type DispersalSampler = - O::DispersalSampler>; + O::DispersalSampler>; fn init< 'h, @@ -70,7 +70,7 @@ where self, origin_sampler: T, dispersal_sampler: O::DispersalSampler< - InMemorySeparableAliasDispersalSampler, + InMemoryPackedSeparableAliasDispersalSampler, >, coalescence_sampler: &ConditionalCoalescenceSampler, turnover_rate: &O::TurnoverRate, diff --git a/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/mod.rs b/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/mod.rs index 2b14b98f9..65ef55cae 100644 --- a/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/mod.rs +++ b/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/mod.rs @@ -8,7 +8,7 @@ use necsim_core::{ use necsim_impls_no_std::cogs::{ coalescence_sampler::conditional::ConditionalCoalescenceSampler, - dispersal_sampler::in_memory::separable_alias::InMemorySeparableAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, event_sampler::gillespie::conditional::ConditionalGillespieEventSampler, origin_sampler::TrustedOriginSampler, }; @@ -27,7 +27,7 @@ pub trait EventSkippingLineageStoreSampleInitialiser< O: Scenario, Error, > where - O::DispersalSampler>: + O::DispersalSampler>: SeparableDispersalSampler, { type DispersalSampler: SeparableDispersalSampler; @@ -72,7 +72,7 @@ pub trait EventSkippingLineageStoreSampleInitialiser< self, origin_sampler: T, dispersal_sampler: O::DispersalSampler< - InMemorySeparableAliasDispersalSampler, + InMemoryPackedSeparableAliasDispersalSampler, >, coalescence_sampler: &ConditionalCoalescenceSampler, turnover_rate: &O::TurnoverRate, diff --git a/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/resume.rs b/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/resume.rs index 5ae570961..c3b804aaf 100644 --- a/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/resume.rs +++ b/rustcoalescence/algorithms/gillespie/src/event_skipping/initialiser/resume.rs @@ -11,7 +11,7 @@ use necsim_core_bond::NonNegativeF64; use necsim_impls_no_std::cogs::{ active_lineage_sampler::alias::location::LocationAliasActiveLineageSampler, coalescence_sampler::conditional::ConditionalCoalescenceSampler, - dispersal_sampler::in_memory::separable_alias::InMemorySeparableAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, event_sampler::gillespie::conditional::ConditionalGillespieEventSampler, origin_sampler::{resuming::ResumingOriginSampler, TrustedOriginSampler}, }; @@ -31,7 +31,7 @@ pub struct ResumeInitialiser> { impl, M: MathsCore, G: RngCore, O: Scenario> EventSkippingLineageStoreSampleInitialiser> for ResumeInitialiser where - O::DispersalSampler>: + O::DispersalSampler>: SeparableDispersalSampler, { type ActiveLineageSampler< @@ -61,7 +61,7 @@ where I, >; type DispersalSampler = - O::DispersalSampler>; + O::DispersalSampler>; fn init< 'h, @@ -76,7 +76,7 @@ where self, origin_sampler: T, dispersal_sampler: O::DispersalSampler< - InMemorySeparableAliasDispersalSampler, + InMemoryPackedSeparableAliasDispersalSampler, >, coalescence_sampler: &ConditionalCoalescenceSampler, turnover_rate: &O::TurnoverRate, diff --git a/rustcoalescence/algorithms/gillespie/src/event_skipping/launch.rs b/rustcoalescence/algorithms/gillespie/src/event_skipping/launch.rs index 5fa1e4391..88ec7a1b0 100644 --- a/rustcoalescence/algorithms/gillespie/src/event_skipping/launch.rs +++ b/rustcoalescence/algorithms/gillespie/src/event_skipping/launch.rs @@ -13,7 +13,7 @@ use necsim_core_bond::NonNegativeF64; use necsim_impls_no_std::{ cogs::{ coalescence_sampler::conditional::ConditionalCoalescenceSampler, - dispersal_sampler::in_memory::separable_alias::InMemorySeparableAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, emigration_exit::{domain::DomainEmigrationExit, never::NeverEmigrationExit}, immigration_entry::{buffered::BufferedImmigrationEntry, never::NeverImmigrationEntry}, lineage_store::coherent::globally::gillespie::GillespieLineageStore, @@ -56,7 +56,7 @@ pub fn initialise_and_simulate< where O::LineageStore>: GloballyCoherentLineageStore, - O::DispersalSampler>: + O::DispersalSampler>: SeparableDispersalSampler, { match args.parallelism_mode { @@ -68,7 +68,7 @@ where speciation_probability, origin_sampler_auxiliary, _decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = ConditionalCoalescenceSampler::default(); let (lineage_store, dispersal_sampler, event_sampler, active_lineage_sampler): ( @@ -138,7 +138,7 @@ where speciation_probability, origin_sampler_auxiliary, decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = ConditionalCoalescenceSampler::default(); let decomposition = O::decompose( diff --git a/rustcoalescence/algorithms/gillespie/src/event_skipping/mod.rs b/rustcoalescence/algorithms/gillespie/src/event_skipping/mod.rs index 9527012e8..a28206eb3 100644 --- a/rustcoalescence/algorithms/gillespie/src/event_skipping/mod.rs +++ b/rustcoalescence/algorithms/gillespie/src/event_skipping/mod.rs @@ -6,7 +6,7 @@ use necsim_core::{ use necsim_core_bond::{NonNegativeF64, PositiveF64}; use necsim_impls_no_std::cogs::{ - dispersal_sampler::in_memory::separable_alias::InMemorySeparableAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, lineage_store::coherent::globally::gillespie::GillespieLineageStore, maths::intrinsics::IntrinsicsMathsCore, origin_sampler::pre_sampler::OriginPreSampler, }; @@ -52,7 +52,7 @@ impl, O: Scenario, R: Reporter> where O::LineageStore>: GloballyCoherentLineageStore, - O::DispersalSampler>: + O::DispersalSampler>: SeparableDispersalSampler, { type Algorithm<'p, P: LocalPartition<'p, R>> = Self; @@ -76,7 +76,7 @@ impl< where O::LineageStore>: GloballyCoherentLineageStore, - O::DispersalSampler>: + O::DispersalSampler>: SeparableDispersalSampler, { type LineageStore = O::LineageStore>; diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/fixup.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/fixup.rs index 1011efbb5..f0cdb997f 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/fixup.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/fixup.rs @@ -16,7 +16,7 @@ use necsim_impls_no_std::cogs::{ }, coalescence_sampler::unconditional::UnconditionalCoalescenceSampler, dispersal_sampler::{ - in_memory::alias::InMemoryAliasDispersalSampler, + in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, trespassing::{ uniform::UniformAntiTrespassingDispersalSampler, TrespassingDispersalSampler, }, @@ -87,7 +87,7 @@ impl, M: MathsCore, G: RngCore, O: Scena M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >; @@ -103,7 +103,9 @@ impl, M: MathsCore, G: RngCore, O: Scena >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, local_partition: &mut P, ) -> Result< ( diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/genesis.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/genesis.rs index 4d8529154..4fa3ccba8 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/genesis.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/genesis.rs @@ -5,7 +5,7 @@ use necsim_core::{ use necsim_impls_no_std::cogs::{ active_lineage_sampler::classical::ClassicalActiveLineageSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, origin_sampler::TrustedOriginSampler, }; use necsim_partitioning_core::LocalPartition; @@ -34,7 +34,8 @@ impl, O: Scenario> O::SpeciationProbability, I, >; - type DispersalSampler = O::DispersalSampler>; + type DispersalSampler = + O::DispersalSampler>; fn init< 'h, @@ -48,7 +49,9 @@ impl, O: Scenario> >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, _local_partition: &mut P, ) -> Result< ( diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/mod.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/mod.rs index f03b13e2a..95cc21729 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/mod.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/mod.rs @@ -8,7 +8,7 @@ use necsim_core::{ use necsim_impls_no_std::cogs::{ coalescence_sampler::unconditional::UnconditionalCoalescenceSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, event_sampler::unconditional::UnconditionalEventSampler, origin_sampler::TrustedOriginSampler, turnover_rate::uniform::UniformTurnoverRate, }; @@ -70,7 +70,9 @@ pub trait ClassicalLineageStoreSampleInitialiser< >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, local_partition: &mut P, ) -> Result< ( diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/resume.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/resume.rs index a2c313ccd..cb7e7b52e 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/resume.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/initialiser/resume.rs @@ -7,7 +7,7 @@ use necsim_core_bond::NonNegativeF64; use necsim_impls_no_std::cogs::{ active_lineage_sampler::classical::ClassicalActiveLineageSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, origin_sampler::{resuming::ResumingOriginSampler, TrustedOriginSampler}, }; use necsim_partitioning_core::LocalPartition; @@ -40,7 +40,8 @@ impl, M: MathsCore, G: RngCore, O: Scena O::SpeciationProbability, I, >; - type DispersalSampler = O::DispersalSampler>; + type DispersalSampler = + O::DispersalSampler>; fn init< 'h, @@ -54,7 +55,9 @@ impl, M: MathsCore, G: RngCore, O: Scena >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, _local_partition: &mut P, ) -> Result< ( diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/launch.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/launch.rs index e770d1d3e..a622a4412 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/classical/launch.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/classical/launch.rs @@ -10,7 +10,7 @@ use necsim_core_bond::NonNegativeF64; use necsim_impls_no_std::{ cogs::{ coalescence_sampler::unconditional::UnconditionalCoalescenceSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, emigration_exit::{domain::DomainEmigrationExit, never::NeverEmigrationExit}, event_sampler::unconditional::UnconditionalEventSampler, immigration_entry::{buffered::BufferedImmigrationEntry, never::NeverImmigrationEntry}, @@ -66,7 +66,7 @@ where speciation_probability, origin_sampler_auxiliary, _decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = UnconditionalCoalescenceSampler::default(); let event_sampler = UnconditionalEventSampler::default(); @@ -133,7 +133,7 @@ where speciation_probability, origin_sampler_auxiliary, decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = UnconditionalCoalescenceSampler::default(); let event_sampler = UnconditionalEventSampler::default(); diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/fixup.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/fixup.rs index 7fc69036f..b1a4bba11 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/fixup.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/fixup.rs @@ -18,7 +18,7 @@ use necsim_impls_no_std::cogs::{ }, }, dispersal_sampler::{ - in_memory::alias::InMemoryAliasDispersalSampler, + in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, trespassing::{ uniform::UniformAntiTrespassingDispersalSampler, TrespassingDispersalSampler, }, @@ -92,7 +92,7 @@ impl, M: MathsCore, G: RngCore, O: Scena M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >; @@ -120,7 +120,9 @@ impl, M: MathsCore, G: RngCore, O: Scena >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, turnover_rate: &O::TurnoverRate, local_partition: &mut P, ) -> Result< diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/genesis.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/genesis.rs index b3a4f8430..db978778d 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/genesis.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/genesis.rs @@ -8,7 +8,7 @@ use necsim_core::{ use necsim_impls_no_std::cogs::{ active_lineage_sampler::alias::individual::IndividualAliasActiveLineageSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, origin_sampler::TrustedOriginSampler, }; use necsim_partitioning_core::LocalPartition; @@ -52,7 +52,8 @@ impl, O: Scenario> E, I, >; - type DispersalSampler = O::DispersalSampler>; + type DispersalSampler = + O::DispersalSampler>; fn init< 'h, @@ -78,7 +79,9 @@ impl, O: Scenario> >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, turnover_rate: &O::TurnoverRate, _local_partition: &mut P, ) -> Result< diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/mod.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/mod.rs index cee39068f..4a7973eae 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/mod.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/mod.rs @@ -7,7 +7,7 @@ use necsim_core::{ }; use necsim_impls_no_std::cogs::{ - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, origin_sampler::TrustedOriginSampler, }; use necsim_partitioning_core::LocalPartition; @@ -72,7 +72,9 @@ pub trait GillespieLineageStoreSampleInitialiser< >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, turnover_rate: &O::TurnoverRate, local_partition: &mut P, ) -> Result< diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/resume.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/resume.rs index 2e1264ef5..abac21243 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/resume.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/initialiser/resume.rs @@ -10,7 +10,7 @@ use necsim_core_bond::NonNegativeF64; use necsim_impls_no_std::cogs::{ active_lineage_sampler::alias::individual::IndividualAliasActiveLineageSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, origin_sampler::{resuming::ResumingOriginSampler, TrustedOriginSampler}, }; use necsim_partitioning_core::LocalPartition; @@ -58,7 +58,8 @@ impl, M: MathsCore, G: RngCore, O: Scena E, I, >; - type DispersalSampler = O::DispersalSampler>; + type DispersalSampler = + O::DispersalSampler>; fn init< 'h, @@ -84,7 +85,9 @@ impl, M: MathsCore, G: RngCore, O: Scena >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, turnover_rate: &O::TurnoverRate, _local_partition: &mut P, ) -> Result< diff --git a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/launch.rs b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/launch.rs index 4f23dea77..7bce49fe8 100644 --- a/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/launch.rs +++ b/rustcoalescence/algorithms/gillespie/src/gillespie/turnover/launch.rs @@ -10,7 +10,7 @@ use necsim_core_bond::NonNegativeF64; use necsim_impls_no_std::{ cogs::{ coalescence_sampler::unconditional::UnconditionalCoalescenceSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, emigration_exit::{domain::DomainEmigrationExit, never::NeverEmigrationExit}, event_sampler::unconditional::UnconditionalEventSampler, immigration_entry::{buffered::BufferedImmigrationEntry, never::NeverImmigrationEntry}, @@ -65,7 +65,7 @@ where speciation_probability, origin_sampler_auxiliary, _decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = UnconditionalCoalescenceSampler::default(); let event_sampler = UnconditionalEventSampler::default(); @@ -133,7 +133,7 @@ where speciation_probability, origin_sampler_auxiliary, decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = UnconditionalCoalescenceSampler::default(); let event_sampler = UnconditionalEventSampler::default(); diff --git a/rustcoalescence/algorithms/independent/src/initialiser/fixup.rs b/rustcoalescence/algorithms/independent/src/initialiser/fixup.rs index 1783d6af5..3f5f1a08b 100644 --- a/rustcoalescence/algorithms/independent/src/initialiser/fixup.rs +++ b/rustcoalescence/algorithms/independent/src/initialiser/fixup.rs @@ -13,7 +13,7 @@ use necsim_impls_no_std::cogs::{ resuming::lineage::{ExceptionalLineage, SplitExceptionalLineages}, }, dispersal_sampler::{ - in_memory::alias::InMemoryAliasDispersalSampler, + in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, trespassing::{ uniform::UniformAntiTrespassingDispersalSampler, TrespassingDispersalSampler, }, @@ -56,7 +56,7 @@ impl, M: MathsCore, G: PrimeableRng, O: M, O::Habitat, G, - O::DispersalSampler>, + O::DispersalSampler>, UniformAntiTrespassingDispersalSampler, >; @@ -68,7 +68,9 @@ impl, M: MathsCore, G: PrimeableRng, O: >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, _event_time_sampler: J, ) -> Result< ( diff --git a/rustcoalescence/algorithms/independent/src/initialiser/genesis.rs b/rustcoalescence/algorithms/independent/src/initialiser/genesis.rs index 6d960f0e5..2498eb76b 100644 --- a/rustcoalescence/algorithms/independent/src/initialiser/genesis.rs +++ b/rustcoalescence/algorithms/independent/src/initialiser/genesis.rs @@ -7,7 +7,7 @@ use necsim_impls_no_std::cogs::{ active_lineage_sampler::independent::{ event_time_sampler::EventTimeSampler, IndependentActiveLineageSampler, }, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, lineage_store::independent::IndependentLineageStore, origin_sampler::TrustedOriginSampler, }; @@ -35,7 +35,8 @@ impl, O: Scenario> O::SpeciationProbability, J, >; - type DispersalSampler = O::DispersalSampler>; + type DispersalSampler = + O::DispersalSampler>; fn init< 'h, @@ -45,7 +46,9 @@ impl, O: Scenario> >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, event_time_sampler: J, ) -> Result< ( diff --git a/rustcoalescence/algorithms/independent/src/initialiser/mod.rs b/rustcoalescence/algorithms/independent/src/initialiser/mod.rs index d62dc31d6..42dd8a0dd 100644 --- a/rustcoalescence/algorithms/independent/src/initialiser/mod.rs +++ b/rustcoalescence/algorithms/independent/src/initialiser/mod.rs @@ -8,7 +8,7 @@ use necsim_impls_no_std::cogs::{ independent::event_time_sampler::EventTimeSampler, singular::SingularActiveLineageSampler, }, coalescence_sampler::independent::IndependentCoalescenceSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, event_sampler::independent::IndependentEventSampler, immigration_entry::never::NeverImmigrationEntry, lineage_store::independent::IndependentLineageStore, @@ -52,7 +52,9 @@ pub trait IndependentLineageStoreSampleInitialiser< >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, event_time_sampler: J, ) -> Result< ( diff --git a/rustcoalescence/algorithms/independent/src/initialiser/resume.rs b/rustcoalescence/algorithms/independent/src/initialiser/resume.rs index 64a8b1da5..6d49d02b9 100644 --- a/rustcoalescence/algorithms/independent/src/initialiser/resume.rs +++ b/rustcoalescence/algorithms/independent/src/initialiser/resume.rs @@ -9,7 +9,7 @@ use necsim_impls_no_std::cogs::{ independent::{event_time_sampler::EventTimeSampler, IndependentActiveLineageSampler}, resuming::lineage::ExceptionalLineage, }, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, lineage_store::independent::IndependentLineageStore, origin_sampler::{resuming::ResumingOriginSampler, TrustedOriginSampler}, }; @@ -41,7 +41,8 @@ impl, M: MathsCore, G: PrimeableRng, O: O::SpeciationProbability, J, >; - type DispersalSampler = O::DispersalSampler>; + type DispersalSampler = + O::DispersalSampler>; fn init< 'h, @@ -51,7 +52,9 @@ impl, M: MathsCore, G: PrimeableRng, O: >( self, origin_sampler: T, - dispersal_sampler: O::DispersalSampler>, + dispersal_sampler: O::DispersalSampler< + InMemoryPackedSeparableAliasDispersalSampler, + >, event_time_sampler: J, ) -> Result< ( diff --git a/rustcoalescence/algorithms/independent/src/launch.rs b/rustcoalescence/algorithms/independent/src/launch.rs index 6841c2f55..203532d0b 100644 --- a/rustcoalescence/algorithms/independent/src/launch.rs +++ b/rustcoalescence/algorithms/independent/src/launch.rs @@ -11,7 +11,7 @@ use necsim_impls_no_std::{ cogs::{ active_lineage_sampler::independent::event_time_sampler::poisson::PoissonEventTimeSampler, coalescence_sampler::independent::IndependentCoalescenceSampler, - dispersal_sampler::in_memory::alias::InMemoryAliasDispersalSampler, + dispersal_sampler::in_memory::packed_separable_alias::InMemoryPackedSeparableAliasDispersalSampler, emigration_exit::{ independent::{ choice::{ @@ -73,7 +73,7 @@ pub fn initialise_and_simulate< speciation_probability, origin_sampler_auxiliary, decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = IndependentCoalescenceSampler::default(); let event_sampler = IndependentEventSampler::default(); @@ -166,7 +166,7 @@ pub fn initialise_and_simulate< speciation_probability, origin_sampler_auxiliary, _decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = IndependentCoalescenceSampler::default(); let event_sampler = IndependentEventSampler::default(); @@ -221,7 +221,7 @@ pub fn initialise_and_simulate< speciation_probability, origin_sampler_auxiliary, decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = IndependentCoalescenceSampler::default(); let event_sampler = IndependentEventSampler::default(); @@ -284,7 +284,7 @@ pub fn initialise_and_simulate< speciation_probability, origin_sampler_auxiliary, decomposition_auxiliary, - ) = scenario.build::>(); + ) = scenario.build::>(); let coalescence_sampler = IndependentCoalescenceSampler::default(); let event_sampler = IndependentEventSampler::default();