r19649 - in /branches/relax_disp: ./ pipe_control/value.py test_suite/system_tests/__init__.py test_suite/system_tests/value.py -- May 03, 2013 - 19:26

Author: bugman
Date: Fri May  3 19:26:45 2013
New Revision: 19649

URL: http://svn.gna.org/viewcvs/relax?rev=19649&view=rev
Log:
Merged revisions 19647-19648 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19647 | bugman | 2013-05-03 19:18:42 +0200 (Fri, 03 May 2013) | 5 lines
  
  Created the new Value system test class with the first test 
Value.test_value_copy.
  
  This test demonstrates some pretty large bugs in the value.copy user 
function.
........
  r19648 | bugman | 2013-05-03 19:21:00 +0200 (Fri, 03 May 2013) | 3 lines
  
  Big bug fix for the value.copy user function - it is now functional again.
........

Added:
    branches/relax_disp/test_suite/system_tests/value.py
      - copied unchanged from r19648, trunk/test_suite/system_tests/value.py
Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/value.py
    branches/relax_disp/test_suite/system_tests/__init__.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May  3 19:26:45 2013
@@ -1,1 +1,1 @@
-/trunk:1-19617
+/trunk:1-19648

Modified: branches/relax_disp/pipe_control/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/value.py?rev=19649&r1=19648&r2=19649&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/value.py (original)
+++ branches/relax_disp/pipe_control/value.py Fri May  3 19:26:45 2013
@@ -69,7 +69,7 @@
     return_value = specific_analyses.setup.get_specific_fn('return_value', 
pipes.get_type(pipe_from))
 
     # Test if the data exists for pipe_to.
-    for spin in spin_loop(pipe_to):
+    for spin in spin_loop(pipe=pipe_to):
         # Get the value and error for pipe_to.
         value, error = return_value(spin, param)
 
@@ -78,15 +78,12 @@
             raise RelaxValueError(param, pipe_to)
 
     # Copy the values.
-    for spin, spin_id in spin_loop(pipe_from, return_id=True):
+    for spin, spin_id in spin_loop(pipe=pipe_from, return_id=True):
         # Get the value and error from pipe_from.
         value, error = return_value(spin, param)
 
-        # Get the equivalent spin in pipe_to.
-        spin_to = return_spin(spin_id, pipe_to)
-
         # Set the values of pipe_to.
-        set(spin_id=spin_to, value=value, error=error, param=param)
+        set(spin_id=spin_id, val=value, error=error, param=param)
 
     # Reset all minimisation statistics.
     minimise.reset_min_stats(pipe_to)

Modified: branches/relax_disp/test_suite/system_tests/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/__init__.py?rev=19649&r1=19648&r2=19649&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/__init__.py (original)
+++ branches/relax_disp/test_suite/system_tests/__init__.py Fri May  3 
19:26:45 2013
@@ -65,6 +65,7 @@
 from test_suite.system_tests.state import State
 from test_suite.system_tests.structure import Structure
 from test_suite.system_tests.unit_vectors import Unit_vectors
+from test_suite.system_tests.value import Value
 
 
 __all__ = ['align_tensor',
@@ -100,7 +101,8 @@
            'sequence',
            'state',
            'structure',
-           'unit_vectors']
+           'unit_vectors',
+           'value']
 
 
 class System_test_runner:
@@ -189,6 +191,7 @@
             suite_array.append(TestLoader().loadTestsFromTestCase(State))
             suite_array.append(TestLoader().loadTestsFromTestCase(Structure))
             
suite_array.append(TestLoader().loadTestsFromTestCase(Unit_vectors))
+            suite_array.append(TestLoader().loadTestsFromTestCase(Value))
 
         # Group all tests together.
         full_suite = TestSuite(suite_array)