Skip to content

1530 enable mutiple types for the same location and assignment of multiple locations of one type - #1548

Merged
DavidKerkmann merged 18 commits into
mainfrom
1530-enable-mutiple-types-for-the-same-location-and-assignment-of-multiple-locations-of-one-type
Nov 2, 2026
Merged

DavidKerkmann merged 18 commits into
mainfrom
1530-enable-mutiple-types-for-the-same-location-and-assignment-of-multiple-locations-of-one-type

Conversation

@jubicker

@jubicker jubicker commented Apr 23, 2026 •

Copy link
Copy Markdown
Member

Changes and Information

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

  • Introduce ActivityType and make location assigment for agents dependent on ActivityType rather than on LocationType
  • Implemement possibility to habe multiple locations of the same ActivityType assigned

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 within the code (Doxygen) for new functionality has been added in the code.
  • Appropriate external documentation (ReadTheDocs) for new functionality has been added to the online documentation and checked in the preview.
  • 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 #1530

@DavidKerkmann DavidKerkmann left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks, I don't have much to criticize.
One could think about adding a few teacher to the minimal example such that location_type and activity_type are different. There should be a small test that covers this possibility in any case.

Comment thread cpp/models/abm/person.cpp Resolved
Comment thread cpp/models/abm/person.cpp Resolved
@codecov

codecov Bot commented Jun 5, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 97.54%. Comparing base (4c83297) to head (bb388f6).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1548      +/-   ##
==========================================
+ Coverage   97.48%   97.54%   +0.06%     
==========================================
  Files         190      190              
  Lines       16033    16023      -10     
==========================================
  Hits        15630    15630              
+ Misses        403      393      -10     

☔ View full report in Codecov by Harness.
📢 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 commented Jun 9, 2026 •

Copy link
Copy Markdown
Member Author

Benchmarks:

Main:

---------------------------------------------------------------------------
Benchmark                                 Time             CPU   Iterations
---------------------------------------------------------------------------
abm_benchmark/abm_benchmark_50k        5867 ms         5846 ms            1
abm_benchmark/abm_benchmark_100k      15444 ms        15406 ms            1
abm_benchmark/abm_benchmark_200k      33631 ms        33614 ms            1

Branch:

---------------------------------------------------------------------------
Benchmark                                 Time             CPU   Iterations
---------------------------------------------------------------------------
abm_benchmark/abm_benchmark_50k        6556 ms         6555 ms            1
abm_benchmark/abm_benchmark_100k      17026 ms        17024 ms            1
abm_benchmark/abm_benchmark_200k      32771 ms        32767 ms            1

@jubicker
jubicker requested review from DavidKerkmann and removed request for DavidKerkmann June 9, 2026 07:36
@DavidKerkmann
DavidKerkmann merged commit 532ba98 into main Nov 2, 2026
64 checks passed
@DavidKerkmann
DavidKerkmann deleted the 1530-enable-mutiple-types-for-the-same-location-and-assignment-of-multiple-locations-of-one-type branch November 2, 2026 12: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.

Enable mutiple types for the same location and assignment of multiple locations of one type

2 participants