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

move interval-calculation into separate function

Browse source
This commit is contained in:
markus 2020-11-05 15:42:40 +01:00
parent 5f2f2e5dbf
commit 3f7c761925
1 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
cara/apps/calculator/model_generator.py
View file

@ -87,8 +87,50 @@ class FormData:
pass
def present_interval(self) -> models.Interval:
# TODO
pass
coffee_period = (self.activity_finish - self.activity_start) // self.coffee_breaks
leave_times = [self.lunch_start]
enter_times = [self.lunch_finish]
for minute in range(self.lunch_start, self.activity_finish, coffee_period):
leave_times.append(minute + coffee_period // 2)
enter_times.append(minute + coffee_period // 2 + self.coffee_duration)
# These lists represent the times where the infected person leaves or enters the room, respectively, sorted in
# reverse order. Note that these lists allows the person to "leave" when they should not even be present in the room
# The following loop handles this.
leave_times.sort(reverse=True)
enter_times.sort(reverse=True)
# This loop iterates through the lists above, populating present_intervals with (enter, leave) intervals
# representing the infected person entering and leaving the room. Note that if one of the evenly spaced coffee-
# breaks happens to coincide with the lunch-break, it is simply ignored.
is_present = True
present_intervals = []
time = self.activity_start
while time < self.activity_finish:
if is_present:
if not leave_times:
present_intervals.append((time / 60, self.activity_finish / 60))
break
if leave_times[-1] < time:
leave_times.pop()
else:
new_time = leave_times.pop()
present_intervals.append((time / 60, min(new_time, self.activity_finish) / 60))
is_present = False
time = new_time
else:
if not enter_times:
break
if enter_times[-1] < time:
enter_times.pop()
else:
is_present = True
time = enter_times.pop()
return models.SpecificInterval(tuple(present_intervals))
def model_from_form(form: FormData, tmp_raw_form_data) -> models.Model:
@ -135,47 +177,6 @@ def model_from_form(form: FormData, tmp_raw_form_data) -> models.Model:
coffee_duration = int(d['coffee_duration'])
coffee_breaks = int(d['coffee_breaks'])
coffee_period = (activity_finish - activity_start) // coffee_breaks + 1
leave_times = [lunch_start]
enter_times = [lunch_finish]
for minute in range(activity_start, activity_finish, coffee_period):
leave_times.append(minute)
enter_times.append(minute + coffee_duration)
# These lists represent the times where the infected person leaves or enters the room, respectively, sorted in
# reverse order. Note that these lists allows the person to "leave" when they should not even be present in the room
# The following loop handles this.
leave_times.sort(reverse=True)
enter_times.sort(reverse=True)
# This loop iterates through the lists above, populating present_intervals with (enter, leave) intervals
# representing the infected person entering and leaving the room. Note that if one of the evenly spaced coffee-
# breaks happens to coincide with the lunch-break, it is simply ignored.
is_present = True
present_intervals = []
time = activity_start
while time < activity_finish:
if is_present:
if not leave_times:
present_intervals.append((time / 60, activity_finish / 60))
break
if leave_times[-1] < time:
leave_times.pop()
else:
new_time = leave_times.pop()
present_intervals.append((time / 60, min(new_time, activity_finish) / 60))
is_present = False
time = new_time
else:
if not enter_times:
break
if enter_times[-1] < time:
enter_times.pop()
else:
is_present = True
time = enter_times.pop()
# Initializes a mask of type 1 if mask wearing is "continuous", otherwise instantiates the mask attribute as
# the "No mask"-mask
@ -204,7 +205,7 @@ def model_from_form(form: FormData, tmp_raw_form_data) -> models.Model:
ventilation=ventilation,
infected=models.InfectedPerson(
virus=virus,
presence=models.SpecificInterval(tuple(present_intervals)),
presence=form.present_interval(),
mask=mask,
activity=infected_activity,
expiration=infected_expiration