Fixing DispersionThresholdIdentification test.

1 files changed, 27 insertions, 27 deletions

diff --git a/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py b/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py
index 7e74c1d..07496c3 100644
--- a/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py
+++ b/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py
@@ -121,12 +121,12 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check fixation
         fixation = ts_fixations.pop(0)
 
-        self.assertEqual(len(fixation.positions.keys()), size)
+        self.assertEqual(len(fixation), size)
         self.assertLessEqual(fixation.deviation_max, deviation_max)
         self.assertGreaterEqual(fixation.duration, (size - 1) * min_time)
         self.assertLessEqual(fixation.duration, (size - 1) * max_time)
         self.assertLessEqual(fixation.finished, True)
-
+    
     def test_fixation_and_direct_saccade_identification(self):
         """Test DispersionThresholdIdentification fixation and saccade identification."""
 
@@ -153,7 +153,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check first fixation
         fixation = ts_fixations.pop(0)
 
-        self.assertEqual(len(fixation.positions.keys()), size)
+        self.assertEqual(len(fixation), size)
         self.assertLessEqual(fixation.deviation_max, deviation_max)
         self.assertGreaterEqual(fixation.duration, (size - 1) * min_time)
         self.assertLessEqual(fixation.duration, (size - 1) * max_time)
@@ -162,7 +162,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check first saccade
         saccade = ts_saccades.pop(0)
 
-        self.assertEqual(len(saccade.positions.keys()), 2)
+        self.assertEqual(len(saccade), 2)
         self.assertGreaterEqual(saccade.duration, min_time)
         self.assertLessEqual(saccade.duration, max_time)
         self.assertLessEqual(saccade.finished, True)
@@ -174,7 +174,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check second fixation
         fixation = ts_fixations.pop(0)
 
-        self.assertEqual(len(fixation.positions.keys()), size)
+        self.assertEqual(len(fixation), size)
         self.assertLessEqual(fixation.deviation_max, deviation_max)
         self.assertGreaterEqual(fixation.duration, (size - 1) * min_time)
         self.assertLessEqual(fixation.duration, (size - 1) * max_time)
@@ -183,7 +183,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check that last position of a movement is equal to first position of next movement
         self.assertEqual(saccade[-1].timestamp, fixation[0].timestamp)
         self.assertEqual(saccade[-1].value, fixation[0].value)
-
+    
     def test_fixation_and_short_saccade_identification(self):
         """Test DispersionThresholdIdentification fixation and saccade identification."""
 
@@ -213,7 +213,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check first fixation
         fixation = ts_fixations.pop(0)
 
-        self.assertEqual(len(fixation.positions.keys()), size)
+        self.assertEqual(len(fixation), size)
         self.assertLessEqual(fixation.deviation_max, deviation_max)
         self.assertGreaterEqual(fixation.duration, (size - 1) * min_time)
         self.assertLessEqual(fixation.duration, (size - 1) * max_time)
@@ -222,7 +222,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check first saccade
         saccade = ts_saccades.pop(0)
 
-        self.assertEqual(len(saccade.positions.keys()), move + 2)
+        self.assertEqual(len(saccade), move + 2)
         self.assertGreaterEqual(saccade.duration, (move + 1) * min_time)
         self.assertLessEqual(saccade.duration, (move + 1) * max_time)
         self.assertLessEqual(saccade.finished, True)
@@ -234,7 +234,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check second fixation
         fixation = ts_fixations.pop(0)
 
-        self.assertEqual(len(fixation.positions.keys()), size)
+        self.assertEqual(len(fixation), size)
         self.assertLessEqual(fixation.deviation_max, deviation_max)
         self.assertGreaterEqual(fixation.duration, (size - 1) * min_time)
         self.assertLessEqual(fixation.duration, (size - 1) * max_time)
@@ -243,9 +243,9 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check that last position of a movement is equal to first position of next movement
         self.assertEqual(saccade[-1].timestamp, fixation[0].timestamp)
         self.assertEqual(saccade[-1].value, fixation[0].value)
-
-    def test_invalid_gaze_position(self):
-        """Test DispersionThresholdIdentification fixation and saccade identification with invalid gaze position."""
+    
+    def test_empty_gaze_position(self):
+        """Test DispersionThresholdIdentification fixation and saccade identification with empty gaze position."""
 
         size = 15
         center = (0, 0)
@@ -267,7 +267,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check first fixation
         fixation = ts_fixations.pop(0)
 
-        self.assertEqual(len(fixation.positions.keys()), 7)
+        self.assertEqual(len(fixation), 7)
         self.assertLessEqual(fixation.deviation_max, deviation_max)
         self.assertGreaterEqual(fixation.duration, 6 * min_time)
         self.assertLessEqual(fixation.duration, 6 * max_time)
@@ -276,12 +276,12 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check second fixation
         fixation = ts_fixations.pop(0)
 
-        self.assertEqual(len(fixation.positions.keys()), 5)
+        self.assertEqual(len(fixation), 5)
         self.assertLessEqual(fixation.deviation_max, deviation_max)
         self.assertGreaterEqual(fixation.duration, 4 * min_time)
         self.assertLessEqual(fixation.duration, 4 * max_time)
         self.assertLessEqual(fixation.finished, True)
