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.

Sign up for GitHub

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

Jump to bottom

Activity driven model #12

Merged
merged 32 commits into from
Oct 18, 2023
Merged

Activity driven model #12

merged 32 commits into from
Oct 18, 2023

Conversation

MSallermann
Copy link
Member

No description provided.

amritagos and others added 10 commits October 9, 2023 22:51
@amritagos
Activity driven model: Init and started bare bones outline of what th…
9ebb9ed 
…e class should look like
@amritagos
Use the Mersenne-Twister engine from simulation
a038774
@MSallermann
Small fixes:
8b65bee 
- Made Agent<ActivityAgentType>::to_string inline
- and implemented dummy version of iteration()
- also started to implement initialisation of ActivityDrivenModel in
  simulation.cpp
- formatted ActivityDrivenModel.cpp
@MSallermann
ActivityDrivenModel can now be constructed in simulation.cpp
e1e6ba7
@MSallermann
removed unnecessary enum ModelType from simulation.cpp
1069111
@MSallermann
put agents_from_file declaration in model base and
b6b5487 
fixed construction of activity driven model further
@MSallermann
parse parameters for ActivityDriven model from conf
d61f107
@MSallermann
test_deGroot: removed unnecessary rng generator
be1119d
@MSallermann
example conf for activity driven model
47747db
@MSallermann
Network: added some functions plus a unit test
5479382 
- set_neighbours_and_weights()
- transpose()
@MSallermann MSallermann force-pushed the activity-driven-model branch from 903c801 to 627040c Compare October 18, 2023 13:57
amritagos and others added 19 commits October 18, 2023 14:08
@amritagos @MSallermann
model: Drawing activities from a power law model
75083b6
@MSallermann
ActivityDrivenModel: slight changes
9ead9d6
@MSallermann
meson.build: fixed typo
5fb34ed
@MSallermann
moved draw_unique_k_from_n to util/math.hpp
00c3963
@MSallermann
Network: created an overload of set_neigbhours_and_weights that sets …
59357ae 
…all neighbours to a uniform weight
@MSallermann @amritagos
WIP: iteration of activity driven model
1535606 
Co-authored-by: Amrita Goswami <[email protected]>
@MSallermann @amritagos
changed default values in activity driven model example
7802184 
Co-authored-by: Amrita Goswami <[email protected]>
@MSallermann @amritagos
Network: added a push_back_neighbour_and_weight function
988304c 
Co-authored-by: Amrita Goswami <[email protected]>
@MSallermann
ActivityDrivenModel: reciprocity
50c8cde
@MSallermann
implemented weighted reservoir sampling in util/math.hpp
9fbe749
@MSallermann
ActivityDrivenModel: implemented homophily
6b83cc6
@MSallermann
ActivityDrivenModel: fixed sign in homophily
32c2ce4
@MSallermann
moved power_law_distribution to utility/math.hpp
73c317c
@MSallermann
ActivityDrivenModel: some commment changes
9c630f8
@MSallermann
Implemented ActivityAgent::from_string
b4988d5
@MSallermann
Small comment change in math.hpp
3fab1c0
@amritagos @MSallermann
Runge kutta
f4e5307
@MSallermann
slight refactoring
94c1c16
@amritagos @MSallermann
Unit tests: Now we use catch2 inbuilt matchers
9080cf9
@MSallermann MSallermann force-pushed the activity-driven-model branch from 627040c to 0db57f4 Compare October 18, 2023 14:08
@MSallermann MSallermann merged commit e91a86b into main Oct 18, 2023
@MSallermann MSallermann deleted the activity-driven-model branch March 7, 2024 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MSallermann @amritagos