Author: bugman
Date: Thu May 1 12:23:53 2008
New Revision: 6019
URL: http://svn.gna.org/viewcvs/relax?rev=6019&view=rev
Log:
Blocked revisions 5973-6012,6015-6016,6018 via svnmerge
........
r5973 | bugman | 2008-04-24 15:47:39 +0200 (Thu, 24 Apr 2008) | 3 lines
Added a few single letter command line options for running the test-suite.
........
r5974 | bugman | 2008-04-24 16:37:21 +0200 (Thu, 24 Apr 2008) | 6 lines
Converted the C modules to use numpy rather than Numeric.
This is going to require the use of numpy.get_include() to find the
location of the headers to
re-enable compilation.
........
r5975 | bugman | 2008-04-24 16:41:54 +0200 (Thu, 24 Apr 2008) | 3 lines
Fixed the C module compilation by adding numpy.get_include() to the list of
C include flags.
........
r5976 | bugman | 2008-04-24 16:50:20 +0200 (Thu, 24 Apr 2008) | 3 lines
Shifted the relaxation curve fitting script to the scripts directory.
........
r5977 | bugman | 2008-04-24 16:51:43 +0200 (Thu, 24 Apr 2008) | 3 lines
Shifted the relaxation curve fitting data into the
'test_suite/shared_data/' directory.
........
r5978 | bugman | 2008-04-24 16:53:08 +0200 (Thu, 24 Apr 2008) | 3 lines
Removed the call to state.save().
........
r5979 | bugman | 2008-04-24 16:54:34 +0200 (Thu, 24 Apr 2008) | 3 lines
Converted the relaxation curve fitting script to the new relax design.
........
r5980 | bugman | 2008-04-24 16:54:59 +0200 (Thu, 24 Apr 2008) | 3 lines
Fixed the data pipe creation.
........
r5981 | bugman | 2008-04-24 16:56:05 +0200 (Thu, 24 Apr 2008) | 3 lines
Removed the commented out file writing user function.
........
r5982 | bugman | 2008-04-24 17:14:07 +0200 (Thu, 24 Apr 2008) | 6 lines
Enabled the relaxation curve fitting system test.
This was done by writing a small method, test_curve_fitting(), which
executes the relax_fit.py
script.
........
r5983 | bugman | 2008-04-24 17:20:18 +0200 (Thu, 24 Apr 2008) | 3 lines
Fixed the paths to the data files in the relaxation curve fitting script.
........
r5984 | bugman | 2008-04-24 17:30:49 +0200 (Thu, 24 Apr 2008) | 3 lines
Converted the read() method to the new relax design.
........
r5985 | bugman | 2008-04-24 17:31:36 +0200 (Thu, 24 Apr 2008) | 3 lines
Copyright notice update.
........
r5986 | bugman | 2008-04-24 17:32:40 +0200 (Thu, 24 Apr 2008) | 3 lines
Added a module docstring.
........
r5987 | bugman | 2008-04-24 17:33:56 +0200 (Thu, 24 Apr 2008) | 3 lines
Converted all class methods into module functions, and deleted the class.
........
r5988 | bugman | 2008-04-24 17:53:20 +0200 (Thu, 24 Apr 2008) | 3 lines
Converted the read function to the new relax design.
........
r5989 | bugman | 2008-04-24 17:55:21 +0200 (Thu, 24 Apr 2008) | 3 lines
Removed the call to the data_init() method.
........
r5990 | bugman | 2008-04-24 17:57:14 +0200 (Thu, 24 Apr 2008) | 3 lines
Fixed the set up of the num_spectra global object.
........
r5991 | bugman | 2008-04-24 17:59:42 +0200 (Thu, 24 Apr 2008) | 3 lines
Added a missing import.
........
r5992 | bugman | 2008-04-24 18:00:43 +0200 (Thu, 24 Apr 2008) | 3 lines
Added another missing import.
........
r5993 | bugman | 2008-04-24 18:05:24 +0200 (Thu, 24 Apr 2008) | 3 lines
Converted the number_of_header_lines() function to the new design.
........
r5994 | bugman | 2008-04-24 18:20:43 +0200 (Thu, 24 Apr 2008) | 3 lines
The int_col arg is now being passed into all the required functions.
........
r5995 | bugman | 2008-04-24 18:22:03 +0200 (Thu, 24 Apr 2008) | 3 lines
int_col is now passed into intensity_xeasy(), just in case.
........
r5996 | bugman | 2008-04-24 18:39:33 +0200 (Thu, 24 Apr 2008) | 3 lines
Fixed a name clash between the intensity arg and intensity fn.
........
r5997 | bugman | 2008-04-25 11:21:11 +0200 (Fri, 25 Apr 2008) | 3 lines
The curve fitting system test script now names the spins so they can be
matched to the assignments.
........
r5998 | bugman | 2008-04-25 11:24:25 +0200 (Fri, 25 Apr 2008) | 3 lines
Renamed the rename() and renumber() fns to name() and number() respectively.
........
r5999 | bugman | 2008-04-25 11:24:49 +0200 (Fri, 25 Apr 2008) | 3 lines
Copyright statement update.
........
r6000 | bugman | 2008-04-25 11:29:34 +0200 (Fri, 25 Apr 2008) | 3 lines
Renamed the spin.rename() and spin.renumber() user fns to spin.name() and
spin.number().
........
r6001 | bugman | 2008-04-25 11:31:45 +0200 (Fri, 25 Apr 2008) | 3 lines
The spin_id args to spin.name() and spin.number() can now be None to
identify all spins.
........
r6002 | bugman | 2008-04-25 11:37:00 +0200 (Fri, 25 Apr 2008) | 3 lines
Fixes for all the unit tests of the spin naming an numbering functions.
........
r6003 | bugman | 2008-04-25 11:37:56 +0200 (Fri, 25 Apr 2008) | 3 lines
Fixed the call to generic_fns.spin.name().
........
r6004 | bugman | 2008-04-25 11:45:05 +0200 (Fri, 25 Apr 2008) | 3 lines
Simplified the name() and number() functions. They now handle complex spin
selections.
........
r6005 | bugman | 2008-04-25 11:58:51 +0200 (Fri, 25 Apr 2008) | 3 lines
Updated the relaxation curve fitting system test script to call spin.name().
........
r6006 | bugman | 2008-04-25 11:59:06 +0200 (Fri, 25 Apr 2008) | 3 lines
Updated the assign_function() method to the new relax design.
........
r6007 | bugman | 2008-04-25 12:11:13 +0200 (Fri, 25 Apr 2008) | 3 lines
Converted the mean_and_error() method to the new relax design.
........
r6008 | bugman | 2008-04-25 12:14:06 +0200 (Fri, 25 Apr 2008) | 3 lines
Added some missing imports and fixed an incorrectly named function call.
........
r6009 | bugman | 2008-04-25 12:15:11 +0200 (Fri, 25 Apr 2008) | 5 lines
Fix for the mean_and_error() method.
The spin container was being referred to as 'data' rather than 'spin'.
........
r6010 | bugman | 2008-04-25 12:30:40 +0200 (Fri, 25 Apr 2008) | 3 lines
Big spelling fix! Renamed all references to 'unselect' to 'deselect'.
........
r6011 | bugman | 2008-04-25 12:31:19 +0200 (Fri, 25 Apr 2008) | 3 lines
Renamed the prompt.unselect module to prompt.deselect.
........
r6012 | bugman | 2008-04-25 17:14:23 +0200 (Fri, 25 Apr 2008) | 7 lines
Improvements to the STDOUT and STDERR handling in the _RelaxTestResult
class.
Now STDOUT and STDERR are stored simultaneously within the same StringIO()
instance so that the
streams are merged into one. This means that the test suite tests print
out the messages as they
would appear on screen.
........
r6015 | bugman | 2008-05-01 11:56:06 +0200 (Thu, 01 May 2008) | 3 lines
Spelling fixes: Renamed all references to 'unselect' to 'deselect' in the
manual.
........
r6016 | bugman | 2008-05-01 12:03:26 +0200 (Thu, 01 May 2008) | 3 lines
One last renaming of 'Unselect' to 'Deselect'.
........
r6018 | bugman | 2008-05-01 12:22:02 +0200 (Thu, 01 May 2008) | 3 lines
Added a section for PyMOL in the installation chapter.
........
Modified:
1.2/ (props changed)
Propchange: 1.2/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
r6019 - /1.2/