Author: bugman
Date: Fri Feb 25 18:46:52 2011
New Revision: 12634
URL: http://svn.gna.org/viewcvs/relax?rev=12634&view=rev
Log:
Loosened all of the model-free tests so that the minimisation statistics are
no longer checked.
The same result was being obtained on different platforms, different Python
versions, and different
numpy versions, but the minimisation statistics were slightly different. The
iter, f_count, g_count
h_count, and warning variables are no longer checked. This will stop users
from thinking they have
a problem with their version of relax, after running the test suite.
Modified:
1.3/test_suite/system_tests/model_free.py
Modified: 1.3/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=12634&r1=12633&r2=12634&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Fri Feb 25 18:46:52 2011
@@ -823,7 +823,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_opt_constr_bfgs_mt_S2_0_970_te_2048_Rex_0_149(self):
@@ -1008,7 +1008,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_opt_constr_cd_back_S2_0_970_te_2048_Rex_0_149(self):
@@ -1077,7 +1077,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_opt_constr_cd_mt_S2_0_970_te_2048_Rex_0_149(self):
@@ -1218,7 +1218,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_opt_constr_newton_gmw_back_S2_0_970_te_2048_Rex_0_149(self):
@@ -1360,7 +1360,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_opt_constr_newton_gmw_mt_S2_0_970_te_2048_Rex_0_149(self):
@@ -1535,7 +1535,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_opt_constr_sd_back_S2_0_970_te_2048_Rex_0_149(self):
@@ -1604,7 +1604,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_opt_constr_sd_mt_S2_0_970_te_2048_Rex_0_149(self):
@@ -1673,7 +1673,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_opt_grid_search_S2_0_970_te_2048_Rex_0_149(self):
@@ -1737,7 +1737,7 @@
# Test the values.
self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
- self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2, iter=iter, f_count=f_count, g_count=g_count, h_count=h_count,
warning=warning)
+ self.value_test(spin, select=select, s2=s2, te=te, rex=rex,
chi2=chi2)
def test_read_relax_data(self):
r12634 - /1.3/test_suite/system_tests/model_free.py