forked from EcoJulia/EcoSISTEM.jl
-
Notifications
You must be signed in to change notification settings - Fork 4
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
Pass initial population to EpiSystem, not EpiEnv #60
Merged
Conversation
This file contains 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
claireh93
approved these changes
Jun 25, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks great @sdl1! Ready to merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a pre-cursor to #54
This removes the
initial_population
member from theEpiEnv
struct. Instead, theinitial_population
can be passed to anEpiSystem
constructor, where it is used to initialise the abundances.There are a few reasons for this:
EpiSystem
without aninitial_population
EpiEnv
, instead, we just have some small changes inEpiLandscape
andEpiSystem
EpiLandscape.grid
the appropriateAxisArray
in theEpiSystem
constructor ifinitial_population
is not passed in. This is hard to do in the current code, becauseinitial_population
is set to a default matrix of zeros inEpiEnv
, which does not match with the actual shape of the classesSo basically with this PR the workflow is
Some of the diffs are large but this is mostly just moving around code