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

Adding transition_times method to Ventilation, and changing Model class accordingly

Browse source
This commit is contained in:
Nicolas Mounet 2020-11-05 09:52:58 +01:00
parent f9335710b6
commit ec98687233
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cara/models.py
View file

@ -155,6 +155,9 @@ class Ventilation:
#: The times at which the air exchange is taking place.
active: Interval
def transition_times(self):
return self.active.transition_times()
@abstractmethod
def air_exchange(self, room: Room, time: float) -> float:
"""
@ -183,6 +186,12 @@ class WindowOpening(Ventilation):
cd_b: float = 0.6 #: Discharge coefficient: what portion effective area is used to exchange air (0 <= cd_b <= 1)
def transition_times(self):
transitions = super().transition_times()
transitions.update(self.inside_temp.interval().transition_times())
transitions.update(self.outside_temp.interval().transition_times())
return transitions
def air_exchange(self, room: Room, time: float) -> float:
# If the window is shut, no air is being exchanged.
if not self.active.triggered(time):
@ -390,10 +399,7 @@ class Model:
"""
state_change_times = set()
state_change_times.update(self.infected.presence.transition_times())
state_change_times.update(self.ventilation.active.transition_times())
if isinstance(self.ventilation,WindowOpening):
state_change_times.update(self.ventilation.inside_temp.interval().transition_times())
state_change_times.update(self.ventilation.outside_temp.interval().transition_times())
state_change_times.update(self.ventilation.transition_times())
return sorted(state_change_times)