Adding and testing fixation overlap function.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/argaze/GazeAnalysis/DispersionBasedGazeMovementIdentifier.py b/src/argaze/GazeAnalysis/DispersionBasedGazeMovementIdentifier.py
index 4fd5aab..8498f84 100644
--- a/src/argaze/GazeAnalysis/DispersionBasedGazeMovementIdentifier.py
+++ b/src/argaze/GazeAnalysis/DispersionBasedGazeMovementIdentifier.py
@@ -52,6 +52,20 @@ class Fixation(GazeFeatures.Fixation):
         # Update frozen centroid attribute
         object.__setattr__(self, 'centroid', (cx, cy))
 
+    def overlap(self, fixation) -> float:
+        """Does this fixation overlap another fixation?"""
+
+        dist = (self.centroid[0] - fixation.centroid[0])**2 + (self.centroid[1] - fixation.centroid[1])**2
+        dist = numpy.sqrt(dist)
+
+        return dist < (self.dispersion + fixation.dispersion)
+
+    def merge(self, fixation) -> float:
+        """Merge another fixation into this fixation."""
+
+        self.positions.append(fixation.positions)
+        self.__post_init__()
+
 @dataclass(frozen=True)
 class Saccade(GazeFeatures.Saccade):
     """Define dispersion based saccade."""
@@ -91,6 +105,7 @@ class GazeMovementIdentifier(GazeFeatures.GazeMovementIdentifier):
 
             # Ignore non valid start position
             if not gaze_position_start.valid:
+                
                 self.__ts_gaze_positions.pop_first()
                 continue
 
@@ -129,6 +144,7 @@ class GazeMovementIdentifier(GazeFeatures.GazeMovementIdentifier):
 
                 # remove selected gaze positions
                 for gp in ts_gaze_positions:
+
                     self.__ts_gaze_positions.pop_first()
 
                 # extend fixation position from a copy
@@ -143,7 +159,9 @@ class GazeMovementIdentifier(GazeFeatures.GazeMovementIdentifier):
                     # Ignore non valid position
                     # Should we consider invalid position to not break fixation ?
                     if not gaze_position_next.valid:
+
                         remaining_ts_gaze_positions.pop_first()
+                        self.__ts_gaze_positions.pop_first()
                         continue
 
                     ts_gaze_positions_extension[ts_next] = gaze_position_next