More work on time management.

3 files changed, 41 insertions, 65 deletions

diff --git a/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py b/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py
index 156f6f1..311f31b 100644
--- a/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py
+++ b/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py
@@ -113,6 +113,9 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase):
         gaze_movement_identifier = DispersionThresholdIdentification.GazeMovementIdentifier(deviation_max_threshold=deviation_max, duration_min_threshold=max_time*2)
         ts_fixations, ts_saccades, ts_status = gaze_movement_identifier.browse(ts_gaze_positions)
 
+        # DEBUG
+        print(gaze_movement_identifier)
+
         # Check result size
         self.assertEqual(len(ts_fixations), 1)
         self.assertEqual(len(ts_saccades), 0)
diff --git a/src/argaze.test/GazeFeatures.py b/src/argaze.test/GazeFeatures.py
index c6ccfca..e678093 100644
--- a/src/argaze.test/GazeFeatures.py
+++ b/src/argaze.test/GazeFeatures.py
@@ -31,6 +31,9 @@ def random_gaze_positions(size, frame_dimension: tuple[float, float] = (1, 1)):
         # Edit gaze position
         random_gaze_position = GazeFeatures.GazePosition((random.random() * frame_dimension[0], random.random() * frame_dimension[1]), precision=5)
 
+        # DEBUG
+        print('random_gaze_position', type(random_gaze_position), random_gaze_position.__class__.__bases__)
+
         # Timestamp gaze position
         random_gaze_position.timestamp = time.time()
 
@@ -375,13 +378,11 @@ def build_scan_path(size, frame_dimension: tuple[float, float] = (1, 1)):
 
     for i in range(size):
 
-        fixation = TestFixation(random_gaze_positions(10, frame_dimension))
-        ts, _ = fixation.first
-        scan_path.append_fixation(ts, fixation)
+        fixation = TestFixation(random_gaze_positions(10, frame_dimension), timestamp=i)
+        scan_path.append_fixation(fixation)
 
-        saccade = TestSaccade(random_gaze_positions(2, frame_dimension))
-        ts, _ = saccade.first
-        scan_path.append_saccade(ts, saccade)
+        saccade = TestSaccade(random_gaze_positions(2, frame_dimension), timestamp=i+1)
+        scan_path.append_saccade(saccade)
 
     return scan_path
 
@@ -404,9 +405,7 @@ class TestScanPathClass(unittest.TestCase):
 
         # Append a saccade that should be ignored
         saccade = TestSaccade(random_gaze_positions(2))
-        ts = saccade[0].timestamp
-
-        new_step = scan_path.append_saccade(ts, saccade)
+        new_step = scan_path.append_saccade(saccade)
 
         # Check that no scan step have been created yet
         self.assertEqual(len(scan_path), 0)
@@ -415,9 +414,7 @@ class TestScanPathClass(unittest.TestCase):
 
         # Append first fixation
         fixation_A = TestFixation(random_gaze_positions(10))
-        ts = fixation_A[0].timestamp
-
-        new_step = scan_path.append_fixation(ts, fixation_A)
+        new_step = scan_path.append_fixation(fixation_A)
 
         # Check that no scan step have been created yet
         self.assertEqual(len(scan_path), 0)
@@ -426,9 +423,7 @@ class TestScanPathClass(unittest.TestCase):
 
         # Append consecutive saccade
         saccade_A = TestSaccade(random_gaze_positions(2))
-        ts = saccade_A[0].timestamp
-
-        new_step_A = scan_path.append_saccade(ts, saccade_A)
+        new_step_A = scan_path.append_saccade(saccade_A)
 
         # Check that new scan step have been created
         self.assertEqual(len(scan_path), 1)
@@ -439,9 +434,7 @@ class TestScanPathClass(unittest.TestCase):
 
         # Append 2 consecutive fixations then a saccade
         fixation_B1 = TestFixation(random_gaze_positions(10))
-        ts = fixation_B1[0].timestamp
-
-        new_step = scan_path.append_fixation(ts, fixation_B1)
+        new_step = scan_path.append_fixation(fixation_B1)
 
         # Check that no scan step have been created yet
         self.assertEqual(len(scan_path), 1)
