r9220 - /1.3/test_suite/unit_tests/_maths_fns/test_n_state_model.py -- July 14, 2009 - 11:31

Author: bugman
Date: Tue Jul 14 11:31:51 2009
New Revision: 9220

URL: http://svn.gna.org/viewcvs/relax?rev=9220&view=rev
Log:
Fixes for all the N-state model optimisation unit tests.


Modified:
    1.3/test_suite/unit_tests/_maths_fns/test_n_state_model.py

Modified: 1.3/test_suite/unit_tests/_maths_fns/test_n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_maths_fns/test_n_state_model.py?rev=9220&r1=9219&r2=9220&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_maths_fns/test_n_state_model.py (original)
+++ 1.3/test_suite/unit_tests/_maths_fns/test_n_state_model.py Tue Jul 14 
11:31:51 2009
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2008 Edward d'Auvergne                                       
 #
+# Copyright (C) 2008-2009 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -43,10 +43,8 @@
         # Init vals.
         N = 2
         init_params = array([0.5, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], float64)
-        full_tensors = array([[[1.0, 0.0, 0.0], [0.0, 0.5, 0.0], [0.0, 0.0, 
-1.5]],
-                              [[1.0, 1.0, 0.0], [1.0, 0.5, 0.0], [0.0, 0.0, 
-1.5]],
-                              [[1.0, 0.0, 1.0], [0.0, 0.5, 0.0], [1.0, 0.0, 
-1.5]]], float64)
-        red_data = array([1.0, 0.5, 0.0, 0.0, 0.0, 1.0, 0.5, 1.0, 0.0, 0.0, 
1.0, 0.5, 0.0, 1.0, 0.0], float64)
+        full_tensors = array([1.0, 0.5, 0.0, 0.0, 0.0, 1.0, 0.5, 1.0, 0.0, 
0.0, 1.0, 0.5, 0.0, 1.0, 0.0], float64)
+        red_data     = array([1.0, 0.5, 0.0, 0.0, 0.0, 1.0, 0.5, 1.0, 0.0, 
0.0, 1.0, 0.5, 0.0, 1.0, 0.0], float64)
         err = ones(3*5, float64)
         full_in_ref_frame = [1, 1, 1]
 
@@ -73,10 +71,8 @@
         # Init vals.
         N = 2
         init_params = array([0.5, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], float64)
-        full_tensors = array([[[1.0, 0.0, 0.0], [0.0, 0.0, 0.0], [0.0, 0.0, 
-1.0]],
-                              [[1.0, 1.0, 0.0], [1.0, 0.0, 0.0], [0.0, 0.0, 
-1.0]],
-                              [[1.0, 0.0, 1.0], [0.0, 0.0, 0.0], [1.0, 0.0, 
-1.0]]], float64)
-        red_data = array([1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 
1.0, 0.0, 0.0, 1.0, 0.0], float64)
+        full_tensors = array([1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 0.0, 
0.0, 1.0, 0.0, 0.0, 1.0, 0.0], float64)
+        red_data     = array([1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 
0.0, 1.0, 0.0, 0.0, 1.0, 0.0], float64)
         err = ones(3*5, float64)
         full_in_ref_frame = [1, 1, 1]
 
@@ -103,10 +99,8 @@
         # Init vals.
         N = 2
         init_params = array([1.0, pi/2.0, 0.0, 0.0, 0.0, 0.0, 0.0], float64)
-        full_tensors = array([[[1.0, 0.0, 0.0], [0.0, 0.5, 0.0], [0.0, 0.0, 
-1.5]],
-                              [[1.0, 1.0, 0.0], [1.0, 0.5, 0.0], [0.0, 0.0, 
-1.5]],
-                              [[1.0, 0.0, 1.0], [0.0, 0.5, 0.0], [1.0, 0.0, 
-1.5]]], float64)
-        red_data = array([0.5, 1.0, 0.0, 0.0, 0.0, 0.5, 1.0, -1.0, 0.0, 0.0, 
0.5, 1.0, 0.0, 0.0, 1.0], float64)
+        full_tensors = array([1.0, 0.5, 0.0, 0.0, 0.0, 1.0, 0.5, 1.0, 0.0, 
0.0, 1.0, 0.5, 0.0, 1.0, 0.0], float64)
+        red_data     = array([0.5, 1.0, 0.0, 0.0, 0.0, 0.5, 1.0, -1.0, 0.0, 
0.0, 0.5, 1.0, 0.0, 0.0, 1.0], float64)
         err = ones(3*5, float64)
         full_in_ref_frame = [1, 1, 1]
 
@@ -133,10 +127,8 @@
         # Init vals.
         N = 2
         init_params = array([0.5, pi/2.0, 0.0, 0.0, 0.0, 0.0, 0.0], float64)
-        full_tensors = array([[[1.0, 0.0, 0.0], [0.0, 0.5, 0.0], [0.0, 0.0, 
-1.5]],
-                              [[1.0, 1.0, 0.0], [1.0, 0.5, 0.0], [0.0, 0.0, 
-1.5]],
-                              [[1.0, 0.0, 1.0], [0.0, 0.5, 0.0], [1.0, 0.0, 
-1.5]]], float64)
-        red_data = array([0.75, 0.75, 0.0, 0.0, 0.0, 0.75, 0.75, 0.0, 0.0, 
0.0, 0.75, 0.75, 0.0, 0.5, 0.5], float64)
+        full_tensors = array([1.0, 0.5, 0.0, 0.0, 0.0, 1.0, 0.5, 1.0, 0.0, 
0.0, 1.0, 0.5, 0.0, 1.0, 0.0], float64)
+        red_data     = array([0.75, 0.75, 0.0, 0.0, 0.0, 0.75, 0.75, 0.0, 
0.0, 0.0, 0.75, 0.75, 0.0, 0.5, 0.5], float64)
         err = ones(3*5, float64)
         full_in_ref_frame = [1, 1, 1]