Merging translocation, new genetics and spatial demography#89
Merged
Merging translocation, new genetics and spatial demography#89
Conversation
…merge updating parts of the genetics while keeping changes done for adding spatially varying demography. solved conflicts in Individual.cpp, Population.cpp and Landscape.cpp (concerning CELLSIZE parameter of asci files)
added new function to read in demographic scaling functions adapted readLandscape() and readLandChange() functions to hand over scaling layer files Still need to update the repo with the new_genetics + develop branch
…genetics_spatial_demog_merge Solved merge conflicts and compiling issues after the merge it now runs, but there is still an issue as RangeShiftR tutorials cannot be replicated.
number of steps (path->total) was not incremented;
Changed different initialisation of individuals; pSpecies is also needed
spatial demog. feature requires the reproduction() and survival0() functions to include a localScaling vector + needed global variable nDSLayer
…merge Solved conflicts in Individual.cpp, testIndividual.cpp and testPopulation.cpp
Several changes were not considered during the last merge, I manually compared and edited the files. Hopefully GitHub Actions now run without issues.
demographic scale layers were not parsed
RangeShifter version in CMakeLists.txt to 3.0.0 Parameter Output File
…ithub.com/RangeShifter/RScore into transloc_new_genetics_spatial_demog_merge
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
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 transloc_new_genetics_spatial_demog branch includes:
Additional changes:
As the changes are major and quite complex, I will do the main work locally, avoiding automatic merges, but wanted to have an office pull request for documentation.