@@ -449,9 +442,7 @@ class TestScanPathClass(unittest.TestCase):
         self.assertEqual(new_step, None)
 
         fixation_B2 = TestFixation(random_gaze_positions(10))
-        ts = fixation_B2[0].timestamp
-
-        new_step = scan_path.append_fixation(ts, fixation_B2)
+        new_step = scan_path.append_fixation(fixation_B2)
 
         # Check that no scan step have been created yet
         self.assertEqual(len(scan_path), 1)
@@ -459,9 +450,7 @@ class TestScanPathClass(unittest.TestCase):
         self.assertEqual(new_step, None)
 
         saccade_B = TestSaccade(random_gaze_positions(2))
-        ts = saccade_B[0].timestamp
-
-        new_step_B = scan_path.append_saccade(ts, saccade_B)
+        new_step_B = scan_path.append_saccade(saccade_B)
 
         # Check that new scan step have been created
         self.assertEqual(len(scan_path), 2)
@@ -521,12 +510,12 @@ def build_aoi_scan_path(expected_aoi, aoi_path):
     # Append a hidden last step to allow last given step creation
     aoi_path.append(aoi_path[-2])
 
-    for aoi in aoi_path:
+    for i, aoi in enumerate(aoi_path):
 
-        fixation = TestFixation(random_gaze_positions(10))
+        fixation = TestFixation(random_gaze_positions(10), timestamp=i)
         aoi_scan_path.append_fixation(fixation, aoi)
 
-        saccade = TestSaccade(random_gaze_positions(2))
+        saccade = TestSaccade(random_gaze_positions(2), timestamp=i+1)
         aoi_scan_path.append_saccade(saccade)
 
     return aoi_scan_path
diff --git a/src/argaze.test/PupillFeatures.py b/src/argaze.test/PupillFeatures.py
index f0e8e1b..9cf26eb 100644
--- a/src/argaze.test/PupillFeatures.py
+++ b/src/argaze.test/PupillFeatures.py
@@ -8,6 +8,7 @@ __copyright__ = "Copyright 2023, Ecole Nationale de l'Aviation Civile (ENAC)"
 __license__ = "BSD"
 
 import unittest
+import math
 
 from argaze import PupillFeatures
 
@@ -43,14 +44,12 @@ class TestPupillDiameterClass(unittest.TestCase):
         # Check empty PupillDiameter
         empty_pupill_diameter = PupillFeatures.PupillDiameter()
 
-        self.assertEqual(empty_pupill_diameter.value, 0.)
-        self.assertEqual(empty_pupill_diameter.valid, False)
+        self.assertEqual(empty_pupill_diameter, math.nan)
 
         # Check float PupillDiameter
         float_pupill_diameter = PupillFeatures.PupillDiameter(1.23)
 
-        self.assertEqual(float_pupill_diameter.value, 1.23)
-        self.assertEqual(float_pupill_diameter.valid, True)
+        self.assertEqual(float_pupill_diameter, 1.23)
 
     def test_properties(self):
         """Test PupillDiameter properties cannot be modified after creation."""
@@ -60,32 +59,16 @@ class TestPupillDiameterClass(unittest.TestCase):
         # Check that pupill diameter value setting fails
         with self.assertRaises(AttributeError):
 
-            pupill_diameter.value = 123
+            pupill_diameter = 123
 
-        self.assertNotEqual(pupill_diameter.value, 123)
-        self.assertEqual(pupill_diameter.value, 0.)
+        self.assertNotEqual(pupill_diameter, 123)
+        self.assertEqual(pupill_diameter, math.nan)
 
     def test___repr__(self):
         """Test PupillDiameter string representation."""
 
         # Check empty PupillDiameter representation
