Conversation
Deploy genetics tests
RangeShifter version in CMakeLists.txt to 3.0.0 Parameter Output File
…ithub.com/RangeShifter/RScore into transloc_new_genetics_spatial_demog_merge
…mog_merge' into develop see also PR #89 #89 This merge integrates the newest features for the RS 3.0 release: - new genetics (currently without the recently commited bugfix for calculating Fst values, this still needs to be merged into develop! - spatial demography: spatio-temporal varying scales to be applied to selected demographic rates (survival, development, fecundity); only applicable for stage structured models using habitat quality maps - translocation: management option, which moves selectes individuals from a source to a destination location - merge conflicts occurred in Community.cpp, Population.cpp, Population.h, SubCommunity.cpp and SubCommunity.h, they were solved by choosing the code from the origin/transloc_new_genetics_spatial_demog_merge branch. - code compiled using cmake under Windows
…/RScore - manually applying changes done by RoslynHenry in commits 242b90a26838915bb68b7399968ce57a11acbf96, 285ee1b867e6638e625ad7e7edbd44a8b91c72dd, 1b7da0fe59d4147e114b167227894ac3b7aef333
however, I am not sure whether unit tests will be successfull as changes in pairwise Fst were made
…/RScore - manually applying changes done by RoslynHenry in commits 242b90a26838915bb68b7399968ce57a11acbf96, 285ee1b867e6638e625ad7e7edbd44a8b91c72dd, 1b7da0fe59d4147e114b167227894ac3b7aef333
however, I am not sure whether unit tests will be successfull as changes in pairwise Fst were made
solved conflicts; compiling successfull on Win11
now returning spatial rasters (for cell-based models) or a data.frame (for patch based models) for total abundances per cell or specific (user defined) stages
Member
|
Woohoo! Great to see the new release happening! |
Collaborator
Author
|
Ah right, I still need to check that everywhere. I will do that today. :) |
- version number - improved git subtree documentation
Member
|
Hurray 🥳 |
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
4 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.
The develop branch includes:
the new genetics module from RScore/new_genetics
spatial demography
- the three demographic rates fecundity, development and survival can vary spatially for models using habitat suitability maps. This feature was first published in Malchow et al (2022), who developed it for the R-pkg and is now incorporated in the next release of 3.0
translocation feature:
- introduces a new class for management features. So far it only holds translocation of individuals. Individuals with given characteristics in a given cell or patch are randomly selected and translocated/added to a different given cell or patch
Additional changes:
As the changes are major and complex. The merge will be done locally and not via GitHub. This pull request is aimed for providing an overview of all changes.
After the merge, a new release should be made with version number 3.0.0 and the prepared release note.