From 706c35239290c5601d75f9f3719a7815a9696469 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Tue, 13 Jun 2023 16:00:30 +0200 Subject: [PATCH] removed unused methods --- caimira/apps/calculator/model_generator.py | 30 ---------------------- 1 file changed, 30 deletions(-) diff --git a/caimira/apps/calculator/model_generator.py b/caimira/apps/calculator/model_generator.py index 297f480e..981e1e67 100644 --- a/caimira/apps/calculator/model_generator.py +++ b/caimira/apps/calculator/model_generator.py @@ -304,36 +304,6 @@ class FormData: if total_percentage != 100: raise ValueError(f'The sum of all respiratory activities should be 100. Got {total_percentage}.') - - def merge_intervals(self, exposed_interval, infected_interval): - stack = sorted(exposed_interval + infected_interval, reverse=True) - while len(stack) > 1: - first = stack.pop() - second = stack.pop() - if first == second: # identical intervals can be merged - yield first - elif first[1] <= second[0]: # no overlapping, yield first interval, put back second - yield first - stack.append(second) - elif first[0] == second[0]: # overlap at start, yield shorter, put back rest of longer - if first[1] > second[1]: - first, second = second, first - yield first - stack.append((first[1], second[1])) - elif first[1] < second[1]: # partial overlap, yield first two parts, put back rest - yield first[0], second[0] - yield second[0], first[1] - stack.append((first[1], second[1])) - else: # first[1] >= second[1] # total envelopment - yield first[0], second[0] - yield second - if first[1] != second[1]: - stack.append((second[1], first[1])) - - yield from stack # there may or may not be one element left over - - def merge_total_people(self): - return self.total_people def initialize_room(self) -> models.Room: # Initializes room with volume either given directly or as product of area and height