Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add almost-infinite scenario with Clark2Dt dispersal #273

Merged
merged 17 commits into from
Mar 2, 2024
Merged

Conversation

juntyr
Copy link
Owner

@juntyr juntyr commented Feb 19, 2024

  • Implement Clark 2Dt dispersal kernel
    • Standard dispersal
    • Dispersal to a different location
      • implemented with rejection sampling
    • Dispersal to a different location probability
      • implemented with numerical integration
      • Does normal dispersal need a correction?
      • Does noise-filtered normal dispersal need a correction?
    • Enable circle origin sampling with arbitrary centres
    • Enable both circle and rectangle origin sampling for both almost-infinite scenario variants
  • Fix CI failures from CUDA install
  • Squash commits and add @NicoFirbas as a co-author

@codecov-commenter
Copy link

codecov-commenter commented Feb 20, 2024

Codecov Report

Attention: Patch coverage is 37.06294% with 450 lines in your changes are missing coverage. Please review.

Project coverage is 16.35%. Comparing base (8c6e722) to head (e95edaa).
Report is 12 commits behind head on main.

Files Patch % Lines
...cogs/dispersal_sampler/almost_infinite_clark2dt.rs 46.11% 222 Missing ⚠️
rustcoalescence/src/args/config/scenario.rs 0.00% 45 Missing ⚠️
necsim/impls/cuda/src/cogs/maths.rs 0.00% 33 Missing ⚠️
...cogs/dispersal_sampler/in_memory/cumulative/mod.rs 0.00% 27 Missing ⚠️
...std/src/cogs/origin_sampler/singleton_demes/mod.rs 0.00% 25 Missing ⚠️
.../src/cogs/origin_sampler/singleton_demes/circle.rs 0.00% 24 Missing ⚠️
.../src/cogs/dispersal_sampler/in_memory/alias/mod.rs 0.00% 9 Missing ⚠️
...gs/dispersal_sampler/in_memory/packed_alias/mod.rs 0.00% 9 Missing ⚠️
...dispersal_sampler/in_memory/separable_alias/mod.rs 0.00% 9 Missing ⚠️
...ispersal_sampler/in_memory/cumulative/dispersal.rs 0.00% 5 Missing ⚠️
... and 14 more

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #273      +/-   ##
==========================================
+ Coverage   15.19%   16.35%   +1.16%     
==========================================
  Files         315      297      -18     
  Lines       21401    21116     -285     
==========================================
+ Hits         3251     3453     +202     
+ Misses      18150    17663     -487     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@juntyr juntyr self-assigned this Feb 20, 2024
@juntyr juntyr marked this pull request as ready for review February 20, 2024 09:29
docs/simulate.ron Outdated Show resolved Hide resolved
@juntyr
Copy link
Owner Author

juntyr commented Feb 21, 2024

@NicoFirbas I've now added support for p != 1 and the scenario config now takes a tail_p parameter

@juntyr
Copy link
Owner Author

juntyr commented Feb 21, 2024 via email

@juntyr
Copy link
Owner Author

juntyr commented Feb 23, 2024

@NicoFirbas I've now started merging the Clark2Dt scenario into the AlmostInfinite scenario (though it is not quite done yet - only rectangle sampling areas are supported thus far). You now need to enable the almost-infinite-clark2dt-dispersal-scenario and use the following scenario config:

scenario: AlmostInfinite(
    sample: Rectangle(x: 0, y: 0, width: 10000, height: 10000),
    dispersal: Clark2Dt(shape_u: 150, tail_p: 1.0),
)

docs/simulate.ron Outdated Show resolved Hide resolved
docs/simulate.ron Outdated Show resolved Hide resolved
docs/simulate.ron Outdated Show resolved Hide resolved
Copy link
Owner Author

@juntyr juntyr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small fixes are needed, then it should be good to go

@juntyr
Copy link
Owner Author

juntyr commented Feb 29, 2024

@NicoFirbas The config format has slightly changed again as I've done a final pass over the code changes - it's now:

scenario: AlmostInfinite(
    sample: Rectangle(origin: (x: 0, y: 0), width: 10000, height: 10000),
    dispersal: Clark2Dt(shape_u: 150, tail_p: 1.0),
)

@juntyr juntyr merged commit cea74d7 into main Mar 2, 2024
6 checks passed
@juntyr juntyr changed the title Add almost-infinite scenario with Clark 2Dt dispersal Add almost-infinite scenario with Clark2Dt dispersal Mar 2, 2024
@juntyr juntyr deleted the clark-scenario branch March 2, 2024 10:26
@juntyr
Copy link
Owner Author

juntyr commented Mar 2, 2024

@NicoFirbas I tried to add you as a co-author of this PR but it seems I used the wrong email address - could you share one that is linked to your GitHub account so that I can fix the commit authorship?

@NicoFirbas
Copy link
Contributor

NicoFirbas commented Mar 4, 2024 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants