Conversation
…g concurrency on the individual counter.
Add a mutex to ensure that two threads don’t simultaneously try to create a new population in a patch. Add a mutex and make Population::nInds atomics to prevent a race condition when two threads simultaneously try to add/remove individuals into/from the same population.
…parallel loop. Add a mutex to ensure that two threads don’t simultaneously write into the movement paths file.
…tching the recruitments into the matrix.
StreamErrorR(): path*File is not known -> must be habfile/pchfile R interface still outputs visits (SMS heat maps) -> needs the saveVisits option
Avoid memory copies
Replace the std:queue memory used for SMS with an ad hoc implementation using a circular buffer, to reduce memory consumption.
…values with pointers to Patch.
…tptr values with pointers to Population or Species.
…intptr values with pointers to SubCommunity.
…it is not used to store a pointer and was anyway initalised with an int.
updated testIndividual.cpp according to current new_genetics version
…_new_genetics_spatial_demog_merge conflicts solved; now in sync with RScore/transloc_new_genetics_spatial_demog_merge
…genetics_spatial_demog_merge
…_new_genetics_spatial_demog_merge
solved conflicts; compiling successfull on Win11
RScore subtree is in line with RScore/develop
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
- version number - improved git subtree documentation
Collaborator
Author
|
@TheoPannetier Do you know why the pull request is not closed? I have run a git merge origin/develop on my laptop and pushed the commits after resolving conflicts + doing some additional edits on README.md, CONTRIBUTING.md, ... With the RScore merge github automatically detected that the merge was done. Shall we close the PR? |
Collaborator
Author
|
Ok, the issue solved itself - I guess a commit was missing at some point. :) |
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
5 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
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.
The RScore subtree repository was already merged at this point in time.
Next step is to run a
git subtree pull --prefix src/RScore RScore mainbefore running the 'git merge develop command'After the merge, a new release should be made with version number 3.0.0 and the prepared release note.