Skip to content

Conversation

@nijawa
Copy link
Contributor

@nijawa nijawa commented May 31, 2024

Changes and Information

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

  • Added stochastic two variant seir model
  • Added example for this model

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).

@nijawa nijawa linked an issue May 31, 2024 that may be closed by this pull request
2 tasks
@nijawa nijawa requested a review from reneSchm June 4, 2024 05:31
@nijawa
Copy link
Contributor Author

nijawa commented Jun 4, 2024

Hey @reneSchm magst du dir das mal anschauen? Sollte im Grunde einfach nur ein neues Modell sein, die meisten Sachen sind quasi "copy and paste"

Copy link
Member

@reneSchm reneSchm left a comment

Choose a reason for hiding this comment

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

There are several issues caused by the copy/paste that need to be fixed.

Please merge the main branch as soon as possible.

Please add tests for the new model. You can look at the other SDE model tests, e.g. cpp/tests/test_sde_sirs.cpp. Note that the parameters for those tests are chosen such that a the derivative can be easily computed by hand, but is not trivial.

nijawa and others added 4 commits June 23, 2024 10:59
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
- Changed name of the model from seir2v to seirvv
-Started working on new Readme file
- Fixed Copy and paste errors (SIR references changed to SEIRVV)
- Fixed Comments
- Fixed Parameters in example
@nijawa

This comment was marked as resolved.

nijawa added 4 commits June 23, 2024 13:14
- Fixed parameter names in parameters.h
- continued working on readme
Changed Model Name from sseir2v to sseirvv to be consistent with notation
@codecov
Copy link

codecov bot commented Jul 3, 2024

Codecov Report

Attention: Patch coverage is 96.87500% with 6 lines in your changes missing coverage. Please review.

Project coverage is 96.43%. Comparing base (8889b81) to head (caf756e).
Report is 2 commits behind head on main.

Files Patch % Lines
cpp/models/sde_seirvv/simulation.h 84.21% 6 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1047      +/-   ##
==========================================
+ Coverage   96.14%   96.43%   +0.29%     
==========================================
  Files         131      135       +4     
  Lines       11049    11253     +204     
==========================================
+ Hits        10623    10852     +229     
+ Misses        426      401      -25     

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

@nijawa nijawa requested a review from reneSchm July 16, 2024 13:08
Copy link
Member

@reneSchm reneSchm left a comment

Choose a reason for hiding this comment

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

There are still some remnants of copy-pasting code, and some comments from my previous review were not addressed.

nijawa and others added 7 commits July 22, 2024 08:21
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Exchanged double with ScalarType,
on top of that cleaned up some code according to comments in review
…l' of https://github.com/SciCompMod/memilio into 1032-implementation-of-stochastic-two-variant-seir-model
@nijawa nijawa requested a review from reneSchm July 31, 2024 10:19
Copy link
Member

@mknaranja mknaranja left a comment

Choose a reason for hiding this comment

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

I think most and important points have been addressed through @reneSchm 's reviews, I just have some minor comments, mostly on documentation. Thank you @nijawa.

Copy link
Member

@reneSchm reneSchm left a comment

Choose a reason for hiding this comment

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

The example needs a little bit more polish, but I think this can be merged soon.

nijawa and others added 9 commits August 4, 2024 10:31
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Co-authored-by: Martin J. Kühn <62713180+mknaranja@users.noreply.github.com>
Co-authored-by: Martin J. Kühn <62713180+mknaranja@users.noreply.github.com>
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Moved comment to the proper place
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
…l' of https://github.com/SciCompMod/memilio into 1032-implementation-of-stochastic-two-variant-seir-model
Changed Variable names and fixed some spelling errors
nijawa and others added 2 commits August 5, 2024 19:29
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
Co-authored-by: reneSchm <49305466+reneSchm@users.noreply.github.com>
@nijawa nijawa requested a review from reneSchm August 5, 2024 17:31
Copy link
Member

@reneSchm reneSchm left a comment

Choose a reason for hiding this comment

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

Okay, I'd say this is looking good now. Thank you @nijawa for implementing this model!

@reneSchm reneSchm merged commit f864b19 into main Aug 6, 2024
@reneSchm reneSchm deleted the 1032-implementation-of-stochastic-two-variant-seir-model branch August 6, 2024 07:02
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.

Implementation of stochastic two-variant SEIR model

4 participants