Skip to content

364 create abm simulation with percentiles output#572

Merged
xsaschako merged 118 commits intomainfrom
364-create-abm-simulation-with-percentiles-output
Oct 20, 2023
Merged

364 create abm simulation with percentiles output#572
xsaschako merged 118 commits intomainfrom
364-create-abm-simulation-with-percentiles-output

Conversation

@khoanguyen-dev
Copy link
Member

@khoanguyen-dev khoanguyen-dev commented Feb 10, 2023

Merge Request - GuideLine Checklist

Guideline to check code before resolve WIP and approval, respectively.
As many checkboxes as possible should be ticked.

Checks by code author:

Always to be checked:

If functions were changed or functionality was added:

  • Tests for new functionality has been added
  • A local test was succesful

If new functionality was added:

  • There is appropriate documentation of your work. (use doxygen style comments)

If new third party software is used:

  • Did you pay attention to its license? Please remember to add it to the wiki after successful merging.

If new mathematical methods or epidemiological terms are used:

  • Are new methods referenced? Did you provide further documentation? Has the glossary been updated?

The following questions are addressed in the documentation if need be:

  • Developers (what did you do?, how can it be maintained?)

  • For users (how to use your work?)

  • For admins (how to install and configure your work?)

  • For documentation: Please write or update the Readme in the current working directory!

Checks by code reviewer(s):

  • Is the code clean of development artifacts e.g., unnecessary comments, prints, ...
  • The ticket goals for each associated issue are reached or problems are clearly addressed (i.e., a new issue was introduced).
  • There are appropriate unit tests and they pass.
  • The git history is clean and linearized for the merge request. All reviewers should squash commits and write a simple and meaningful commit message.
  • Coverage report for new code is acceptable.

Closes #364

@khoanguyen-dev khoanguyen-dev linked an issue Feb 10, 2023 that may be closed by this pull request
@codecov-commenter
Copy link

codecov-commenter commented Feb 10, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b42bbe9) 95.01% compared to head (9c3c1e6) 95.25%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #572      +/-   ##
==========================================
+ Coverage   95.01%   95.25%   +0.24%     
==========================================
  Files         112      113       +1     
  Lines        8800     9103     +303     
==========================================
+ Hits         8361     8671     +310     
+ Misses        439      432       -7     
Files Coverage Δ
cpp/models/abm/analyze_result.h 100.00% <100.00%> (ø)
cpp/models/abm/household.cpp 100.00% <100.00%> (ø)
cpp/models/abm/household.h 89.28% <100.00%> (ø)
cpp/models/abm/infection.cpp 97.54% <100.00%> (ø)
cpp/models/abm/infection.h 100.00% <100.00%> (ø)
cpp/models/abm/location.cpp 94.89% <100.00%> (+0.57%) ⬆️
cpp/models/abm/location.h 97.36% <100.00%> (+1.45%) ⬆️
cpp/models/abm/location_type.h 100.00% <ø> (ø)
cpp/models/abm/lockdown_rules.cpp 100.00% <100.00%> (ø)
cpp/models/abm/mask.cpp 100.00% <ø> (ø)
... and 18 more

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@DavidKerkmann DavidKerkmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a complete review, just some quick comments about important parts.

Copy link
Member

@xsaschako xsaschako left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just looked breifly into it.
I understand we need to be more flexible in regards to age groups but we shouldn't hardcode specific things.

After a discussion with martin we maybe should have something like an object where you can define specific age groups. This object would help to identify age groups for certain rules, e.g. who goes to school etc..

We can discuss this next week (i'm not there on tuesday), or feel free to contact me :-)

@SciCompMod SciCompMod deleted a comment from xsaschako Mar 24, 2023
Copy link
Member

@DavidKerkmann DavidKerkmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @khoanguyen-dev for the amount of work and all the changes!
In particular, a lot of improvements have been made that go beyond what was intended for this issue.

I have finally complete the full review with some requests and open discussion points.
These include some small comments for the tests and the copy operations and some medium sized changes for the percentile computations/parameter ensemble. Please wait with working on the points that mention a discussion before we have decided how to proceed.

Copy link
Member

@DavidKerkmann DavidKerkmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the quick changes! I have a couple of follow-up questions and some more change requests for the analyze_result. Feel free to contact me if you have any questions.

@mknaranja
Copy link
Member

Great commitment @DavidKerkmann and @khoanguyen-dev. I get this bunch of notifications about change requests and changes, it is a pity that I do not find the time but you are doing great work! Just to leave this note :)

Copy link
Member

@DavidKerkmann DavidKerkmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All questions have been resolved or have been addressed in another issue.

Copy link
Member

@xsaschako xsaschako left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good from my side

@xsaschako xsaschako dismissed mknaranja’s stale review October 20, 2023 10:32

changes have been made and corrected, no time for re-review

@xsaschako xsaschako merged commit fef7ce3 into main Oct 20, 2023
@xsaschako xsaschako deleted the 364-create-abm-simulation-with-percentiles-output branch October 20, 2023 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Create ABM simulation with percentiles output

8 participants