r5726 - in /branches/spin_loop_bool: ./ test_suite/system_tests/model_free.py -- April 14, 2008 - 23:39

Author: bugman
Date: Mon Apr 14 23:39:51 2008
New Revision: 5726

URL: http://svn.gna.org/viewcvs/relax?rev=5726&view=rev
Log:
Merged revisions 5711-5724 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r5721 | bugman | 2008-04-14 22:39:19 +0200 (Mon, 14 Apr 2008) | 3 lines
  
  Fixes for the test_opt_constr_sd_back_S2_0_970_te_2048_Rex_0_149() system 
test on 64 bit Linux.
........
  r5722 | bugman | 2008-04-14 22:50:50 +0200 (Mon, 14 Apr 2008) | 3 lines
  
  Fixes for the test_opt_constr_newton_gmw_mt_S2_0_970_te_2048_Rex_0_149() 
system test for 64 bit Linux.
........
  r5723 | bugman | 2008-04-14 22:52:44 +0200 (Mon, 14 Apr 2008) | 3 lines
  
  Modified the mesg_opt_debug() method to print only opt info rather than 
everything in the spin cont.
........
  r5724 | bugman | 2008-04-14 22:58:00 +0200 (Mon, 14 Apr 2008) | 3 lines
  
  Fixed all the model-free optimisation system tests for 64 bit Linux.
........

Modified:
    branches/spin_loop_bool/   (props changed)
    branches/spin_loop_bool/test_suite/system_tests/model_free.py

Propchange: branches/spin_loop_bool/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 14 23:39:51 2008
@@ -1,1 +1,1 @@
-/1.3:1-5710
+/1.3:1-5724

Modified: branches/spin_loop_bool/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/spin_loop_bool/test_suite/system_tests/model_free.py?rev=5726&r1=5725&r2=5726&view=diff
==============================================================================
--- branches/spin_loop_bool/test_suite/system_tests/model_free.py (original)
+++ branches/spin_loop_bool/test_suite/system_tests/model_free.py Mon Apr 14 
23:39:51 2008
@@ -90,8 +90,17 @@
         string = string + "Python version: " + PY_VER + "\n"
         string = string + "numpy version: " + numpy.__version__ + "\n"
 
-        # Add the SpinContainer contents.
-        string = string + "\n\n" + `spin`
+
+        # Minimisation info.
+        string = string + "\n\n%-10s%10.16f" % ('s2:', spin.s2)
+        string = string + "\n%-10s%10.13f" % ('te:', spin.te * 1e12)
+        string = string + "\n%-10s%10.17f" % ('rex:', spin.rex * (2.0 * pi * 
spin.frq[0])**2)
+        string = string + "\n%-10s%10.17g" % ('chi2:', spin.chi2)
+        string = string + "\n%-10s%-10i" % ('iter:', spin.iter)
+        string = string + "\n%-10s%-10i" % ('f_count:', spin.f_count)
+        string = string + "\n%-10s%-10i" % ('g_count:', spin.g_count)
+        string = string + "\n%-10s%-10i" % ('h_count:', spin.h_count)
+        string = string + "\n%-10s%-10s" % ('warning:', spin.warning)
 
         # Return the string.
         return string
@@ -220,7 +229,10 @@
 
         # Optimisation differences.
         if SYSTEM == 'Linux' and ARCH[0] == '64bit':
-            chi2 = 5.24794913425e-24
+            s2 = 0.9699999999999785
+            te = 2047.9999999962433
+            rex = 0.14900000000039709
+            chi2 = 5.2479491342506911e-24
             iter = 162
             f_count = 758
             g_count = 169
@@ -270,7 +282,10 @@
 
         # Optimisation differences.
         if SYSTEM == 'Linux' and ARCH[0] == '64bit':
-            chi2 = 3.1024517431117421e-27
+            s2 = 0.9700000000000603
+            te = 2048.0000000114601
+            rex = 0.14899999999886163
+            chi2 = 4.7289676642197204e-23
             f_count = 384
             g_count = 384
 
@@ -409,6 +424,13 @@
         h_count = 18
         warning = None
 
+        # Optimisation differences.
+        if SYSTEM == 'Linux' and ARCH[0] == '64bit':
+            s2 = 0.9699999999999995
+            te = 2048.0000000000473
+            rex = 0.14900000000001926
+            chi2 = 7.93572083972557e-28
+
         # 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)
@@ -455,6 +477,10 @@
 
         # Optimisation differences.
         if SYSTEM == 'Linux' and ARCH[0] == '64bit':
+            s2 = 0.9699999999999994
+            te = 2048.0000000000445
+            rex = 0.14900000000001614
+            chi2 = 8.331260138136833e-28
             f_count = 91
             g_count = 91
 
@@ -500,6 +526,13 @@
         g_count = 51
         h_count = 0
         warning = 'Maximum number of iterations reached'
+
+        # Optimisation differences.
+        if SYSTEM == 'Linux' and ARCH[0] == '64bit':
+            s2 = 0.915792208346891567
+            te = 0.305686587225278583
+            rex = 0.340084097980648314
+            chi2 = 68.321956795340568647
 
         # Test the values.
         
self.assertEqual(relax_data_store[relax_data_store.current_pipe].mol[0].res[0].spin[0].select,
 False)