r25538 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/relax_disp.py -- September 02, 2014 - 12:31

Author: bugman
Date: Tue Sep  2 12:31:37 2014
New Revision: 25538

URL: http://svn.gna.org/viewcvs/relax?rev=25538&view=rev
Log:
Merged revisions 25535 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r25535 | bugman | 2014-09-02 11:24:36 +0200 (Tue, 02 Sep 2014) | 7 lines
  
  Fixes for the Relax_disp.test_estimate_r2eff_err system test.
  
  The kex parameter value checks have all been scaled by 1e-5 to allow for a 
meaningful floating point
  number comparison.  The number of significant figures have also been 
scaled.  This allows the test
  to now pass on one 64-bit GNU/Linux system.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep  2 12:31:37 2014
@@ -1 +1 @@
-/trunk:1-25532
+/trunk:1-25537

Modified: branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py?rev=25538&r1=25537&r2=25538&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  Tue 
Sep  2 12:31:37 2014
@@ -8466,39 +8466,39 @@
                             elif param == 'kex':
                                 if model == MODEL_DPL94:
                                     if r2eff_estimate == 'direct':
-                                        self.assertAlmostEqual(value, 
4460.43711569, 2)
+                                        self.assertAlmostEqual(value/1e5, 
4460.43711569/1e5, 7)
                                     elif r2eff_estimate == 'MC2000':
-                                        self.assertAlmostEqual(value, 
4419.03917195, 2)
+                                        self.assertAlmostEqual(value/1e5, 
4419.03917195/1e5, 7)
                                     elif r2eff_estimate == 'chi2_pyt':
-                                        self.assertAlmostEqual(value, 
6790.22736344, 2)
+                                        self.assertAlmostEqual(value/1e5, 
6790.22736344/1e5, 7)
                                 elif model == MODEL_TP02:
                                     if r2eff_estimate == 'direct':
-                                        self.assertAlmostEqual(value, 
4921.28602757, 3)
+                                        self.assertAlmostEqual(value/1e5, 
4921.28602757/1e5, 7)
                                     elif r2eff_estimate == 'MC2000':
-                                        self.assertAlmostEqual(value, 
4904.70144883, 3)
+                                        self.assertAlmostEqual(value/1e5, 
4904.70144883/1e5, 7)
                                     elif r2eff_estimate == 'chi2_pyt':
-                                        self.assertAlmostEqual(value, 
5146.20306591, 3)
+                                        self.assertAlmostEqual(value/1e5, 
5146.20306591/1e5, 7)
                                 elif model == MODEL_TAP03:
                                     if r2eff_estimate == 'direct':
-                                        self.assertAlmostEqual(value, 
4926.42963491, 3)
+                                        self.assertAlmostEqual(value/1e5, 
4926.42963491/1e5, 7)
                                     elif r2eff_estimate == 'MC2000':
-                                        self.assertAlmostEqual(value, 
4909.86877150, 3)
+                                        self.assertAlmostEqual(value/1e5, 
4909.86877150/1e5, 7)
                                     elif r2eff_estimate == 'chi2_pyt':
-                                        self.assertAlmostEqual(value, 
5152.51105814, 3)
+                                        self.assertAlmostEqual(value/1e5, 
5152.51105814/1e5, 7)
                                 elif model == MODEL_MP05:
                                     if r2eff_estimate == 'direct':
-                                        self.assertAlmostEqual(value, 
4926.44236315, 3)
+                                        self.assertAlmostEqual(value/1e5, 
4926.44236315/1e5, 7)
                                     elif r2eff_estimate == 'MC2000':
-                                        self.assertAlmostEqual(value, 
4909.88110195, 3)
+                                        self.assertAlmostEqual(value/1e5, 
4909.88110195/1e5, 7)
                                     elif r2eff_estimate == 'chi2_pyt':
-                                        self.assertAlmostEqual(value, 
5152.52097111, 3)
+                                        self.assertAlmostEqual(value/1e5, 
5152.52097111/1e5, 7)
                                 elif model == MODEL_NS_R1RHO_2SITE:
                                     if r2eff_estimate == 'direct':
-                                        self.assertAlmostEqual(value, 
5628.66061488, 2)
+                                        self.assertAlmostEqual(value/1e5, 
5628.66061488/1e5, 7)
                                     elif r2eff_estimate == 'MC2000':
-                                        self.assertAlmostEqual(value, 
5610.20221435, 2)
+                                        self.assertAlmostEqual(value/1e5, 
5610.20221435/1e5, 7)
                                     elif r2eff_estimate == 'chi2_pyt':
-                                        self.assertAlmostEqual(value, 
5643.34067090, 1)
+                                        self.assertAlmostEqual(value/1e5, 
5643.34067090/1e5, 6)
 
                             elif param == 'chi2':
                                 if model == MODEL_NOREX: