Merge pull request #782 from OpenTrafficCam/bug/9173-otanalytics-counts_15min-csv-does-not-contain-line-with-count-0-for-combinations-after-the-first-time-point

bug/9173-otanalytics-counts_15min-csv-does-not-contain-line-with-count-0-for-combinations-after-the-first-time-point

Author: schubsen

OTAnalytics/application/analysis/traffic_counting.py

@@ -1031,19 +1031,22 @@ def __assignment_filter_for(
         specification: CountingSpecificationDto,
     ) -> Callable[[RoadUserAssignment], bool]:
         """Create a filter interval using the given specifications start and end time
-        as lower and upper bounds respectively.
+        as lower and upper bounds respectively. The interval is always closed at the
+        start time and open at the end time: [specification-start, specification-end).
+        The start time is always inside the interval while the end time is always
+        outside the interval.
 
         The resulting filter determines whether RoadUserAssignments fall into the
         desired observation interval and should be counted.
 
         The is_upper/lower_strict parameters of this TrafficCounting object
         can be used to configure the filter.
         A strict bound does not allow the assignment to overlap the respective bound.
-        The four combinations are as follows (open = '('; closed = '['):
-            - [lower, upper]: both start and end of the rua must be inside the interval
-            - [lower, upper): the start of the rua must be inside the interval
-            - (lower, upper]: the end of the rua must be inside the interval
-            - (lower, upper): either start or end of the rua must be in the interval,
+        The four combinations are as follows:
+            - (True, True): both start and end of the rua must be inside the interval
+            - (True, False): the start of the rua must be inside the interval
+            - (False, True): the end of the rua must be inside the interval
+            - (False, False): either start or end of the rua must be in the interval,
                 or [start, end] must enclose the interval
 
         Args:
@@ -1061,18 +1064,18 @@ def __assignment_filter_for(
         is_upper_strict = self._filter_upper_bound_strict
 
         if is_lower_strict and is_upper_strict:
-            return lambda rua: lower <= start_of(rua) and end_of(rua) <= upper
+            return lambda rua: lower <= start_of(rua) and end_of(rua) < upper
 
         elif is_lower_strict and not is_upper_strict:
-            return lambda rua: lower <= start_of(rua) <= upper
+            return lambda rua: lower <= start_of(rua) < upper
 
         elif not is_lower_strict and is_upper_strict:
-            return lambda rua: lower <= end_of(rua) <= upper
+            return lambda rua: lower <= end_of(rua) < upper
 
         else:
             return (
-                lambda rua: lower <= start_of(rua) <= upper
-                or lower <= end_of(rua) <= upper
+                lambda rua: lower <= start_of(rua) < upper
+                or lower <= end_of(rua) < upper
                 or (start_of(rua) <= lower and upper <= end_of(rua))
             )
 

OTAnalytics/plugin_parser/export.py

@@ -167,14 +167,24 @@ def explode(self) -> list[Tag]:
                 second=0, microsecond=0
             )
         )
-        maximum = self._end - start_without_seconds
-        duration = int(maximum.total_seconds())
         interval = self._specification.counting_specification.interval_in_minutes * 60
+
+        # Round down start time to the nearest interval boundary
+        start_timestamp = start_without_seconds.timestamp()
+        interval_boundary = (start_timestamp // interval) * interval
+        start_at_boundary = start_without_seconds.fromtimestamp(
+            interval_boundary, tz=start_without_seconds.tzinfo
+        )
+
+        maximum = self._end - start_at_boundary
+        duration = int(maximum.total_seconds())
+        if self._end.timestamp() % interval == 0:
+            duration += 1
         for flow in self._specification.flow_name_info:
             for mode in self._specification.counting_specification.modes:
                 for delta in range(0, duration, interval):
                     offset = timedelta(seconds=delta)
-                    start = start_without_seconds + offset
+                    start = start_at_boundary + offset
                     interval_time = timedelta(seconds=interval)
                     tag = (
                         create_flow_tag(flow.name)

tests/OTAnalytics/application/analysis/test_traffic_counting.py

@@ -1273,7 +1273,7 @@ def tests_traffic_counting_filter(
         # Create specification
         counting_specification = CountingSpecificationDto(
             start=start,
-            end=end,
+            end=end + timedelta(milliseconds=1),
             interval_in_minutes=15,
             modes=modes,
             output_format="csv",