PR for checking conflicts merging spatial_demography into transloc_new_genetics_spatial_demog_merge #80
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
…ic matrices from R
…ataframes to initialisation model
Started implementing it in patch.cpp/h and species.cpp/h
…parameters.h Used NLAYERS for setting the localDemoScaling parameter in Patch.cpp Added setFecLayer() and getFecLayer() functions in Species.cpp (same for surv+dev) Started to work at the reproduction function in Population.cpp/h, still buggy
…y varying parameters: In patch.cpp/h: added function to get the local demographic scaling vector In Population.cpp: added new code for getting the scaled fecundity, survival and development in reproduction and survival functions In population.h: added the adapted reproduction and survival functions In subcommunity.cpp: added the adapted rreproduction and survival functions, added localDemoScaling variable
…for next replicate; also mend some warnings about unused variables
- changed initial value of localDemoScaling to 1.0 instead of 0.0 in SubCommunity.cpp: - added spatialdemog makro in getStats() function in Population.cpp: - added spatialdemog makro in getStats() function (wherever fec was set) - include ifelse condition in reproduction function to test whether fecundity is spatially varying and whether the assigned layer is valid - include ifelse condition in survival function to test whether development/survival is spatially varying and whether the assigned layer is valid - added spatial varying rate for all reproduction types in population.h: - added getStats function for SPATIALDEMOG macro in Species.cpp: - added boolean for spatial varying fec, surv and dev - initialised as false - moved fec[i][j] to inside of the #else //RS_Contain+//SEASON in Species.h: - added boolean for spatial varying fec, surv and dev - added function to return the value
…use pdf files for figures -> need to fix it or decide to delete 'word option'
Merge branch 'spatial_variance_demo' of github.com:RangeShifter/RangeShiftR into spatial_variance_demo # Conflicts: # RangeShiftR/R/output_handling.R
…s if parameter should not be spatially varying Rinterface.cpp: set setFecLayer/setDevLayer/setSurvLayer independent from eachother; otherwise it would use default values as soon as the first condition is false
…nd SurvLyer as well as demogScaleLayers, their reception on C side and R docu
…capes as list of arrays
Changed boundaries for demoscaling in patch.cpp (0-1 instead of 0-100)
…s.na() to vector version anyNA(); update copyright year
Adapted path for Version.h file
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.
Need to merge only flags #RS_THREADSAFE and #SPATIALDEMOG
Both are specific for R package and won't work for batch interface for now as they take 2D and 3D matrices as inputs for all landscape and spatially varying demographic scale layers.