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

Prevent infinite initial parameters passed to relaxed-rate model #33

Merged
merged 1 commit into from
Oct 2, 2023

Conversation

joshwlambert
Copy link
Collaborator

This PR addresses a bug whereby the initial CS DAISIE model which estimates parameters to be passed to the relaxed-rate model was sometimes passing infinite values. This was the case for the carrying capacity ($K$) which can be estimated as Inf when the model favours diversity-independence.

@Neves-P I'm going to merge this PR once all the CI checks pass. This is a minor change and should only influence running the relaxed-rate model. If you spot an issue please let me know and I will open a subsequent PR to resolve it.

@codecov
Copy link

codecov bot commented Oct 2, 2023

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (5d5a041) 65.80% compared to head (2a8348e) 65.75%.
Report is 1 commits behind head on master.

❗ Current head 2a8348e differs from pull request most recent head 3b1e049. Consider uploading reports for the commit 3b1e049 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master      #33      +/-   ##
==========================================
- Coverage   65.80%   65.75%   -0.06%     
==========================================
  Files          25       25              
  Lines        1202     1203       +1     
==========================================
  Hits          791      791              
- Misses        411      412       +1     
Files Coverage Δ
R/run_daisie_ml.R 67.81% <0.00%> (-0.79%) ⬇️

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

@Neves-P
Copy link
Member

Neves-P commented Oct 2, 2023

All fine with me 👍
The tests that are ignored are the PR copy of the branch itself, so I think you can go ahead with the merge.

@joshwlambert
Copy link
Collaborator Author

I suggest we make a patch release for this change as it is very minor but does influence the behaviour of running the relaxed-rate model.

Let me know what you think.

@joshwlambert joshwlambert merged commit 5cf59ef into master Oct 2, 2023
12 of 14 checks passed
@joshwlambert joshwlambert deleted the develop branch October 2, 2023 20:59
@joshwlambert joshwlambert restored the develop branch October 2, 2023 20:59
@Neves-P
Copy link
Member

Neves-P commented Oct 2, 2023

Yeah, sounds good, we can make a patch for it. If you're up to it, I might bundle a pkgdown website for DAISIEutils, I can do that this Wednesday. Otherwise if you'd like to have it ready asap, go ahead and tag a new release :)

@joshwlambert
Copy link
Collaborator Author

No rush from my side. Happy to discuss on Weds.

A pkgdown site would a be good addition! 🌐

🚀

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.

None yet

2 participants