Merge pull request #2 from mrc-ide/package_structure#4
Open
cwhittaker1000 wants to merge 14 commits intoirsfrom
Open
Merge pull request #2 from mrc-ide/package_structure#4cwhittaker1000 wants to merge 14 commits intoirsfrom
cwhittaker1000 wants to merge 14 commits intoirsfrom
Conversation
Initial package structure and odin2 update
Collaborator
|
@cwhittaker1000 - The IRS branch is currently a bit of an offshoot from main (I had to change some things about the model that didn't immediately agree with SMC so I just removed SMC from the IRS version). I'd prefer the main branch to remain ITN + SMC until I create a version which unifies all three. Are you able to do everything you need to do while leaving it in the IRS branch? |
…get_custom_output()
…match, or attempt to approximate, the methodology used in malariasimulation
…. Renamed 'cohort' SMC distribution as 'correlated'.
Addition of stochastic simulations and SMC + ITN support. Several formatting changes to increase similarity to malariasimulation.
Fixed typo in ITN insecticide decay.
… have received SMC (drug_rel_c). Amendments now better account for discrepancies in the size of the SMC compartment and the number of people who have recently been given SMC treatment.
Minor changes to how drug_rel_c is defined in the model. Makes inperceptible difference to output but is more mathematically correct
Removed the 'development' caveat from the main branch installation instructions
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@DebbieShack - am about to branch off from the
irsbranch so I can start working in the An. stephensi two vector modifications we discussed. Before I do that just wanted to check whether I need to be mergingmainintoirsand bringing it up to date with everything you've done recently onmain. Theirsbranch is only 1 commit behindmainbut it seems like a big one (anodin2functionality related one) so thought I'd double check. Let me know thoughts! :)