Author: bugman Date: Mon Apr 14 14:39:06 2008 New Revision: 5672 URL: http://svn.gna.org/viewcvs/relax?rev=5672&view=rev Log: The test_opt_constr_bfgs_mt_S2_0_970_te_2048_Rex_0_149() system test now passes on 32 bit Linux. 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=5672&r1=5671&r2=5672&view=diff ============================================================================== --- 1.3/test_suite/system_tests/model_free.py (original) +++ 1.3/test_suite/system_tests/model_free.py Mon Apr 14 14:39:06 2008 @@ -249,21 +249,26 @@ # Alias the relevent spin container. spin = relax_data_store[relax_data_store.current_pipe].mol[0].res[1].spin[0] - # Get the debugging message. - mesg = self.mesg_opt_debug(spin) - - # Test the values. - self.assertEqual(relax_data_store[relax_data_store.current_pipe].mol[0].res[0].spin[0].select, False, msg=mesg) - self.assertEqual(spin.select, True, msg=mesg) - self.assertAlmostEqual(spin.s2, 0.970, msg=mesg) - self.assertAlmostEqual(spin.te, 2048 * 1e-12, msg=mesg) - self.assertAlmostEqual(spin.rex, 0.149 / (2.0 * pi * spin.frq[0])**2, msg=mesg) - self.assertAlmostEqual(spin.chi2, 3.1024517431117421e-27, msg=mesg) - self.assertEqual(spin.iter, 120, msg=mesg) - self.assertEqual(spin.f_count, 384, msg=mesg) - self.assertEqual(spin.g_count, 384, msg=mesg) - self.assertEqual(spin.h_count, 0, msg=mesg) - self.assertEqual(spin.warning, None, msg=mesg) + # Optimisation values (from 32 bit Linux as the standard). + select = True + s2 = 0.970 + te = 2048 * 1e-12 + rex = 0.149 / (2.0 * pi * spin.frq[0])**2 + chi2 = 3.1024517431117421e-27 + iter = 120 + f_count = 388 + g_count = 388 + h_count = 0 + warning = None + + # Optimisation differences. + if SYSTEM == 'Linux' and ARCH[0] == '64bit': + f_count = 384 + g_count = 384 + + # Test the values. + self.assertEqual(relax_data_store[relax_data_store.current_pipe].mol[0].res[0].spin[0].select, False) + self.value_test(spin, select, s2, te, rex, chi2, iter, f_count, g_count, h_count, warning) def test_opt_constr_cd_back_S2_0_970_te_2048_Rex_0_149(self):