Skip to content

1250 enhance testing logic in abm #1276

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

Open
wants to merge 25 commits into
base: main
Choose a base branch
from

Conversation

xsaschako
Copy link
Member

@xsaschako xsaschako commented May 15, 2025

Changes and Information

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

  • Enhance logic, readability and access time
  • Simplify: dont update activity status -> error prone and not better runtime

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

@xsaschako xsaschako linked an issue May 15, 2025 that may be closed by this pull request
2 tasks
@xsaschako xsaschako marked this pull request as ready for review May 16, 2025 11:44
@xsaschako xsaschako requested a review from Copilot May 16, 2025 11:44
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR enhances the testing logic for the ABM by simplifying testing criteria, updating the API for testing schemes, and improving serialization. Key changes include:

  • Replacing previous testing scheme APIs (e.g. run_scheme) with new methods (run_scheme_and_check_if_test_positive and is_active with time parameter).
  • Updating functions to add testing schemes by location type or id.
  • Adapting tests and serialization accordingly.

Reviewed Changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
cpp/tests/test_abm_testing_strategy.cpp Refactored test cases to use new testing scheme API and updated evaluation logic.
cpp/tests/test_abm_serialization.cpp Updated reference JSON keys to match the new serialization format.
cpp/tests/test_abm_model.cpp Modified test scenarios to use the new location-based testing scheme assignment.
cpp/models/graph_abm/graph_abmodel.h Updated testing scheme call to use the new run_strategy_and_check_if_entry_allowed API.
cpp/models/abm/testing_strategy.h Removed outdated functions and updated API for adding testing schemes.
cpp/models/abm/testing_strategy.cpp Changes to testing scheme activation and strategy evaluation logic.
cpp/models/abm/model.cpp Modified integration of testing strategy in mobility methods.
cpp/benchmarks/abm.cpp Replaced old API calls with the new testing scheme API for location types.

Copy link

codecov bot commented May 19, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.23%. Comparing base (b6f044d) to head (91fb8ba).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1276      +/-   ##
==========================================
- Coverage   97.28%   97.23%   -0.05%     
==========================================
  Files         168      168              
  Lines       14858    14836      -22     
==========================================
- Hits        14454    14426      -28     
- Misses        404      410       +6     

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

// the Person cannot move if the performed TestingStrategy is positive
if (!m_testing_strategy.run_strategy(personal_rng, person, target_location, t)) {
// The person cannot move if he has a positive test result
if(!m_testing_strategy.run_strategy_and_check_if_entry_allowed(personal_rng, person, target_location, t)){
Copy link
Member Author

@xsaschako xsaschako May 19, 2025

Choose a reason for hiding this comment

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

Shorten function names and maybe improve documentation

@xsaschako xsaschako requested a review from DavidKerkmann June 21, 2025 14:30
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.

Enhance testing logic in abm
1 participant