-        self.assertEqual(repr(PupillFeatures.PupillDiameter()), "{\"value\": 0.0}")
-
-class TestUnvalidPupillDiameterClass(unittest.TestCase):
-    """Test UnvalidPupillDiameter class."""
-
-    def test_new(self):
-        """Test UnvalidPupillDiameter creation."""
-
-        unvalid_pupill_diameter = PupillFeatures.UnvalidPupillDiameter()
-
-        self.assertEqual(unvalid_pupill_diameter.value, 0.)
-        self.assertEqual(unvalid_pupill_diameter.valid, False)
-
-    def test___repr__(self):
-        """Test UnvalidPupillDiameter string representation."""
-
-        self.assertEqual(repr(PupillFeatures.UnvalidPupillDiameter()), "{\"message\": null, \"value\": 0.0}")
+        self.assertEqual(repr(PupillFeatures.PupillDiameter()), "{\"value\": NaN}")
 
 class TestTimeStampedPupillDiametersClass(unittest.TestCase):
     """Test TimeStampedPupillDiameters class."""
@@ -93,22 +76,23 @@ class TestTimeStampedPupillDiametersClass(unittest.TestCase):
     def test___setitem__(self):
         """Test __setitem__ method."""
 
-        ts_pupill_diameters = PupillFeatures.TimeStampedPupillDiameters()
-        ts_pupill_diameters[0] = PupillFeatures.PupillDiameter()
-        ts_pupill_diameters[1] = PupillFeatures.UnvalidPupillDiameter()
-        ts_pupill_diameters[2] = {"value": 1.23}
+        ts_pupill_diameters = PupillFeatures.TimeStampedPupillDiameters([
+            PupillFeatures.PupillDiameter(),
+            PupillFeatures.PupillDiameter(0.63),
+            {"value": 1.23}
+        ])
 
-        # Check PupillDiameter is correctly stored and accessible as a PupillDiameter
+        # Check empty PupillDiameter is correctly stored and accessible as a PupillDiameter
         self.assertIsInstance(ts_pupill_diameters[0], PupillFeatures.PupillDiameter)
-        self.assertEqual(ts_pupill_diameters[0].valid, False)
+        self.assertEqual(ts_pupill_diameters[0], math.nan)
 
-        # Check UnvalidPupillDiameter is correctly stored and accessible as a UnvalidPupillDiameter
-        self.assertIsInstance(ts_pupill_diameters[1], PupillFeatures.UnvalidPupillDiameter)
-        self.assertEqual(ts_pupill_diameters[1].valid, False)
+        # Check PupillDiameter is correctly stored and accessible as a PupillDiameter
+        self.assertIsInstance(ts_pupill_diameters[1], PupillFeatures.PupillDiameter)
+        self.assertEqual(ts_pupill_diameters[0], 0.63)
 
-        # Check dict with "value" and "precision" keys is correctly stored and accessible as a PupillDiameter
+        # Check dict with "value" key is correctly stored and accessible as a PupillDiameter
         self.assertIsInstance(ts_pupill_diameters[2], PupillFeatures.PupillDiameter)
-        self.assertEqual(ts_pupill_diameters[2].valid, True)
+        self.assertEqual(ts_pupill_diameters[0], 1.23)
 
         # Check that bad data type insertion fails
         with self.assertRaises(AssertionError):
@@ -125,11 +109,11 @@ class TestTimeStampedPupillDiametersClass(unittest.TestCase):
 
         ts_pupill_diameters = PupillFeatures.TimeStampedPupillDiameters()
 
-        self.assertEqual(repr(PupillFeatures.TimeStampedPupillDiameters()), "{}")
+        self.assertEqual(repr(PupillFeatures.TimeStampedPupillDiameters()), "[]")
 
-        ts_pupill_diameters[0] = PupillFeatures.PupillDiameter()
+        ts_pupill_diameters.append(PupillFeatures.PupillDiameter())
         
-        self.assertEqual(repr(ts_pupill_diameters), "{\"0\": {\"value\": 0.0}}")
+        self.assertEqual(repr(ts_pupill_diameters), "[{\"value\": NaN, \"timestamp\": 0}]")
 
         ts_pupill_diameters[0] = PupillFeatures.UnvalidPupillDiameter()