fix: improve logic.Count for count_min = 0

Do not require a positive number of intervals of type POSITIVE if
count_min is 0.

Add a test case.

Author: scymtym

execution_engine/task/task.py

@@ -383,6 +383,8 @@ def interval_union_with_count(
             count_max = self.expr.count_max
             if count_min is None and count_max is None:
                 raise ValueError("count_min and count_max cannot both be None")
+            if count_min is None:
+                count_min = 0
 
             def interval_counts(
                 start: int, end: int, intervals: List[GeneralizedInterval]
@@ -395,11 +397,12 @@ def interval_counts(
                     for interval in intervals
                 )
 
-                # The interval type with the highest "union priority"
-                # determines the result.
+                # Either the count constraints or the interval type
+                # with the highest "union priority" determines the
+                # result.
                 positive_count = counts[IntervalType.POSITIVE]
-                if positive_count > 0:
-                    if count_min is None:
+                if positive_count > 0 or count_min == 0:
+                    if count_min == 0:
                         if positive_count <= count_max:
                             return Interval(start, end, IntervalType.POSITIVE)
                         else:

tests/execution_engine/omop/criterion/combination/test_temporal_combination.py

@@ -2387,6 +2387,63 @@ def patient_events(self, db_session, visit_occurrence):
                         ],
                     },
             ),
+            (
+                    logic.And(c2),  # population
+                    logic.MaxCount(
+                        bodyweight_measurement_with_forward_fill,
+                        body_height_measurement_with_forward_fill,
+                        tidal_volume_measurement_with_forward_fill,
+                        threshold=2,
+                    ),
+                    {
+                        1: [
+                            (
+                                    IntervalType.NOT_APPLICABLE,
+                                    'nan',
+                                    pendulum.parse("2025-02-18 17:55:00+01:00"),
+                                    pendulum.parse("2025-02-19 07:59:59+01:00"),
+                            ),
+                            (
+                                    IntervalType.POSITIVE,
+                                    'nan',
+                                    pendulum.parse("2025-02-19 08:00:00+01:00"),
+                                    pendulum.parse("2025-02-20 17:59:59+01:00"),
+                            ),
+                            (
+                                    IntervalType.NEGATIVE,
+                                    'nan',
+                                    pendulum.parse("2025-02-20 18:00:00+01:00"),
+                                    pendulum.parse("2025-02-21 02:00:00+01:00"),
+                            ),
+                            (
+                                    IntervalType.NOT_APPLICABLE,
+                                    'nan',
+                                    pendulum.parse("2025-02-21 02:00:01+01:00"),
+                                    pendulum.parse("2025-02-22 05:30:00+01:00"),
+                            ),
+                        ],
+                        2: [
+                            (
+                                    IntervalType.NOT_APPLICABLE,
+                                    'nan',
+                                    pendulum.parse("2025-02-18 17:55:00+01:00"),
+                                    pendulum.parse("2025-02-19 07:59:59+01:00"),
+                            ),
+                            (
+                                    IntervalType.POSITIVE,
+                                    'nan',
+                                    pendulum.parse("2025-02-19 08:00:00+01:00"),
+                                    pendulum.parse("2025-02-21 02:00:00+01:00"),
+                            ),
+                            (
+                                    IntervalType.NOT_APPLICABLE,
+                                    'nan',
+                                    pendulum.parse("2025-02-21 02:00:01+01:00"),
+                                    pendulum.parse("2025-02-22 05:30:00+01:00"),
+                            ),
+                        ],
+                    },
+            ),
         ],
     )
     def test_combination_on_database(