-
Notifications
You must be signed in to change notification settings - Fork 16
501 Add Intervention Scheme for ABM #795
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
Draft
DavidKerkmann
wants to merge
2
commits into
main
Choose a base branch
from
501-add-intervention-scheme-for-abm
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,5 +40,6 @@ | |
#include "abm/age.h" | ||
#include "abm/household.h" | ||
#include "abm/lockdown_rules.h" | ||
#include "abm/npi.h" | ||
|
||
#endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,149 @@ | ||
/* | ||
* Copyright (C) 2020-2023 German Aerospace Center (DLR-SC) | ||
* | ||
* Authors: David Kerkman | ||
* | ||
* Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de> | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#include "abm/npi.h" | ||
#include "abm/person.h" | ||
#include "abm/location.h" | ||
|
||
namespace mio | ||
{ | ||
namespace abm | ||
{ | ||
|
||
struct AcceptBaseStringency : AcceptBase { | ||
AcceptBaseStringency() = default; | ||
AcceptBaseStringency(double strin) | ||
: stringency(strin) | ||
{ | ||
} | ||
double stringency = 1.; | ||
}; | ||
|
||
/** | ||
* @brief NPI to require the usage of masks for entering the Location. | ||
*/ | ||
struct MaskRequired : AcceptBaseStringency { | ||
|
||
MaskRequired(MaskType mt) | ||
: mask_type(mt) | ||
{ | ||
} | ||
|
||
MaskRequired(MaskType mt, double strin) | ||
: AcceptBaseStringency(strin) | ||
, mask_type(mt) | ||
{ | ||
} | ||
|
||
bool operator()(Person::RandomNumberGenerator& rng, const Person& p, const Location& loc, TimePoint /*t*/) override | ||
{ | ||
return p.apply_mask_intervention(rng, loc); | ||
} | ||
|
||
MaskType mask_type; | ||
}; | ||
|
||
/** | ||
* @brief NPI to set the maximum capacity for entering for the Location. Use 0 for a complete shutdown. | ||
*/ | ||
struct CapacityAbsolute : AcceptBaseStringency { | ||
|
||
CapacityAbsolute(uint32_t cap) | ||
: capacity(cap) | ||
{ | ||
} | ||
|
||
CapacityAbsolute(uint32_t cap, double strin) | ||
: AcceptBaseStringency(strin) | ||
, capacity(cap) | ||
{ | ||
} | ||
|
||
bool operator()(Person::RandomNumberGenerator& /*rng*/, const Person& /*p*/, const Location& loc, | ||
TimePoint /*t*/) override | ||
{ | ||
return loc.get_number_persons() < capacity; | ||
} | ||
|
||
uint32_t capacity; | ||
}; | ||
|
||
/** | ||
* @brief NPI to set the relative capacity change for entering the Location. Use 0 for a complete shutdown. | ||
*/ | ||
struct CapacityRelative : AcceptBaseStringency { | ||
|
||
CapacityRelative(double cap_fac) | ||
: capacity_factor(cap_fac) | ||
{ | ||
} | ||
|
||
CapacityRelative(double cap_fac, double strin) | ||
: AcceptBaseStringency(strin) | ||
, capacity_factor(cap_fac) | ||
{ | ||
} | ||
|
||
bool operator()(Person::RandomNumberGenerator& /*rng*/, const Person& /*p*/, const Location& loc, | ||
TimePoint /*t*/) override | ||
{ | ||
return loc.get_number_persons() < capacity_factor * loc.get_capacity().persons; | ||
} | ||
|
||
double capacity_factor; | ||
}; | ||
|
||
/** | ||
* @brief NPI to set the required tests for entering the Location. | ||
*/ | ||
struct TestRequired : AcceptBaseStringency { | ||
|
||
TestRequired(TestingScheme& ts) | ||
: testing_scheme(&ts) | ||
{ | ||
} | ||
|
||
TestRequired(TestingScheme& ts, double strin) | ||
: AcceptBaseStringency(strin) | ||
, testing_scheme(&ts) | ||
{ | ||
} | ||
|
||
bool operator()(Person::RandomNumberGenerator& rng, const Person& p, const Location& loc, TimePoint t) override | ||
{ | ||
return testing_scheme->run_scheme(rng, p, loc, t); | ||
} | ||
|
||
TestingScheme* testing_scheme; | ||
}; | ||
|
||
struct NPISet : AcceptBase { | ||
LocationNPI mask{AcceptBase{}}; | ||
LocationNPI capacity{AcceptBase{}}; | ||
LocationNPI test{AcceptBase{}}; | ||
|
||
bool operator()(Person::RandomNumberGenerator& rng, const Person& p, const Location& loc, TimePoint t) override | ||
{ | ||
return mask(rng, p, loc, t) && capacity(rng, p, loc, t) && test(rng, p, loc, t); | ||
} | ||
}; | ||
|
||
} // namespace abm | ||
} // namespace mio |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* Copyright (C) 2020-2023 German Aerospace Center (DLR-SC) | ||
* & Helmholtz Centre for Infection Research (HZI) | ||
* | ||
* Authors: David Kerkmann | ||
* | ||
* Contact: Martin J. Kuehn <Martin.Kuehn@DLR.de> | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
#ifndef EPI_ABM_NPI_H | ||
#define EPI_ABM_NPI_H | ||
|
||
#include <functional> | ||
#include "abm/mask_type.h" | ||
#include "abm/time.h" | ||
#include "abm/testing_strategy.h" | ||
#include "memilio/utils/random_number_generator.h" | ||
|
||
namespace mio | ||
{ | ||
namespace abm | ||
{ | ||
|
||
/** | ||
* TODO: Template everything with variable arguments. | ||
* TODO: Probably remove std::function for better efficiency and access to final NPI data members. | ||
*/ | ||
class Location; | ||
class Person; | ||
using LocationNPIStrategy = | ||
std::function<bool(Person::RandomNumberGenerator&, const Person&, const Location&, TimePoint)>; | ||
|
||
/** | ||
* @brief Base NPI to always allow entrance. | ||
*/ | ||
struct AcceptBase { | ||
virtual ~AcceptBase() = default; | ||
virtual bool operator()(Person::RandomNumberGenerator&, const Person&, const Location&, TimePoint) | ||
{ | ||
return true; | ||
} | ||
}; | ||
|
||
} // namespace abm | ||
} // namespace mio | ||
|
||
#endif //EPI_ABM_NPI_H |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.