fixed merge conflict in CHANGELOG.md

CHANGELOG.md

@@ -15,6 +15,14 @@ project.
 Resampling of state sequence is now also possible if the `target_sample_rate` is not a multiple of the HMM `sample_rate`, e.g. `target_sample_rate=200`,  `sample_rate=52.1`  (https://github.com/mad-lab-fau/gaitmap/pull/62)
 - Changed call signature of class `BaseHmmFeatureTransformer.inverse_transform_state_sequence` (requires original `data` as input, `target_sample_rate` is no longer required).
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed a bug that when using `merge_interval` with empty input of shape (0, 2), the output was not empty.
+  (https://github.com/mad-lab-fau/gaitmap/pull/61)
+
+
 ## [2.3.0] - 2023-08-03
 
 ### Changed

gaitmap/utils/array_handling.py

@@ -397,6 +397,9 @@ def merge_intervals(input_array: np.ndarray, gap_size: int = 0) -> np.ndarray:
            [18, 20]])
 
     """
+    if input_array.shape[0] == 0:
+        return input_array
+
     return np.array(_solve_overlap(np.sort(input_array, axis=0, kind="stable"), gap_size))
 
 

tests/test_utils/test_array_handling.py

@@ -472,6 +472,7 @@ class TestMergeIntervals:
                 np.array([[-2, 5]]),
                 1,
             ),
+            (np.empty(shape=(0, 2)), np.empty(shape=(0, 2)), 0),
             (
                 np.array([[]]),
                 np.array([[]]),