More work on time management.

1 files changed, 22 insertions, 38 deletions

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()