Author: bugman
Date: Fri Mar 28 11:59:48 2014
New Revision: 22583
URL: http://svn.gna.org/viewcvs/relax?rev=22583&view=rev
Log:
Merged revisions 22575-22582 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r22575 | bugman | 2014-03-28 10:16:53 +0100 (Fri, 28 Mar 2014) | 9 lines
The specific analysis API classes are now all singletons.
This change will reduce the amount of memory used, as these classes are
initialised multiple times
throughout relax, especially in the test suite. The API objects are not
used for local storage so
the multiple instance verses singleton design change will make no
difference. The singleton design
pattern code has been added to the base class
specific_analyses.api_base.Api_base so that all
classes inherit the __new__() method which implements the singleton.
........
r22576 | bugman | 2014-03-28 10:26:23 +0100 (Fri, 28 Mar 2014) | 3 lines
Shifted the NOE analysis specific user function documentation from the API
object to the uf module.
........
r22577 | bugman | 2014-03-28 10:56:07 +0100 (Fri, 28 Mar 2014) | 6 lines
More code refactorisation of the specific_analyses.n_state_model package
into new modules.
The API object is now in the 'api' module, the remaining private methods
have been shifted into the
'optimisation' and 'uf' modules, and the user function documentation moved
to the 'uf' module.
........
r22578 | bugman | 2014-03-28 11:04:09 +0100 (Fri, 28 Mar 2014) | 3 lines
Added units tests for package consistency testing for all of the remaining
specific analyses.
........
r22579 | bugman | 2014-03-28 11:04:57 +0100 (Fri, 28 Mar 2014) | 3 lines
Fixes for the unit tests for the N-state model specific analysis package
changes.
........
r22580 | bugman | 2014-03-28 11:09:43 +0100 (Fri, 28 Mar 2014) | 3 lines
Updated the package __all__ lists for a number of the specific analyses.
........
r22581 | bugman | 2014-03-28 11:29:57 +0100 (Fri, 28 Mar 2014) | 5 lines
Shifted all of the private methods for optimisation from the relaxation
dispersion API object.
These are now functions of the specific_analyses.relax_disp.optimisation
module.
........
r22582 | bugman | 2014-03-28 11:52:15 +0100 (Fri, 28 Mar 2014) | 7 lines
Created the new specific_analyses.relax_disp.uf module.
This consists of the private methods of the relaxation dispersion API
object which act as the back
end for the user functions, as well as the user function documentation, all
shifted from the 'api'
module.
........
Added:
branches/double_rotor/specific_analyses/n_state_model/api.py
- copied unchanged from r22582,
trunk/specific_analyses/n_state_model/api.py
branches/double_rotor/specific_analyses/n_state_model/optimisation.py
- copied unchanged from r22582,
trunk/specific_analyses/n_state_model/optimisation.py
branches/double_rotor/specific_analyses/n_state_model/uf.py
- copied unchanged from r22582,
trunk/specific_analyses/n_state_model/uf.py
branches/double_rotor/specific_analyses/relax_disp/uf.py
- copied unchanged from r22582, trunk/specific_analyses/relax_disp/uf.py
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_consistency_tests/
- copied from r22582,
trunk/test_suite/unit_tests/_specific_analyses/_consistency_tests/
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_frame_order/
- copied from r22582,
trunk/test_suite/unit_tests/_specific_analyses/_frame_order/
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_jw_mapping/
- copied from r22582,
trunk/test_suite/unit_tests/_specific_analyses/_jw_mapping/
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_n_state_model/
- copied from r22582,
trunk/test_suite/unit_tests/_specific_analyses/_n_state_model/
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_noe/
- copied from r22582,
trunk/test_suite/unit_tests/_specific_analyses/_noe/
branches/double_rotor/test_suite/unit_tests/_specific_analyses/_relax_fit/
- copied from r22582,
trunk/test_suite/unit_tests/_specific_analyses/_relax_fit/
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/specific_analyses/api_base.py
branches/double_rotor/specific_analyses/jw_mapping/__init__.py
branches/double_rotor/specific_analyses/n_state_model/__init__.py
branches/double_rotor/specific_analyses/n_state_model/data.py
branches/double_rotor/specific_analyses/n_state_model/parameters.py
branches/double_rotor/specific_analyses/noe/api.py
branches/double_rotor/specific_analyses/noe/uf.py
branches/double_rotor/specific_analyses/relax_disp/__init__.py
branches/double_rotor/specific_analyses/relax_disp/api.py
branches/double_rotor/specific_analyses/relax_disp/optimisation.py
branches/double_rotor/specific_analyses/relax_fit/__init__.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/grace.py
branches/double_rotor/user_functions/n_state_model.py
branches/double_rotor/user_functions/relax_disp.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/specific_analyses/api_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/api_base.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/jw_mapping/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/jw_mapping/__init__.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/n_state_model/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/n_state_model/__init__.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/n_state_model/data.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/n_state_model/data.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/n_state_model/parameters.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/n_state_model/parameters.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/noe/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/noe/api.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/noe/uf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/noe/uf.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/relax_disp/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/__init__.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/relax_disp/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/api.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/relax_disp/optimisation.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_disp/optimisation.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/specific_analyses/relax_fit/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/relax_fit/__init__.py?rev=22583&r1=22582&r2=22583&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=22583&r1=22582&r2=22583&view=diff
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=22583&r1=22582&r2=22583&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=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/user_functions/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/n_state_model.py?rev=22583&r1=22582&r2=22583&view=diff
Modified: branches/double_rotor/user_functions/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/user_functions/relax_disp.py?rev=22583&r1=22582&r2=22583&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=22583&r1=22582&r2=22583&view=diff
r22583 - in /branches/double_rotor: ./ specific_analyses/ specific_analyses/jw_mapping/ specific_analyses/n_state_model/ spe...