Author: bugman
Date: Fri Mar 28 18:51:44 2014
New Revision: 22605
URL: http://svn.gna.org/viewcvs/relax?rev=22605&view=rev
Log:
Merged revisions 22584-22604 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22584 | bugman | 2014-03-28 12:17:42 +0100 (Fri, 28 Mar 2014) | 3 lines
Shifted the model-free analysis specific API object to the
specific_analyses.model_free.api module.
........
r22585 | bugman | 2014-03-28 12:24:58 +0100 (Fri, 28 Mar 2014) | 3 lines
Fixes for the new specific_analyses.model_free.api module.
........
r22586 | bugman | 2014-03-28 14:34:03 +0100 (Fri, 28 Mar 2014) | 6 lines
Created the new specific_analyses.model_free.uf module.
This consists of the private methods from the 'main' module which act as
the back end for the user
functions as well as the user function documentation.
........
r22587 | bugman | 2014-03-28 14:56:48 +0100 (Fri, 28 Mar 2014) | 6 lines
Created the new specific_analyses.model_free.parameters module.
This consists of the private methods from the 'main' and 'mf_minimise'.
All class methods have been
converted into functions.
........
r22588 | bugman | 2014-03-28 16:05:19 +0100 (Fri, 28 Mar 2014) | 6 lines
Created the new specific_analyses.model_free.optimisation module.
This consists of the merger of the 'mf_minimise' and
'multi_processor_commands' modules. All the
private class methods have been converted into functions.
........
r22589 | bugman | 2014-03-28 16:56:05 +0100 (Fri, 28 Mar 2014) | 3 lines
Shifted all of the model-free specific analysis API methods into
specific_analyses.model_free.api.
........
r22590 | bugman | 2014-03-28 16:56:59 +0100 (Fri, 28 Mar 2014) | 3 lines
Removal of some unused imports from specific_analyses.model_free.api.
........
r22591 | bugman | 2014-03-28 17:04:41 +0100 (Fri, 28 Mar 2014) | 6 lines
Clean up and refactoring of the specific_analyses.model_free.bmrb module.
The class methods have all been converted into functions, the deleted class
is no longer a base
class for the specific analysis API class.
........
r22592 | bugman | 2014-03-28 17:08:41 +0100 (Fri, 28 Mar 2014) | 6 lines
The read_columnar_results() method has been removed from the specific
analysis API.
This is only for backwards compatibility with ancient relax 1.2 and earlier
model-free results
files, so will never be used by any other analysis.
........
r22593 | bugman | 2014-03-28 17:15:36 +0100 (Fri, 28 Mar 2014) | 3 lines
Updated the model-free specific analysis package __all__ list for the
recent changes.
........
r22594 | bugman | 2014-03-28 17:18:40 +0100 (Fri, 28 Mar 2014) | 5 lines
Converted all of the class methods in specific_analyses.model_free.results
to functions.
This class has been removed from the API as well.
........
r22595 | bugman | 2014-03-28 17:23:24 +0100 (Fri, 28 Mar 2014) | 5 lines
Renamed specific_analyses.model_free.results to back_compat.
This is to make the purpose of the module clearer, to avoid developer
confusion.
........
r22596 | bugman | 2014-03-28 18:00:00 +0100 (Fri, 28 Mar 2014) | 3 lines
Shifted the model-free classic_style_doc user function documentation to the
'uf' module.
........
r22597 | bugman | 2014-03-28 18:09:10 +0100 (Fri, 28 Mar 2014) | 5 lines
Shifted the last private method out of the model-free specific analysis API
class.
It has been converted into a function of the new 'data' module, for lack of
a better name.
........
r22598 | bugman | 2014-03-28 18:19:43 +0100 (Fri, 28 Mar 2014) | 3 lines
Shifted some of the specific_analyses.model_free.parameters functions into
the new 'model' module.
........
r22599 | bugman | 2014-03-28 18:30:36 +0100 (Fri, 28 Mar 2014) | 6 lines
Removed the test_grid_ops() method from the specific analysis API.
This has been shifted into the new lib.optimisation module and converted
into a function, breaking
a number of circular import kludges.
........
r22600 | bugman | 2014-03-28 18:38:59 +0100 (Fri, 28 Mar 2014) | 3 lines
Import fixes for BMRB reading and writing support in the model-free
analysis.
........
r22601 | bugman | 2014-03-28 18:40:54 +0100 (Fri, 28 Mar 2014) | 3 lines
Dasha support fix for the changes to the model-free specific analysis
package.
........
r22602 | bugman | 2014-03-28 18:41:33 +0100 (Fri, 28 Mar 2014) | 3 lines
Modelfree4 support fix for the changes to the model-free specific analysis
package.
........
r22603 | bugman | 2014-03-28 18:45:30 +0100 (Fri, 28 Mar 2014) | 3 lines
Updated the lib package __all__ list.
........
r22604 | bugman | 2014-03-28 18:48:31 +0100 (Fri, 28 Mar 2014) | 3 lines
Alphabetical ordering of functions in the model-free specific analysis
package modules.
........
Added:
branches/double_rotor/lib/optimisation.py
- copied unchanged from r22604, trunk/lib/optimisation.py
branches/double_rotor/specific_analyses/model_free/api.py
- copied unchanged from r22604,
trunk/specific_analyses/model_free/api.py
branches/double_rotor/specific_analyses/model_free/back_compat.py
- copied unchanged from r22604,
trunk/specific_analyses/model_free/back_compat.py
branches/double_rotor/specific_analyses/model_free/data.py
- copied unchanged from r22604,
trunk/specific_analyses/model_free/data.py
branches/double_rotor/specific_analyses/model_free/model.py
- copied unchanged from r22604,
trunk/specific_analyses/model_free/model.py
branches/double_rotor/specific_analyses/model_free/optimisation.py
- copied unchanged from r22604,
trunk/specific_analyses/model_free/optimisation.py
branches/double_rotor/specific_analyses/model_free/parameters.py
- copied unchanged from r22604,
trunk/specific_analyses/model_free/parameters.py
branches/double_rotor/specific_analyses/model_free/uf.py
- copied unchanged from r22604, trunk/specific_analyses/model_free/uf.py
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_model_free/test_api.py
- copied unchanged from r22604,
trunk/test_suite/unit_tests/_specific_analyses/_model_free/test_api.py
Removed:
branches/double_rotor/specific_analyses/model_free/main.py
branches/double_rotor/specific_analyses/model_free/mf_minimise.py
branches/double_rotor/specific_analyses/model_free/multi_processor_commands.py
branches/double_rotor/specific_analyses/model_free/results.py
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_model_free/test_main.py
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/lib/__init__.py
branches/double_rotor/pipe_control/dasha.py
branches/double_rotor/pipe_control/palmer.py
branches/double_rotor/pipe_control/results.py
branches/double_rotor/specific_analyses/api_base.py
branches/double_rotor/specific_analyses/api_common.py
branches/double_rotor/specific_analyses/model_free/__init__.py
branches/double_rotor/specific_analyses/model_free/bmrb.py
branches/double_rotor/specific_analyses/model_free/macro_base.py
branches/double_rotor/specific_analyses/n_state_model/api.py
branches/double_rotor/specific_analyses/setup.py
branches/double_rotor/test_suite/unit_tests/_specific_analyses/test_api.py
branches/double_rotor/user_functions/dx.py
branches/double_rotor/user_functions/eliminate.py
branches/double_rotor/user_functions/grace.py
branches/double_rotor/user_functions/model_free.py
branches/double_rotor/user_functions/molmol.py
branches/double_rotor/user_functions/pymol_control.py
branches/double_rotor/user_functions/value.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/double_rotor/lib/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/lib/__init__.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/pipe_control/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/dasha.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/pipe_control/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/palmer.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/pipe_control/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/pipe_control/results.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/specific_analyses/api_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/api_base.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/specific_analyses/api_common.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/api_common.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/specific_analyses/model_free/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/model_free/__init__.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/specific_analyses/model_free/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/model_free/bmrb.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/specific_analyses/model_free/macro_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/model_free/macro_base.py?rev=22605&r1=22604&r2=22605&view=diff
Removed: branches/double_rotor/specific_analyses/model_free/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/model_free/main.py?rev=22604&view=auto
Removed: branches/double_rotor/specific_analyses/model_free/mf_minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/model_free/mf_minimise.py?rev=22604&view=auto
Removed:
branches/double_rotor/specific_analyses/model_free/multi_processor_commands.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/model_free/multi_processor_commands.py?rev=22604&view=auto
Removed: branches/double_rotor/specific_analyses/model_free/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/model_free/results.py?rev=22604&view=auto
Modified: branches/double_rotor/specific_analyses/n_state_model/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/n_state_model/api.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/specific_analyses/setup.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/setup.py?rev=22605&r1=22604&r2=22605&view=diff
Removed:
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_model_free/test_main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/unit_tests/_specific_analyses/_model_free/test_main.py?rev=22604&view=auto
Modified:
branches/double_rotor/test_suite/unit_tests/_specific_analyses/test_api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/unit_tests/_specific_analyses/test_api.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/user_functions/dx.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/dx.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/user_functions/eliminate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/eliminate.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/user_functions/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/grace.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/user_functions/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/model_free.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/user_functions/molmol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/molmol.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/user_functions/pymol_control.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/pymol_control.py?rev=22605&r1=22604&r2=22605&view=diff
Modified: branches/double_rotor/user_functions/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/value.py?rev=22605&r1=22604&r2=22605&view=diff
r22605 - in /branches/double_rotor: ./ lib/ pipe_control/ specific_analyses/ specific_analyses/model_free/ specific_analyses...