Skip to content

326 add extensive testing scheme to abm modell#334

Merged
mknaranja merged 31 commits intomainfrom
326-add-extensive-testing-scheme-to-abm-modell
Sep 28, 2022
Merged

326 add extensive testing scheme to abm modell#334
mknaranja merged 31 commits intomainfrom
326-add-extensive-testing-scheme-to-abm-modell

Conversation

@DavidKerkmann
Copy link
Member

@DavidKerkmann DavidKerkmann commented Aug 1, 2022

Merge Request - GuideLine Checklist

Guideline to check code before resolve WIP and approval, respectively.
As many checkboxes as possible should be ticked.

Checks by code author:

  • There is at least one issue associated with the pull request.
  • The branch follows the naming conventions as defined in the git workflow.
  • New code adheres with the coding guidelines
  • Tests for new functionality has been added
  • A local test was succesful
  • There is appropriate documentation of your work. (use doxygen style comments)
  • If new third party software is used, did you pay attention to its license? Please remember to add it to the wiki after successful merging.
  • If new mathematical methods or epidemiological terms are used, has the glossary been updated ? Did you provide further documentation ?
    is present or referenced. Please provide your references.
  • The following questions are addressed in the documentation*: Developers (what did you do?, how can it be maintained?), For users (how to use your work?), For admins (how to install and configure your work?)
  • For documentation: Please write or update the Readme in the current working directory!

Checks by code reviewer(s):

  • Is the code clean of development artifacts e.g., unnecessary comments, prints, ...
  • The ticket goals for each associated issue are reached or problems are clearly addressed (i.e., a new issue was introduced).
  • There are appropriate unit tests and they pass.
  • The git history is clean and linearized for the merge request.
  • Coverage report for new code is acceptable.

closes #326, closes #368

@DavidKerkmann DavidKerkmann added class::feature A feature to be implemented for some part of the software prio::high The priority of this task is high. loc::backend This issue concerns the C++ backend implementation. model::abm This issue concerns any kind of agent-based model. labels Aug 1, 2022
@DavidKerkmann DavidKerkmann requested a review from mknaranja August 1, 2022 16:31
@DavidKerkmann DavidKerkmann linked an issue Aug 1, 2022 that may be closed by this pull request
@DavidKerkmann
Copy link
Member Author

DavidKerkmann commented Aug 1, 2022

Since we both implemented certain parts of the test, we need to decide on one implementation and remove the other one (TestingScheme & TestingRule vs. TestingSet).

@xsaschako xsaschako marked this pull request as ready for review August 10, 2022 10:53
@mknaranja
Copy link
Member

@DavidKerkmann @xsaschako Could you please ensure that the code coverage runs? I think there are still untested lines and it would be good to have the coverage. It needs test-py-epidata. Maybe you need to merge the current main for that?

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 really like the new implementation, thanks a lot @DavidKerkmann and @xsaschako. There is only one major issue: To my understanding there is always only one TestingScheme at a time (see certain comments). Currently there is no error handling for overlapping schemes etc

Maybe a better solution for std::vector testing_schemes could be given by our dampings implementation, i.e, a vector of pairs which a formed by a scheme and a start day. The scheme that has the highest start_day < t (with t the current time) is then always active.

Certain minor issues also given in the comments.

Copy link
Member

@xsaschako xsaschako left a comment

Choose a reason for hiding this comment

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

Major issue with one object managing the testing schemes got added.
There are some tests missing

@xsaschako xsaschako requested review from mknaranja and xsaschako and removed request for mknaranja and xsaschako September 2, 2022 10:17
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.

In https://github.com/DLR-SC/memilio/blob/326-add-extensive-testing-scheme-to-abm-modell/cpp/models/abm/location.h#L189 we have

LocalInfectionParameters m_parameters;

Do we need this as well as their getters anymore?

Missing unit test review.

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.

only one comment/question

@mknaranja
Copy link
Member

mknaranja commented Sep 16, 2022

@DavidKerkmann What s the status? :)

@DavidKerkmann
Copy link
Member Author

DavidKerkmann commented Sep 22, 2022

Closes #368 with the last change to run_strategy.

@DavidKerkmann
Copy link
Member Author

@DavidKerkmann What s the status? :)

Should be good to go. Only a download test fails, which we didn't touch.

@xsaschako xsaschako requested a review from mknaranja September 23, 2022 08:14
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.

Two minor changes required or to be denied with a reason, then we can finally merge it :)

@mknaranja mknaranja merged commit ea5ead1 into main Sep 28, 2022
@mknaranja mknaranja deleted the 326-add-extensive-testing-scheme-to-abm-modell branch September 28, 2022 08:42
@xsaschako xsaschako added this to the ABM v0.1 milestone Sep 29, 2022
@xsaschako xsaschako removed this from the ABM v0.1 milestone Oct 28, 2022
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::backend This issue concerns the C++ backend implementation. model::abm This issue concerns any kind of agent-based model. prio::high The priority of this task is high.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Not allowed to go home when testing at home Add extensive Testing Scheme to ABM-modell

4 participants