Skip to content

Commit

Permalink
Mixing model (#14)
Browse files Browse the repository at this point in the history
* Adding entities back

* Draft of entities model

* Adding function to sample from contact matrix more efficiently

* Sampler

* Adding mixing matrix! Still need to set dist_ent without replacement

* Moving group sampler to its own

* Adding function to distribute entities based on data

* Renaming model

* Adding idea about how to sample more efficiently

* Working on algorithm to speed up [skip ci]

* Working on mixing doc [skip ci]

* Solved issue about sampling

* Good progress, need testing [skip ci]

* Example with mixing (new algo) running

* Test transmitting from one group to another almost done!

* Adding missing test file

* Adding tests for the SEIR mixing model

* Updating version of epiworld

* Adding the SIRMixing model + tests
  • Loading branch information
gvegayon authored Apr 27, 2024
1 parent 3e11650 commit cf9c8eb
Show file tree
Hide file tree
Showing 29 changed files with 3,523 additions and 236 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ examples/*/*
!*.cpp
.Rproj.user
.Rhistory
tests
tests/*
!tests/
!tests/*.cpp
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,11 @@
"cfenv": "cpp",
"cinttypes": "cpp"
},
"intel-corporation.oneapi-analysis-configurator.binary-path": "/home/george/Documents/development/epiworld/tests/01c.o"
"intel-corporation.oneapi-analysis-configurator.binary-path": "/home/george/Documents/development/epiworld/tests/01c.o",
"grammarly.selectors": [
{
"language": "quarto",
"scheme": "file"
}
]
}
Loading

0 comments on commit cf9c8eb

Please sign in to comment.