Skip to content

1239 implement temporal hybrid model#1262

Merged
HenrZu merged 28 commits intomainfrom
1239-implement-temporal-hybrid-model
Jul 1, 2025
Merged

1239 implement temporal hybrid model#1262
HenrZu merged 28 commits intomainfrom
1239-implement-temporal-hybrid-model

Conversation

@jubicker
Copy link
Member

@jubicker jubicker commented Apr 22, 2025

Changes and Information

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

  • Implemented a temporal-hybrid model that switches between two models during the simulation according to a predefined condition
  • Added a singlewell potential for the diffusive ABM
  • Implemented conversion functions for a temporal dABM-SMM hybrid model
  • Implemented conversion functions for a temporal dABM-oSECIR hybrid model
  • Added tests for new functionality
  • Added example for temporal dABM-oSECIR hybrid model

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 #1239

@jubicker jubicker self-assigned this Apr 22, 2025
@jubicker jubicker linked an issue Apr 22, 2025 that may be closed by this pull request
2 tasks
@codecov
Copy link

codecov bot commented Apr 23, 2025

Codecov Report

Attention: Patch coverage is 96.85039% with 8 lines in your changes missing coverage. Please review.

Project coverage is 97.26%. Comparing base (6c83abd) to head (9cc932b).

Files with missing lines Patch % Lines
cpp/models/hybrid/conversion_functions.cpp 95.78% 4 Missing ⚠️
cpp/memilio/data/analyze_result.h 96.29% 2 Missing ⚠️
cpp/models/d_abm/single_well.h 97.10% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1262      +/-   ##
==========================================
- Coverage   97.28%   97.26%   -0.02%     
==========================================
  Files         168      171       +3     
  Lines       14858    15117     +259     
==========================================
+ Hits        14454    14704     +250     
- Misses        404      413       +9     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jubicker jubicker requested a review from HenrZu April 28, 2025 13:53
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.

Looks really good. Some comments, but most of them are rather short :)

jubicker and others added 3 commits June 18, 2025 08:49
Co-authored-by: Henrik Zunker <69154294+HenrZu@users.noreply.github.com>
@jubicker jubicker requested a review from HenrZu June 18, 2025 09:19
jubicker and others added 5 commits June 26, 2025 08:42
Co-authored-by: Henrik Zunker <69154294+HenrZu@users.noreply.github.com>
Co-authored-by: Henrik Zunker <69154294+HenrZu@users.noreply.github.com>
@HenrZu HenrZu merged commit 27c9ce8 into main Jul 1, 2025
55 of 57 checks passed
@HenrZu HenrZu deleted the 1239-implement-temporal-hybrid-model branch July 1, 2025 09:21
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 temporal-hybrid model

2 participants