Author: bugman
Date: Tue Nov 11 09:53:01 2014
New Revision: 26504
URL: http://svn.gna.org/viewcvs/relax?rev=26504&view=rev
Log:
Fixes for the Relax_disp.test_hansen_cpmg_data_missing_auto_analysis system
test for certain systems.
The optimisation precision has been increased, and the value checking
precision has been decreased.
This change is to allow the test to pass on Python 2.5 and 3.1 on a 32-bit
GNU/Linux system. This
may be related to 32-bit numpy 1.6.2 verses later numpy versions causing
precision differences.
Modified:
trunk/test_suite/system_tests/relax_disp.py
trunk/test_suite/system_tests/scripts/relax_disp/hansen_data_missing.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=26504&r1=26503&r2=26504&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Tue Nov 11 09:53:01 2014
@@ -4186,7 +4186,7 @@
self.assertAlmostEqual(spin4.r2[r20_key1], 1.60463650370664, 2)
self.assertAlmostEqual(spin4.r2[r20_key2], 1.63221675941434, 3)
#self.assertAlmostEqual(spin4.pA, 0.818979078699935, 3) # As dw
(and kex) is zero, this parameter is not stable.
- self.assertAlmostEqual(spin4.dw, 0.0, 5)
+ self.assertAlmostEqual(spin4.dw, 0.0, 2)
self.assertAlmostEqual(spin4.kex/10000, 0.0, 3)
self.assertAlmostEqual(spin4.chi2/100, 26.7356711142038/100, 3)
self.assertAlmostEqual(spin70.r2[r20_key1], 6.97268077496405, 3)
@@ -4197,7 +4197,7 @@
self.assertAlmostEqual(spin70.chi2, 53.8382196964083, 3)
self.assertAlmostEqual(spin71.r2[r20_key1], 4.98123328466942, 3)
self.assertAlmostEqual(spin71.pA, 0.996607425484157, 3)
- self.assertAlmostEqual(spin71.dw, 4.34346257383825, 3)
+ self.assertAlmostEqual(spin71.dw, 4.34346257383825, 2)
self.assertAlmostEqual(spin71.kex/10000, 1936.73197158804/10000, 3)
self.assertAlmostEqual(spin71.chi2, 5.51703791653689, 3)
Modified:
trunk/test_suite/system_tests/scripts/relax_disp/hansen_data_missing.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/hansen_data_missing.py?rev=26504&r1=26503&r2=26504&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/relax_disp/hansen_data_missing.py
(original)
+++ trunk/test_suite/system_tests/scripts/relax_disp/hansen_data_missing.py
Tue Nov 11 09:53:01 2014
@@ -51,7 +51,7 @@
##########################
# Run fast.
-Relax_disp.opt_func_tol = 1e-5
+Relax_disp.opt_func_tol = 1e-6
Relax_disp.opt_max_iterations = 10000
# Do not change!
r26504 - in /trunk/test_suite/system_tests: relax_disp.py scripts/relax_disp/hansen_data_missing.py