r22837 - /trunk/test_suite/system_tests/relax_disp.py -- April 23, 2014 - 15:38

Author: bugman
Date: Wed Apr 23 15:38:28 2014
New Revision: 22837

URL: http://svn.gna.org/viewcvs/relax?rev=22837&view=rev
Log:
Updated the Relax_disp.test_hansen_cpmg_data_missing_auto_analysis system 
test for the recent changes.

This is for fixing bug #21960 (https://gna.org/bugs/?21960).

The chi-square values are different due to the fix for bug #21954, the peak 
intensity error analysis
bug, and the CR72 model (http://wiki.nmr-relax.com/CR72) results are 
different due to the fix for
bug #21953, the change of the kex values used in the grid search.


Modified:
    trunk/test_suite/system_tests/relax_disp.py

Modified: trunk/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=22837&r1=22836&r2=22837&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Wed Apr 23 15:38:28 2014
@@ -1000,12 +1000,12 @@
         print("%-20s %20.15g %20.15g %20.15g\n" % ("chi2", spin4.chi2, 
spin70.chi2, spin71.chi2))
         self.assertAlmostEqual(spin4.r2[r20_key1], 1.60463084515171, 3)
         self.assertAlmostEqual(spin4.r2[r20_key2], 1.63220784651911, 3)
-        self.assertAlmostEqual(spin4.chi2, 29.2929926382771, 3)
+        self.assertAlmostEqual(spin4.chi2, 26.7356700694891, 3)
         self.assertAlmostEqual(spin70.r2[r20_key1], 10.534285641325, 3)
         self.assertAlmostEqual(spin70.r2[r20_key2], 16.1112794857068, 3)
-        self.assertAlmostEqual(spin70.chi2, 9634.52343363306, 3)
+        self.assertAlmostEqual(spin70.chi2, 8973.84809774722, 3)
         self.assertAlmostEqual(spin71.r2[r20_key1], 5.83136858890037, 3)
-        self.assertAlmostEqual(spin71.chi2, 127.636629246204, 3)
+        self.assertAlmostEqual(spin71.chi2, 182.60081909193, 3)
 
         # The 'CR72' model checks.
         self.interpreter.pipe.switch(pipe_name='CR72 - relax_disp')
@@ -1020,23 +1020,23 @@
         print("%-20s %20.15g %20.15g %20.15g" % ("dw", spin4.dw, spin70.dw, 
spin71.dw))
         print("%-20s %20.15g %20.15g %20.15g" % ("kex", spin4.kex, 
spin70.kex, spin71.kex))
         print("%-20s %20.15g %20.15g %20.15g\n" % ("chi2", spin4.chi2, 
spin70.chi2, spin71.chi2))
-        self.assertAlmostEqual(spin4.r2[r20_key1], 1.57151065615839, 2)
-        self.assertAlmostEqual(spin4.r2[r20_key2], 1.58059682984398, 3)
-        self.assertAlmostEqual(spin4.pA, 0.500019733844535, 3)
-        self.assertAlmostEqual(spin4.dw, 6.57514296850066, 3)
-        self.assertAlmostEqual(spin4.kex/10000, 0.209808727621065/10000, 3)
-        self.assertAlmostEqual(spin4.chi2, 19.2950428365527, 3)
-        self.assertAlmostEqual(spin70.r2[r20_key1], 6.97326447937972, 3)
-        self.assertAlmostEqual(spin70.r2[r20_key2], 9.3417810084784, 3)
-        self.assertAlmostEqual(spin70.pA, 0.98993823805518, 3)
-        self.assertAlmostEqual(spin70.dw, 5.5907147782533, 3)
-        self.assertAlmostEqual(spin70.kex/10000, 1828.31716745568/10000, 3)
-        self.assertAlmostEqual(spin70.chi2, 55.2887487843661, 3)
-        self.assertAlmostEqual(spin71.r2[r20_key1], 4.98140950171523, 3)
-        self.assertAlmostEqual(spin71.pA, 0.996611720993305, 3)
-        self.assertAlmostEqual(spin71.dw, 4.346521584302, 3)
-        self.assertAlmostEqual(spin71.kex/10000, 1936.08058304917/10000, 3)
-        self.assertAlmostEqual(spin71.chi2, 3.85636864711598, 3)
+        self.assertAlmostEqual(spin4.r2[r20_key1], 1.57238228133, 2)
+        self.assertAlmostEqual(spin4.r2[r20_key2], 1.58281795856862, 3)
+        self.assertAlmostEqual(spin4.pA, 0.500026910935901, 3)
+        self.assertAlmostEqual(spin4.dw, 6.57515251526007, 3)
+        self.assertAlmostEqual(spin4.kex/10000, 0.201640553436634/10000, 3)
+        self.assertAlmostEqual(spin4.chi2, 18.1532802703059, 3)
+        self.assertAlmostEqual(spin70.r2[r20_key1], 6.97246063870564, 3)
+        self.assertAlmostEqual(spin70.r2[r20_key2], 9.41010077348557, 3)
+        self.assertAlmostEqual(spin70.pA, 0.989856645591298, 3)
+        self.assertAlmostEqual(spin70.dw, 5.60881572733242, 3)
+        self.assertAlmostEqual(spin70.kex/10000, 1752.7338801308/10000, 3)
+        self.assertAlmostEqual(spin70.chi2, 53.838216936071, 3)
+        self.assertAlmostEqual(spin71.r2[r20_key1], 4.98149787180149, 3)
+        self.assertAlmostEqual(spin71.pA, 0.99661704174477, 3)
+        self.assertAlmostEqual(spin71.dw, 4.3504344962549, 3)
+        self.assertAlmostEqual(spin71.kex/10000, 1934.33199568204/10000, 3)
+        self.assertAlmostEqual(spin71.chi2, 5.5170364392643, 3)
 
 
     def test_hansen_cpmg_data_to_cr72(self):