-
Notifications
You must be signed in to change notification settings - Fork 0
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
Network-based interactions #24
Merged
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
ptheywood
force-pushed
the
initial-network-interactions
branch
from
November 25, 2024 17:04
0ae4710
to
64bd319
Compare
…they are not permanently infected
…pected, need to dig more/ rething things
This is useful for double checking household and workplace sizes
The maximum bucket index will need changing in future implementations Due to flamegpu limitations, the max value will have to be a worst-case value, i.e. the number of individuals rather than the actual number of households For individual simualtions with some restructuring we could make this the correct value, but for ensembles it would not be possible, as the maximum value is shared for all instances of the ensemble
This will simplify future household genration improvement, improves legibility and adds some tests
ptheywood
force-pushed
the
initial-network-interactions
branch
from
November 29, 2024 14:55
7f561d7
to
6262e2d
Compare
- Per day generation of random interactions via host layer function(s) - Target number per individual generated once at start of simulation, from a normal distribution from model parameters - Not all target amounts will lead to valid interaction combinations, leading to less actual interactions than intended - Does not exclude self interactions yet - Does not exclude repeat interactions on a given day (but this would increase the likelihood of exposure) - Implemented in serial on the CPU - will not scale well, but GPU implementation non-trivial. - Possible encountered a FLAME GPU 2 bug / limitation, tobe investigated and reported - Not implemented binomeal sampling (yet) - Added CMAKE configuraiton option for the maximum number - Could improve perf by changing this implementation, to be investigated
- Finishes implementing small world networks and uses the resulting graph for interactions within the workplace - Includes several new parameters to influence workplace network generation - Now (and in prev commits) 5 workplace networks - Refactors code, including the graph data structure once again. More refactoring to come. - Expands test suite - Switches to agent generation in an init function, but workarounds are required due to bugs in flame gpu 2, of which a PR is already in place to address at least one of. - Vis adjustments
ptheywood
force-pushed
the
initial-network-interactions
branch
from
December 11, 2024 09:26
ff299c1
to
622fe82
Compare
Open
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.
Implements network-based interactions and other changes/fixes:
interacting with a subset of their neighbours per day, and networks designed to achieve a target number of interactions based on the network type
std::array
-like rather thanstd::vector
)Closes #4
Closes #6
Closes #7
Closes #12
Hosuehold-centric Visualisation:
Per-individual plotting demonstration for arbitrary model input:
Time-series demo plots for arbitrary model input: