Skip to content

496 Implement deterioration of mask with mask time used#1043

Closed
khoanguyen-dev wants to merge 6 commits intomainfrom
496-implement-deterioration-of-mask-with-mask-time-used
Closed

496 Implement deterioration of mask with mask time used#1043
khoanguyen-dev wants to merge 6 commits intomainfrom
496-implement-deterioration-of-mask-with-mask-time-used

Conversation

@khoanguyen-dev
Copy link
Member

@khoanguyen-dev khoanguyen-dev commented May 27, 2024

Changes and Information

Please briefly list the changes (main added features, changed items, or corrected bugs) made:

  • Change MaskProtection in Parameters to linear_interpolation_of_data_set
  • Set initial values of MaskProtection in simulations/abm.cpp
  • Fix relevant tests

If need be, add additional information and what the reviewer should look out for in particular:

Merge Request - Guideline Checklist

Please check our git workflow. Use the draft feature if the Pull Request is not yet ready to review.

Checks by code author

  • Every addressed issue is linked (use the "Closes #ISSUE" keyword below)
  • New code adheres to coding guidelines
  • No large data files have been added (files should in sum not exceed 100 KB, avoid PDFs, Word docs, etc.)
  • Tests are added for new functionality and a local test run was successful (with and without OpenMP)
  • Appropriate documentation for new functionality has been added (Doxygen in the code and Markdown files if necessary)
  • Proper attention to licenses, especially no new third-party software with conflicting license has been added
  • (For ABM development) Checked benchmark results and ran and posted a local test above from before and after development to ensure performance is monitored.

Checks by code reviewer(s)

  • Corresponding issue(s) is/are linked and addressed
  • Code is clean of development artifacts (no deactivated or commented code lines, no debugging printouts, etc.)
  • Appropriate unit tests have been added, CI passes, code coverage and performance is acceptable (did not decrease)
  • No large data files added in the whole history of commits(files should in sum not exceed 100 KB, avoid PDFs, Word docs, etc.)
  • On merge, add 2-5 lines with the changes (main added features, changed items, or corrected bugs) to the merge-commit-message. This can be taken from the briefly-list-the-changes above (best case) or the separate commit messages (worst case).

Closes #496

@khoanguyen-dev khoanguyen-dev linked an issue May 27, 2024 that may be closed by this pull request
@codecov
Copy link

codecov bot commented May 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.23%. Comparing base (9cf30ee) to head (e3281e0).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1043      +/-   ##
==========================================
- Coverage   96.24%   96.23%   -0.01%     
==========================================
  Files         127      127              
  Lines       10887    10868      -19     
==========================================
- Hits        10478    10459      -19     
  Misses        409      409              

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

@khoanguyen-dev khoanguyen-dev changed the title 496 Change MaskProtection in Parameters to linear_interpolation_of_data_set 496 Implement deterioration of mask with mask time used Jul 11, 2024
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.

Nothing to change necessarily, just two comments to think about. Make of them what you feel is best!

/**
* @brief Effectiveness of a Mask of a certain MaskType% against an Infection% for the mask wearer.
*/
struct InwardMaskProtection {
Copy link
Member

Choose a reason for hiding this comment

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

Keep in mind that this might have the same problems as the defaults for the protection levels in issue #1068 .

}
}

if (this->get<MaskProtection>()[MaskType::Community] < 0.0 ||
Copy link
Member

Choose a reason for hiding this comment

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

Instead of checking these fix values, we could check for some reasonable time point arguments to the function if the result is between 0 and 1. Just an idea though for you to think about.

@xsaschako xsaschako closed this Aug 13, 2024
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.

Implement deterioration of mask with mask time used

3 participants