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

892 implement simple lct model #915

Merged
merged 11 commits into from
Feb 14, 2024
Merged

Conversation

lenaploetzke
Copy link
Member

@lenaploetzke lenaploetzke commented Feb 2, 2024

Changes and Information

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

  • Added simple version of the lct secir model with related example and test.

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
  • 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 #892.

@lenaploetzke lenaploetzke added class::feature A feature to be implemented for some part of the software prio::high The priority of this task is high. loc::infrastructure General MEmilio Infrastructure related issues model::lct Models using the linear chain trick labels Feb 2, 2024
@lenaploetzke lenaploetzke self-assigned this Feb 2, 2024
@lenaploetzke lenaploetzke linked an issue Feb 2, 2024 that may be closed by this pull request
2 tasks
Copy link

codecov bot commented Feb 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6391c30) 95.88% compared to head (77afdda) 95.99%.
Report is 7 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #915      +/-   ##
==========================================
+ Coverage   95.88%   95.99%   +0.11%     
==========================================
  Files         118      124       +6     
  Lines        9397     9674     +277     
==========================================
+ Hits         9010     9287     +277     
  Misses        387      387              

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

@lenaploetzke lenaploetzke added the status::in review This issues is in review. label Feb 5, 2024
@lenaploetzke lenaploetzke requested a review from HenrZu February 5, 2024 15:21
lenaploetzke and others added 3 commits February 6, 2024 08:04
Co-authored-by: Martin J. Kühn <[email protected]>
Co-authored-by: Martin J. Kühn <[email protected]>
Co-authored-by: Martin J. Kühn <[email protected]>
Copy link
Contributor

@HenrZu HenrZu left a comment

Choose a reason for hiding this comment

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

Nice, good work :)

cpp/examples/lct_secir.cpp Show resolved Hide resolved
cpp/examples/lct_secir.cpp Outdated Show resolved Hide resolved
cpp/examples/lct_secir.cpp Outdated Show resolved Hide resolved
cpp/models/lct_secir/README.md Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/model.cpp Outdated Show resolved Hide resolved
cpp/models/lct_secir/model.cpp Outdated Show resolved Hide resolved
cpp/models/lct_secir/model.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/model.h Show resolved Hide resolved
cpp/models/lct_secir/simulation.cpp Outdated Show resolved Hide resolved
@HenrZu
Copy link
Contributor

HenrZu commented Feb 6, 2024

@mknaranja I think this PR can lead to issues with PR #894. Do we wait until this is merged?

@mknaranja
Copy link
Member

@HenrZu @lenaploetzke We should advance both pull requests with review (and adaptations) at the same time and for the one to be merged later we should combine forces to not put to much on the shoulder of the persons who comes second ;)

@lenaploetzke lenaploetzke requested a review from HenrZu February 13, 2024 13:55
HenrZu
HenrZu previously requested changes Feb 14, 2024
cpp/examples/lct_secir.cpp Outdated Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Show resolved Hide resolved
Copy link
Member

@annawendler annawendler 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! I made some comments, mainly regarding notation.

cpp/examples/lct_secir.cpp Outdated Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/model.h Outdated Show resolved Hide resolved
cpp/models/lct_secir/model.h Outdated Show resolved Hide resolved
@lenaploetzke lenaploetzke requested a review from HenrZu February 14, 2024 11:09
Copy link
Member

@annawendler annawendler left a comment

Choose a reason for hiding this comment

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

No further comments from my side :)

cpp/examples/lct_secir.cpp Outdated Show resolved Hide resolved
cpp/examples/lct_secir.cpp Outdated Show resolved Hide resolved
cpp/examples/lct_secir.cpp Outdated Show resolved Hide resolved
cpp/examples/lct_secir.cpp Show resolved Hide resolved
cpp/models/lct_secir/infection_state.h Outdated Show resolved Hide resolved
@mknaranja mknaranja merged commit 5bef2c8 into main Feb 14, 2024
55 checks passed
@mknaranja mknaranja deleted the 892-implement-simple-lct-model branch February 14, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
class::feature A feature to be implemented for some part of the software loc::infrastructure General MEmilio Infrastructure related issues model::lct Models using the linear chain trick prio::high The priority of this task is high. status::in review This issues is in review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement simple LCT model
4 participants