From 15fd7fe4f830ca6bb15ef749f3aae3f0c7cac08e Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Tue, 1 Mar 2022 10:21:20 +0100 Subject: [PATCH] Corrected mc type on short_range_expirations --- cara/apps/calculator/model_generator.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index f32de6cd..adbd189a 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -253,7 +253,7 @@ class FormData: sr_presence=self.short_range_intervals() sr_activities=self.short_range_activities() - short_range_expirations = [short_range_expiration_distributions[activity] for activity in sr_activities] + short_range_expirations = tuple(short_range_expiration_distributions[activity] for activity in sr_activities) # Initializes and returns a model with the attributes defined above return mc.ExposureModel( @@ -643,16 +643,16 @@ class FormData: breaks=self.infected_lunch_break_times() + self.infected_coffee_break_times(), ) - def short_range_intervals(self) -> typing.List[models.SpecificInterval]: + def short_range_intervals(self) -> typing.Tuple[models.SpecificInterval]: if (self.short_range_interactions): short_range_intervals = [] for interaction in self.short_range_interactions: start_time = time_string_to_minutes(interaction['start_time']) duration = float(interaction['duration']) short_range_intervals.append(models.SpecificInterval((start_time/60, (start_time + duration)/60))) - return short_range_intervals + return list(short_range_intervals) else: - return [] + return () def exposed_present_interval(self) -> models.Interval: return self.present_interval(