Author: bugman Date: Sun Jun 8 15:46:17 2008 New Revision: 6353 URL: http://svn.gna.org/viewcvs/relax?rev=6353&view=rev Log: Merged revisions 6333,6335-6352 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_data_rearrange ........ r6333 | bugman | 2008-06-08 12:47:05 +0200 (Sun, 08 Jun 2008) | 3 lines Created a temporary branch for rearranging the relax_data module. ........ r6335 | bugman | 2008-06-08 13:22:29 +0200 (Sun, 08 Jun 2008) | 3 lines Shifted the relax_data module from specific_fns to generic_fns. ........ r6336 | bugman | 2008-06-08 13:24:28 +0200 (Sun, 08 Jun 2008) | 3 lines Fixed some imports of relax_data. ........ r6337 | bugman | 2008-06-08 13:35:43 +0200 (Sun, 08 Jun 2008) | 3 lines Converted all class methods into module functions. ........ r6338 | bugman | 2008-06-08 13:37:28 +0200 (Sun, 08 Jun 2008) | 3 lines Fixed the relax_data imports again. ........ r6339 | bugman | 2008-06-08 14:01:49 +0200 (Sun, 08 Jun 2008) | 3 lines Wrote the arg unit tests of the relax_data.back_calc() user function. ........ r6340 | bugman | 2008-06-08 14:02:37 +0200 (Sun, 08 Jun 2008) | 3 lines Updated the relax_data.back_calc() user function to the new design. ........ r6341 | bugman | 2008-06-08 14:16:34 +0200 (Sun, 08 Jun 2008) | 3 lines Fixes for the read(), data_init(), and data_name() (now get_data_name()) functions. ........ r6342 | bugman | 2008-06-08 14:22:54 +0200 (Sun, 08 Jun 2008) | 3 lines Shifted the test_relax_data unit test module from _specific_fns to _generic_fns. ........ r6343 | bugman | 2008-06-08 14:25:20 +0200 (Sun, 08 Jun 2008) | 3 lines Unit test fixes for the shift of relax_data from specific_fns to generic_fns. ........ r6344 | bugman | 2008-06-08 14:25:56 +0200 (Sun, 08 Jun 2008) | 3 lines Updated a copyright notice. ........ r6345 | bugman | 2008-06-08 14:37:30 +0200 (Sun, 08 Jun 2008) | 3 lines Updated the relax_data.copy() user function interface to the new design. ........ r6346 | bugman | 2008-06-08 14:42:28 +0200 (Sun, 08 Jun 2008) | 3 lines Wrote 4 arg unit tests for the relax_data.copy() user function. ........ r6347 | bugman | 2008-06-08 15:05:01 +0200 (Sun, 08 Jun 2008) | 3 lines Converted all of the relax_data user function interfaces to the new design. ........ r6348 | bugman | 2008-06-08 15:14:26 +0200 (Sun, 08 Jun 2008) | 3 lines Wrote 9 arg unit tests for the remainder of the relax_data user functions. ........ r6349 | bugman | 2008-06-08 15:14:57 +0200 (Sun, 08 Jun 2008) | 3 lines Added a missing RelaxError import. ........ r6350 | bugman | 2008-06-08 15:17:17 +0200 (Sun, 08 Jun 2008) | 3 lines Fixed the testing of the file arg in the relax_data.write() user function interface. ........ r6351 | bugman | 2008-06-08 15:22:05 +0200 (Sun, 08 Jun 2008) | 3 lines Finished converting the add_data_to_spin() function to the new design. ........ Added: 1.3/generic_fns/relax_data.py - copied unchanged from r6351, branches/relax_data_rearrange/generic_fns/relax_data.py 1.3/test_suite/unit_tests/_generic_fns/test_relax_data.py - copied unchanged from r6351, branches/relax_data_rearrange/test_suite/unit_tests/_generic_fns/test_relax_data.py Removed: 1.3/specific_fns/relax_data.py 1.3/test_suite/unit_tests/_specific_fns/test_relax_data.py Modified: 1.3/ (props changed) 1.3/generic_fns/__init__.py 1.3/prompt/relax_data.py 1.3/specific_fns/__init__.py 1.3/specific_fns/model_free/results.py 1.3/test_suite/unit_tests/_generic_fns/__init__.py 1.3/test_suite/unit_tests/_prompt/test_relax_data.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: 1.3/generic_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/__init__.py?rev=6353&r1=6352&r2=6353&view=diff Modified: 1.3/prompt/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/prompt/relax_data.py?rev=6353&r1=6352&r2=6353&view=diff Modified: 1.3/specific_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/__init__.py?rev=6353&r1=6352&r2=6353&view=diff Modified: 1.3/specific_fns/model_free/results.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/results.py?rev=6353&r1=6352&r2=6353&view=diff Removed: 1.3/specific_fns/relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_data.py?rev=6352&view=auto Modified: 1.3/test_suite/unit_tests/_generic_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_generic_fns/__init__.py?rev=6353&r1=6352&r2=6353&view=diff Modified: 1.3/test_suite/unit_tests/_prompt/test_relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_relax_data.py?rev=6353&r1=6352&r2=6353&view=diff Removed: 1.3/test_suite/unit_tests/_specific_fns/test_relax_data.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_specific_fns/test_relax_data.py?rev=6352&view=auto