r22224 - /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py -- February 20, 2014 - 18:17

Author: tlinnet
Date: Thu Feb 20 18:17:11 2014
New Revision: 22224

URL: http://svn.gna.org/viewcvs/relax?rev=22224&view=rev
Log:
Improved unit test for cathing both time and dispersion point when looping 
over experiment and time points.

Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis 
with two fields at two delay times.

Modified:
    
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py

Modified: 
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py?rev=22224&r1=22223&r2=22224&view=diff
==============================================================================
--- 
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py 
(original)
+++ 
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py 
Thu Feb 20 18:17:11 2014
@@ -54,15 +54,22 @@
         cpmg_1 = [ncyc/time_T2_1 for ncyc in ncyc_1]
         cpmg_1.sort()
 
-        ncyc_2 = [28, 4, 32, 60, 2, 10, 16, 8, 20, 52, 18, 40, 6, 12, 24, 14]
+        ncyc_2 = [28, 4, 32, 60, 2, 10, 16, 8, 20, 52, 18, 40, 6, 12, 24, 
14, 22]
         sfrq_2 = 599.8908587*1E6
         time_T2_2 = 0.06
         cpmg_2 = [ncyc/time_T2_2 for ncyc in ncyc_2]
         cpmg_2.sort()
 
         # Test the loop function.
+        # First initialize index for the two lists.
+        i = -1
+        j = -1
         for exp_type, frq, offset, point, time, ei, mi, oi, di, ti in 
loop_exp_frq_offset_point_time(return_indices=True):
             if frq == sfrq_1:
+                i += 1
                 self.assertEqual(time, time_T2_1)
+                self.assertAlmostEqual(point, cpmg_1[i],3)
             if frq == sfrq_2:
+                j += 1
                 self.assertEqual(time, time_T2_2)
+                self.assertAlmostEqual(point, cpmg_2[j],3)