From 8c093e6d43b570040089351bb97c2dc4ee0cee8e Mon Sep 17 00:00:00 2001 From: Nicolas Mounet Date: Mon, 23 Nov 2020 11:35:10 +0100 Subject: [PATCH] Different splitting for coffee breaks w.r.t lunch, as a function of the fraction of the total time spent before lunch (from P. Elson / G. Azzopardi) --- cara/apps/calculator/model_generator.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index bd63f625..720e7179 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -256,7 +256,10 @@ class FormData: if not self.coffee_breaks: return () if self.lunch_option: - n_morning_breaks = self.coffee_breaks // 2 + time_before_lunch = self.lunch_start - self.activity_start + time_after_lunch = self.activity_finish - self.lunch_finish + before_lunch_frac = time_before_lunch / (time_before_lunch + time_after_lunch) + n_morning_breaks = round(self.coffee_breaks * before_lunch_frac) breaks = ( self._compute_breaks_in_interval( self.activity_start, self.lunch_start, n_morning_breaks