From 182844cfbc1462c266245186f97f05986f0170ce Mon Sep 17 00:00:00 2001 From: Théo de la Hogue Date: Tue, 12 Mar 2024 15:31:55 +0100 Subject: Fixing tests. --- .../GazeAnalysis/DispersionThresholdIdentification.py | 10 +++++----- .../GazeAnalysis/VelocityThresholdIdentification.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/argaze.test/GazeAnalysis') diff --git a/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py b/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py index 1c54bd1..95453d2 100644 --- a/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py +++ b/src/argaze.test/GazeAnalysis/DispersionThresholdIdentification.py @@ -302,12 +302,12 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase): fixation_C = DispersionThresholdIdentification.Fixation(ts_gaze_positions_C) # Check that fixation doesn't overlap - self.assertFalse(fixation_A.overlap(fixation_B)) - self.assertFalse(fixation_B.overlap(fixation_A)) + self.assertFalse(fixation_A.is_overlapping()(fixation_B)) + self.assertFalse(fixation_B.is_overlapping()(fixation_A)) # Check that fixation overlaps - self.assertTrue(fixation_B.overlap(fixation_C)) - self.assertTrue(fixation_C.overlap(fixation_B)) + self.assertTrue(fixation_B.is_overlapping()(fixation_C)) + self.assertTrue(fixation_C.is_overlapping()(fixation_B)) @unittest.skip("Fixation overlapping is not supported anymore.") def test_fixation_overlapping_identification(self): @@ -362,7 +362,7 @@ class TestDispersionThresholdIdentificationClass(unittest.TestCase): # Iterate on gaze positions for gaze_position in ts_gaze_positions: - finished_gaze_movement = gaze_movement_identifier.identify(gaze_position.timestamp, gaze_position, terminate=(gaze_position.timestamp == ts_gaze_positions[-1].timestamp)) + finished_gaze_movement = gaze_movement_identifier.identify(gaze_position, terminate=(gaze_position.timestamp == ts_gaze_positions[-1].timestamp)) if GazeFeatures.is_fixation(finished_gaze_movement): diff --git a/src/argaze.test/GazeAnalysis/VelocityThresholdIdentification.py b/src/argaze.test/GazeAnalysis/VelocityThresholdIdentification.py index 051265c..5dce9b2 100644 --- a/src/argaze.test/GazeAnalysis/VelocityThresholdIdentification.py +++ b/src/argaze.test/GazeAnalysis/VelocityThresholdIdentification.py @@ -300,7 +300,7 @@ class TestVelocityThresholdIdentificationClass(unittest.TestCase): # Iterate on gaze positions for gaze_position in ts_gaze_positions: - finished_gaze_movement = gaze_movement_identifier.identify(gaze_position.timestamp, gaze_position, terminate=(gaze_position.timestamp == ts_gaze_positions[-1])) + finished_gaze_movement = gaze_movement_identifier.identify(gaze_position, terminate=(gaze_position.timestamp == ts_gaze_positions[-1])) # Check that last gaze position date is not equal to given gaze position date if finished_gaze_movement: -- cgit v1.1