Skip to content
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 29 commits into from
Dec 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7438736
Bugfix: Set the phase duration for initially infected individuals so …
ptheywood Nov 15, 2024
9e451c1
Add initial household networks generation and interaction
ptheywood Nov 15, 2024
c8c60d0
WIP: initial home/network split, reference model doesn't behave as ex…
ptheywood Nov 19, 2024
6b30f6c
Implement per individual file and demo plotting script
ptheywood Nov 19, 2024
972e96e
Switch to GCC 8 compatible inclusive_scan
ptheywood Nov 25, 2024
0fb31a3
fixup: port another std::inclusive_scan
ptheywood Nov 25, 2024
e18b55d
Implement GCC 8 compatible std::recduce(first, last, init)
ptheywood Nov 25, 2024
75076d3
Tests: tests for GCC 8 compatible reduce
ptheywood Nov 25, 2024
86a0606
Refactor GCC 8 compatible inclusive_scan methods to be more like C++1…
ptheywood Nov 25, 2024
93292af
fixup lint
ptheywood Nov 25, 2024
1681a72
Visualisation: Group agents by household, reduce impact on non-vis bu…
ptheywood Nov 25, 2024
4186658
Performance: Switch to bucket messaging to improve performance
ptheywood Nov 26, 2024
adf5434
Tests: expand util testing
ptheywood Nov 26, 2024
a53e4df
Add missing struct members to cli::print
ptheywood Nov 26, 2024
b13e6e8
wip: refactoring
ptheywood Nov 26, 2024
631c472
Refactor: Move per-agent visualisation variable initialisation to vis…
ptheywood Nov 27, 2024
6e644d3
Refactor: Change how household/populations are generated and add tests
ptheywood Nov 27, 2024
46973be
Fixup: fixup vis build after refactor
ptheywood Nov 29, 2024
6262e2d
Readme: remove rogue backtick
ptheywood Nov 29, 2024
d63a1e3
Readme: Markdown fix
ptheywood Nov 29, 2024
3f6f592
Wip: random network
ptheywood Nov 29, 2024
16c7aea
Fix initial id-based pair-wise random interactions
ptheywood Dec 2, 2024
241bf7d
Tests: Fix std::TestPopulation.generateHouseholdStructures for older gcc
ptheywood Dec 2, 2024
d9e0577
Random Interactions: Initiial fully functional random daily interactions
ptheywood Dec 3, 2024
35e2368
sample data file fixup - accidentally commeted error triggering entry
ptheywood Dec 4, 2024
7a15473
Random interaction workaround based on flamegpu version
ptheywood Dec 5, 2024
bfee518
Fixup: Remove debuguing exit statement realted to flamegpu bug
ptheywood Dec 10, 2024
53b1fdb
Small world network implementation. WIP commit prior to FLAMEGPU_INIT…
ptheywood Dec 10, 2024
622fe82
Refactoring, small world networks & workarounds
ptheywood Dec 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixup: Remove debuguing exit statement realted to flamegpu bug
ptheywood committed Dec 10, 2024
commit bfee51810d9597ae280f9c9c9f82e87472e0c5e5
1 change: 0 additions & 1 deletion src/exateppabm/person.cu
Original file line number Diff line number Diff line change
@@ -324,7 +324,6 @@ FLAMEGPU_HOST_FUNCTION(updateRandomDailyNetworkIndices) {
|| strcmp(flamegpu::VERSION_PRERELEASE, "alpha.2") == 0
|| strcmp(flamegpu::VERSION_PRERELEASE, "alpha.1") == 0
|| strcmp(flamegpu::VERSION_PRERELEASE, "alpha") == 0) {
exit(1);
for (auto person : population) {
person.setVariable<flamegpu::id_t, person::MAX_RANDOM_DAILY_INTERACTIONS>(person::v::RANDOM_INTERACTION_PARTNERS, person.getVariable<flamegpu::id_t, person::MAX_RANDOM_DAILY_INTERACTIONS>(person::v::RANDOM_INTERACTION_PARTNERS));
}