r9339 - /1.3/test_suite/system_tests/model_free.py -- August 19, 2009 - 14:19

Author: bugman
Date: Wed Aug 19 14:19:34 2009
New Revision: 9339

URL: http://svn.gna.org/viewcvs/relax?rev=9339&view=rev
Log:
Fix for the test_opt_constr_newton_gmw_mt_S2_0_970_te_2048_Rex_0_149() system 
test.

The 2 different f and g count values on 64-bit GNU/Linux are now checked.  
This difference is
present even when the same Python and numpy versions are used, and is 
therefore likely to be gcc
or the blas/lapack libraries causing differences.


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=9339&r1=9338&r2=9339&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Wed Aug 19 14:19:34 2009
@@ -586,21 +586,23 @@
         rex = 0.14900000000002225
         chi2 = 6.8756889983348349e-28
         iter = 22
-        f_count = 159
-        g_count = 159
+        f_count = [159]
+        g_count = [159]
         h_count = 22
         warning = None
 
         # Optimisation differences.
         if SYSTEM == 'Linux' and ARCH[0] == '64bit':
-            f_count = 153
-            g_count = 153
+            f_count.append(91)
+            g_count.append(91)
+            f_count.append(153)    # Not sure why there is a difference 
here, maybe this is gcc or blas/lapack (Python and numpy versions are 
identical).
+            g_count.append(153)
         elif SYSTEM == 'Windows' and ARCH[0] == '32bit':
-            f_count = 165
-            g_count = 165
+            f_count.append(165)
+            g_count.append(165)
         elif SYSTEM == 'Darwin' and ARCH[0] == '32bit':
-            f_count = 160
-            g_count = 160
+            f_count.append(160)
+            g_count.append(160)
 
         # Test the values.
         self.assertEqual(cdp.mol[0].res[0].spin[0].select, False)
@@ -1097,6 +1099,14 @@
         # Get the debugging message.
         mesg = self.mesg_opt_debug(spin)
 
+        # Convert to lists.
+        if type(f_count) != list:
+            f_count = [f_count]
+        if type(g_count) != list:
+            g_count = [g_count]
+        if type(h_count) != list:
+            h_count = [h_count]
+
         # Test all the values.
         self.assertEqual(spin.select, select, msg=mesg)
         self.assertAlmostEqual(spin.s2, s2, msg=mesg)
@@ -1104,7 +1114,7 @@
         self.assertAlmostEqual(spin.rex * (2.0 * pi * spin.frq[0])**2, rex, 
msg=mesg)
         self.assertAlmostEqual(spin.chi2, chi2, msg=mesg)
         self.assertEqual(spin.iter, iter, msg=mesg)
-        self.assertEqual(spin.f_count, f_count, msg=mesg)
-        self.assertEqual(spin.g_count, g_count, msg=mesg)
-        self.assertEqual(spin.h_count, h_count, msg=mesg)
+        self.assert_(spin.f_count in f_count, msg=mesg)
+        self.assert_(spin.g_count in g_count, msg=mesg)
+        self.assert_(spin.h_count in h_count, msg=mesg)
         self.assertEqual(spin.warning, warning, msg=mesg)