pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introducing _ExpirationBase and MultipleExpiration classes; adapting tests and model_generator accordingly (removing now obsolete expiration_blend function)

Browse source
This commit is contained in:
Nicolas Mounet 2021-05-27 13:40:46 +02:00 committed by Phil Elson
parent 95640cb5be
commit de5e96fd0f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cara/models.py
View file

@ -572,8 +572,8 @@ class _ExpirationBase:
#: Pre-populated examples of Masks.
types: typing.ClassVar[typing.Dict[str, "_ExpirationBase"]]
def aerosols(self, mask: Mask):
# total volume of aerosols expired per volume of air (mL/cm^3).
def aerosols(self, mask: _MaskBase):
# total volume of aerosols expired (cm^3).
raise NotImplementedError("Subclass must implement")
@ -617,7 +617,7 @@ class MultipleExpiration(_ExpirationBase):
raise ValueError("expirations and weigths should contain the"
"same number of elements")
def aerosols(self, mask: Mask):
def aerosols(self, mask: _MaskBase):
return np.array([
weight * expiration.aerosols(mask) / sum(self.weights)
for weight,expiration in zip(self.weights,self.expirations)