-
+    
     def test_fixation_overlapping(self):
         """Test Fixation overlap function."""
 
@@ -336,12 +336,12 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         # Check unique fixation
         fixation = ts_fixations.pop(0)
 
-        self.assertEqual(len(fixation.positions.keys()), size * 2)
+        self.assertEqual(len(fixation), size * 2)
         #self.assertGreaterEqual(fixation.deviation_max, deviation_max)
         self.assertGreaterEqual(fixation.duration, (2 * size - 1) * min_time)
         self.assertLessEqual(fixation.duration, (2 * size - 1) * max_time)
         self.assertLessEqual(fixation.finished, True)
-
+    
     def test_identification_browsing(self):
         """Test DispersionThresholdIdentification identification browsing."""
 
@@ -355,7 +355,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         ts_gaze_positions_A = build_gaze_fixation(size, center_A, deviation_max, min_time, max_time)
         ts_gaze_positions_B = build_gaze_fixation(size, center_B, deviation_max, min_time, max_time, start_ts=ts_gaze_positions_A[-1].timestamp)
 
-        ts_gaze_positions = ts_gaze_positions_A.append(ts_gaze_positions_B)
+        ts_gaze_positions = ts_gaze_positions_A + ts_gaze_positions_B
 
         gaze_movement_identifier = DispersionThresholdIdentification.GazeMovementIdentifier(deviation_max_threshold=deviation_max, duration_min_threshold=max_time*2)
            
@@ -369,7 +369,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
 
             if GazeFeatures.is_fixation(finished_gaze_movement):
 
-                self.assertEqual(len(finished_gaze_movement.positions.keys()), size)
+                self.assertEqual(len(finished_gaze_movement), size)
                 self.assertLessEqual(finished_gaze_movement.deviation_max, deviation_max)
                 self.assertGreaterEqual(finished_gaze_movement.duration, (size-1) * min_time)
                 self.assertLessEqual(finished_gaze_movement.duration, (size-1) * max_time)
@@ -377,13 +377,13 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
 
             elif GazeFeatures.is_saccade(finished_gaze_movement):
 
-                self.assertEqual(len(finished_gaze_movement.positions.keys()), 2)
+                self.assertEqual(len(finished_gaze_movement), 2)
                 self.assertGreaterEqual(finished_gaze_movement.duration, min_time)
                 self.assertLessEqual(finished_gaze_movement.duration, max_time)
                 self.assertLessEqual(finished_gaze_movement.finished, True)
 
             # Check that last gaze position date is not equal to given gaze position date
-            if finished_gaze_movement.valid:
+            if finished_gaze_movement:
 
                 last_ts = finished_gaze_movement[-1].timestamp
 
@@ -392,14 +392,14 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
             # Check that last gaze position date of current fixation is equal to given gaze position date
             # NOTE: This is not true for saccade as, for I-DT, there is a minimal time window while the gaze movement is unknown
             current_gaze_movement = gaze_movement_identifier.current_gaze_movement
-            if current_gaze_movement.valid:
+            if current_gaze_movement:
 
                 if GazeFeatures.is_fixation(current_gaze_movement):
 
                     last_ts = current_gaze_movement[-1].timestamp
 
                     self.assertEqual(last_ts, gaze_position.timestamp)
-
+    
     def test_identification_generator(self):
         """Test DispersionThresholdIdentification identification using generator."""
 
@@ -413,15 +413,15 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         ts_gaze_positions_A = build_gaze_fixation(size, center_A, deviation_max, min_time, max_time)
         ts_gaze_positions_B = build_gaze_fixation(size, center_B, deviation_max, min_time, max_time, start_ts=ts_gaze_positions_A[-1].timestamp)
 
-        ts_gaze_positions = ts_gaze_positions_A.append(ts_gaze_positions_B)
+        ts_gaze_positions = ts_gaze_positions_A + ts_gaze_positions_B
 
         gaze_movement_identifier = DispersionThresholdIdentification.GazeMovementIdentifier(deviation_max_threshold=deviation_max, duration_min_threshold=max_time*2)
 
-        for ts, finished_gaze_movement in gaze_movement_identifier(ts_gaze_positions):
+        for finished_gaze_movement in gaze_movement_identifier(ts_gaze_positions):
 
             if GazeFeatures.is_fixation(finished_gaze_movement):
 
-                self.assertEqual(len(finished_gaze_movement.positions.keys()), size)
+                self.assertEqual(len(finished_gaze_movement), size)
                 self.assertLessEqual(finished_gaze_movement.deviation_max, deviation_max)
                 self.assertGreaterEqual(finished_gaze_movement.duration, size * min_time)
                 self.assertLessEqual(finished_gaze_movement.duration, size * max_time)
@@ -429,7 +429,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
 
             elif GazeFeatures.is_saccade(finished_gaze_movement):
 
-                self.assertEqual(len(finished_gaze_movement.positions.keys()), 2)
+                self.assertEqual(len(finished_gaze_movement), 2)
                 self.assertGreaterEqual(finished_gaze_movement.duration, 2 * min_time)
                 self.assertLessEqual(finished_gaze_movement.duration, 2 * max_time)
                 self.assertLessEqual(finished_gaze_movement.finished, True)