Author: bugman Date: Fri Nov 27 10:51:22 2009 New Revision: 9991 URL: http://svn.gna.org/viewcvs/relax?rev=9991&view=rev Log: Merged revisions 9891-9986 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r9891 | bugman | 2009-11-24 09:24:48 +0100 (Tue, 24 Nov 2009) | 3 lines Fixes for the dx.map() user function interface. ........ r9892 | bugman | 2009-11-24 10:05:30 +0100 (Tue, 24 Nov 2009) | 10 lines Added the methods necessary for the dx.map() user function. These include: __assemble_param_vector() map_bounds() model_statistics() return_data_name() return_units() ........ r9893 | bugman | 2009-11-24 10:17:37 +0100 (Tue, 24 Nov 2009) | 5 lines Fix for the base class return_conversion_factor() method. The spin_id arg is now accepted. ........ r9894 | bugman | 2009-11-24 10:32:01 +0100 (Tue, 24 Nov 2009) | 6 lines Created unit tests for the specific_fns API. This checks the consistency of methods across the API, using method names and arg checks. Only the frame order theories are currently checked. ........ r9895 | bugman | 2009-11-24 10:46:05 +0100 (Tue, 24 Nov 2009) | 3 lines Renamed specific_fns.base_class.Common_functions to specific_fns.api_base.API_base. ........ r9896 | bugman | 2009-11-24 10:55:57 +0100 (Tue, 24 Nov 2009) | 3 lines The entirety of the specific_fns API is now checked. ........ r9897 | bugman | 2009-11-24 10:57:13 +0100 (Tue, 24 Nov 2009) | 3 lines Updated for the __all__ list for the base_class to api_base rename. ........ r9898 | bugman | 2009-11-24 11:07:36 +0100 (Tue, 24 Nov 2009) | 3 lines Alphabetical ordering of the functions. ........ r9899 | bugman | 2009-11-24 11:14:08 +0100 (Tue, 24 Nov 2009) | 3 lines Removed the back_calc() method from the specific analysis API. ........ r9900 | bugman | 2009-11-24 11:20:24 +0100 (Tue, 24 Nov 2009) | 3 lines Removed the copy() method from the specific analysis API. ........ r9901 | bugman | 2009-11-24 11:21:53 +0100 (Tue, 24 Nov 2009) | 3 lines Added a prototype calculate() method to the API. ........ r9902 | bugman | 2009-11-24 11:42:53 +0100 (Tue, 24 Nov 2009) | 3 lines Removed assemble_param_vector() and disassemble_param_vector() from the specific analysis API. ........ r9903 | bugman | 2009-11-24 11:45:10 +0100 (Tue, 24 Nov 2009) | 3 lines Removed assemble_scaling_matrix() from the specific analysis API. ........ r9904 | bugman | 2009-11-24 11:52:38 +0100 (Tue, 24 Nov 2009) | 3 lines Removed back_calc() from the specific analysis API. ........ r9905 | bugman | 2009-11-24 11:53:20 +0100 (Tue, 24 Nov 2009) | 3 lines Completed removal of back_calc() from the specific analysis API. ........ r9906 | bugman | 2009-11-24 11:56:47 +0100 (Tue, 24 Nov 2009) | 3 lines Added create_mc_data() to the specific analysis API. ........ r9907 | bugman | 2009-11-24 12:18:58 +0100 (Tue, 24 Nov 2009) | 5 lines Added data_names() to the specific analysis API. General docstring clean ups as well. ........ r9908 | bugman | 2009-11-24 12:39:49 +0100 (Tue, 24 Nov 2009) | 3 lines Fix for the unit test for the N-state model _assemble_param_vector() method. ........ r9909 | bugman | 2009-11-24 12:40:39 +0100 (Tue, 24 Nov 2009) | 3 lines Fix for the unit test for the N-state model _disassemble_param_vector() method. ........ r9910 | bugman | 2009-11-24 12:56:22 +0100 (Tue, 24 Nov 2009) | 15 lines A large number of method and documentation variables to the specific analysis API. These include: default_value_doc default_value() grid_search() minimise() return_data_name_doc return_data_name() return_grace_string() return_units() set_doc sim_pack_data() ........ r9911 | bugman | 2009-11-24 12:58:24 +0100 (Tue, 24 Nov 2009) | 10 lines Converted a number of methods to being private, removing them from the API. These include: _grid_search_setup() _linear_constraints() _model_setup() _relax_time() _select_model() ........ r9912 | bugman | 2009-11-24 12:59:22 +0100 (Tue, 24 Nov 2009) | 3 lines Converted the _select_model() method to be private, removing it from the API. ........ r9913 | bugman | 2009-11-24 13:05:29 +0100 (Tue, 24 Nov 2009) | 5 lines Clean up of the create_mc_data() API method across the board. The spin_id keyword is now accepted by all, and is a keyword. ........ r9914 | bugman | 2009-11-24 13:21:18 +0100 (Tue, 24 Nov 2009) | 3 lines Docstring update to return_grace_string(). ........ r9915 | bugman | 2009-11-24 13:22:09 +0100 (Tue, 24 Nov 2009) | 5 lines Fixes for the relaxation curve fitting API. The fixes are for the return_data_name(), return_grace_string(), and return_units() methods. ........ r9916 | bugman | 2009-11-24 13:25:52 +0100 (Tue, 24 Nov 2009) | 3 lines Alphabetical ordering of methods, and separation of the private from the API methods. ........ r9917 | bugman | 2009-11-24 13:47:33 +0100 (Tue, 24 Nov 2009) | 3 lines Docstring and default arg changes. ........ r9918 | bugman | 2009-11-24 13:47:58 +0100 (Tue, 24 Nov 2009) | 3 lines Removed duplicated epydoc tags. ........ r9919 | bugman | 2009-11-24 13:48:37 +0100 (Tue, 24 Nov 2009) | 3 lines Clean up of the entire NOE API. ........ r9920 | bugman | 2009-11-24 13:49:42 +0100 (Tue, 24 Nov 2009) | 3 lines Alphabetical ordering of methods, and separation of the private from the API methods. ........ r9921 | bugman | 2009-11-24 14:04:23 +0100 (Tue, 24 Nov 2009) | 5 lines Removed the check of the default values from the specific analysis API arg checks. The defaults keyword values can be set to anything by the specific code! ........ r9922 | bugman | 2009-11-24 14:52:52 +0100 (Tue, 24 Nov 2009) | 3 lines Fixes for the string printout creation in the __check_method_args() method. ........ r9923 | bugman | 2009-11-24 15:04:25 +0100 (Tue, 24 Nov 2009) | 5 lines Removed the unused _read() method. This has been superseded by the spectrum.read_intensities() user function. ........ r9924 | bugman | 2009-11-24 15:26:08 +0100 (Tue, 24 Nov 2009) | 3 lines Added model_statistics() to the specific analysis API. ........ r9925 | bugman | 2009-11-24 15:30:49 +0100 (Tue, 24 Nov 2009) | 3 lines Clean up of the entire N-state model specific API. ........ r9926 | bugman | 2009-11-24 15:32:47 +0100 (Tue, 24 Nov 2009) | 3 lines Converted all self.__*() private methods to self._*() non-API methods. ........ r9927 | bugman | 2009-11-24 15:40:14 +0100 (Tue, 24 Nov 2009) | 3 lines Alphabetical ordering of methods, and separation of the private from the API methods. ........ r9928 | bugman | 2009-11-24 15:50:02 +0100 (Tue, 24 Nov 2009) | 3 lines Added duplicate_data() to the specific analysis API. ........ r9929 | bugman | 2009-11-24 16:46:59 +0100 (Tue, 24 Nov 2009) | 3 lines Removed some unused methods from the API. ........ r9930 | bugman | 2009-11-24 16:48:38 +0100 (Tue, 24 Nov 2009) | 17 lines Added a number of methods to the specific analysis API. These include: deselect() get_param_names() get_param_values() map_bounds() model_desc() model_type() molmol_macro() read_columnar_results() return_data_desc() skip_function() The API base class should now be complete. ........ r9931 | bugman | 2009-11-24 16:59:08 +0100 (Tue, 24 Nov 2009) | 3 lines Clean up of the entire model-free analysis specific API. ........ r9932 | bugman | 2009-11-24 17:05:36 +0100 (Tue, 24 Nov 2009) | 3 lines Converted all the model-free results methods from private to non-API. ........ r9933 | bugman | 2009-11-24 17:08:00 +0100 (Tue, 24 Nov 2009) | 3 lines Added an empty eliminate_doc variable to the specific analysis API. ........ r9934 | bugman | 2009-11-24 17:51:20 +0100 (Tue, 24 Nov 2009) | 5 lines More fixes for the __format_method() method. The methods with args and keywords are now properly formatted! ........ r9935 | bugman | 2009-11-24 18:02:38 +0100 (Tue, 24 Nov 2009) | 3 lines Fixes for the eliminate() and model_statistics() API prototype methods. ........ r9936 | bugman | 2009-11-24 18:03:08 +0100 (Tue, 24 Nov 2009) | 3 lines Fix for the N-state model model_statistics() API method. ........ r9937 | bugman | 2009-11-24 18:05:40 +0100 (Tue, 24 Nov 2009) | 3 lines Update for the return_conversion_factor() API prototype method. ........ r9938 | bugman | 2009-11-24 18:15:06 +0100 (Tue, 24 Nov 2009) | 3 lines Shifted many of the model-free specific methods out of the API. ........ r9939 | bugman | 2009-11-24 18:35:49 +0100 (Tue, 24 Nov 2009) | 3 lines Converted the specific analysis base API to use the model_info arg, returned from model_loop(). ........ r9940 | bugman | 2009-11-24 18:39:15 +0100 (Tue, 24 Nov 2009) | 3 lines Updated the N-state model model_statistics() method to the model_info arg. ........ r9941 | bugman | 2009-11-24 18:40:39 +0100 (Tue, 24 Nov 2009) | 3 lines Fixes for the model-free unit tests. The model_index arg is now called model_info. ........ r9942 | bugman | 2009-11-24 18:41:28 +0100 (Tue, 24 Nov 2009) | 3 lines Converted many of the model-free methods to use model_info rather than model_index. ........ r9943 | bugman | 2009-11-24 19:08:56 +0100 (Tue, 24 Nov 2009) | 3 lines Fix for the specific analysis base API set_selected_sim() method. ........ r9944 | bugman | 2009-11-24 19:18:23 +0100 (Tue, 24 Nov 2009) | 5 lines Fix for the analysis specific base API sim_return_selected() method. The model_info arg is now being used. ........ r9945 | bugman | 2009-11-24 19:26:08 +0100 (Tue, 24 Nov 2009) | 3 lines Converted the private __compare_objects() method to the non-API _compare_objects() method. ........ r9946 | bugman | 2009-11-24 19:30:09 +0100 (Tue, 24 Nov 2009) | 3 lines Alphabetical ordering of model-free methods, and separation of the private from the API methods. ........ r9947 | bugman | 2009-11-24 19:58:18 +0100 (Tue, 24 Nov 2009) | 3 lines A number of fixes for the model-free analysis specific API methods. ........ r9948 | bugman | 2009-11-24 19:58:49 +0100 (Tue, 24 Nov 2009) | 3 lines Changes to the args for the base API data_init() method. ........ r9949 | bugman | 2009-11-24 19:59:32 +0100 (Tue, 24 Nov 2009) | 3 lines Updates to the methods of the reduced spectral density mapping API. ........ r9950 | bugman | 2009-11-25 09:05:00 +0100 (Wed, 25 Nov 2009) | 3 lines Updated the data_init() method for API consistency. ........ r9951 | bugman | 2009-11-25 09:15:40 +0100 (Wed, 25 Nov 2009) | 3 lines Converted many of the J(w) mapping methods to use the model_info arg rather than spin. ........ r9952 | bugman | 2009-11-25 09:19:52 +0100 (Wed, 25 Nov 2009) | 3 lines Docstring updates for returned values. ........ r9953 | bugman | 2009-11-25 09:21:38 +0100 (Wed, 25 Nov 2009) | 3 lines Alphabetical ordering of J(w) mapping methods, and separation of the private from the API methods. ........ r9954 | bugman | 2009-11-25 09:26:19 +0100 (Wed, 25 Nov 2009) | 3 lines Docstring fix. ........ r9955 | bugman | 2009-11-25 09:31:52 +0100 (Wed, 25 Nov 2009) | 3 lines Updated the hybrid analysis API to match the base API. ........ r9956 | bugman | 2009-11-25 09:38:44 +0100 (Wed, 25 Nov 2009) | 3 lines Separation of the private and API methods in the hybrid specific analysis. ........ r9957 | bugman | 2009-11-25 09:39:48 +0100 (Wed, 25 Nov 2009) | 3 lines Converted the frame order private methods into non-API methods. ........ r9958 | bugman | 2009-11-25 09:44:55 +0100 (Wed, 25 Nov 2009) | 3 lines Separation of all the non-API frame order specific methods. ........ r9959 | bugman | 2009-11-25 09:46:39 +0100 (Wed, 25 Nov 2009) | 3 lines Epydoc docstring fix. ........ r9960 | bugman | 2009-11-25 09:56:56 +0100 (Wed, 25 Nov 2009) | 3 lines Updated all the frame order specific analysis API methods to match the base API. ........ r9961 | bugman | 2009-11-25 10:02:26 +0100 (Wed, 25 Nov 2009) | 3 lines Fixes for the frame order user functions. ........ r9962 | bugman | 2009-11-25 10:02:55 +0100 (Wed, 25 Nov 2009) | 3 lines Removal of set_frq() from the consistency testing analysis specific API. ........ r9963 | bugman | 2009-11-25 10:07:09 +0100 (Wed, 25 Nov 2009) | 3 lines Docstring fixes. ........ r9964 | bugman | 2009-11-25 10:17:49 +0100 (Wed, 25 Nov 2009) | 3 lines More docstring updates. ........ r9965 | bugman | 2009-11-25 10:18:38 +0100 (Wed, 25 Nov 2009) | 3 lines Updated all the consistency testing analysis specific API methods to match the base API. ........ r9966 | bugman | 2009-11-25 10:43:32 +0100 (Wed, 25 Nov 2009) | 3 lines Fix for the consistency testing return_units() method for the arg name changes. ........ r9967 | bugman | 2009-11-25 10:57:19 +0100 (Wed, 25 Nov 2009) | 3 lines Epydoc docstring fix. ........ r9968 | bugman | 2009-11-25 10:59:05 +0100 (Wed, 25 Nov 2009) | 3 lines Epydoc docstring fix and reformatting of generic_fns.pcs.read(). ........ r9969 | bugman | 2009-11-25 12:55:17 +0100 (Wed, 25 Nov 2009) | 5 lines Decreased the user function docstring size in the relax manual. This was changed from normal size to \scriptsize to decrease the number of pages in the manual. ........ r9970 | bugman | 2009-11-25 13:06:03 +0100 (Wed, 25 Nov 2009) | 5 lines The user function descriptions in the relax manual are now in columns. This shrinks the manual even further. ........ r9971 | bugman | 2009-11-25 13:11:52 +0100 (Wed, 25 Nov 2009) | 5 lines Removed the \newpage command from the user function descriptions. This cuts the manual size by over 100 pages!!! ........ r9972 | bugman | 2009-11-25 13:18:28 +0100 (Wed, 25 Nov 2009) | 3 lines Added '()' to the end of the user functions in the relax manual. ........ r9973 | bugman | 2009-11-25 15:41:03 +0100 (Wed, 25 Nov 2009) | 3 lines Turned all tables from the user functions in the relax manual into floating tables. ........ r9974 | bugman | 2009-11-25 15:46:58 +0100 (Wed, 25 Nov 2009) | 5 lines Clean up of the minimisation docstring. This no longer causes problems in the relax manual. ........ r9975 | bugman | 2009-11-25 15:54:01 +0100 (Wed, 25 Nov 2009) | 3 lines Switched from the multicols package to just using \twocolumn and \onecolumn. ........ r9976 | bugman | 2009-11-25 15:54:36 +0100 (Wed, 25 Nov 2009) | 3 lines Fixes for the align_tensor.svd() docstring for the relax manual. ........ r9977 | bugman | 2009-11-25 16:52:44 +0100 (Wed, 25 Nov 2009) | 3 lines Added rules to break the user function subsections in the manual apart. ........ r9978 | bugman | 2009-11-25 17:18:32 +0100 (Wed, 25 Nov 2009) | 3 lines Modified the spin ID string documentation to be better presented in the relax manual. ........ r9979 | bugman | 2009-11-26 09:09:29 +0100 (Thu, 26 Nov 2009) | 6 lines User function call examples in the relax manual are now better formatted. They are allowed to break after '.', '(', and '='. This is for the examples and the Defaults subsubsection. ........ r9980 | bugman | 2009-11-26 10:22:06 +0100 (Thu, 26 Nov 2009) | 3 lines Allowed for hyphenation in the user function subsection titles. ........ r9981 | bugman | 2009-11-26 12:20:26 +0100 (Thu, 26 Nov 2009) | 3 lines Massive tables in the relax manual are now being split using the longtable package. ........ r9982 | bugman | 2009-11-26 12:27:18 +0100 (Thu, 26 Nov 2009) | 3 lines The tables in the user function chapter now have the same font size as the rest of the text. ........ r9983 | bugman | 2009-11-26 12:33:35 +0100 (Thu, 26 Nov 2009) | 3 lines Better formatting of the user function chapter by using \raggedbottom. ........ r9984 | bugman | 2009-11-26 12:50:58 +0100 (Thu, 26 Nov 2009) | 3 lines Fixed the boolean selection table to be nicer to the automatic manual compilation. ........ r9985 | bugman | 2009-11-26 13:16:37 +0100 (Thu, 26 Nov 2009) | 3 lines The longtables are now properly labelled. ........ r9986 | bugman | 2009-11-26 18:36:27 +0100 (Thu, 26 Nov 2009) | 3 lines Removed the checking of sequence data from generic_fns.value.set(). ........ Added: branches/bieri_gui/specific_fns/api_base.py - copied unchanged from r9986, 1.3/specific_fns/api_base.py branches/bieri_gui/test_suite/unit_tests/_specific_fns/test_api.py - copied unchanged from r9986, 1.3/test_suite/unit_tests/_specific_fns/test_api.py Removed: branches/bieri_gui/specific_fns/base_class.py Modified: branches/bieri_gui/ (props changed) branches/bieri_gui/data/mol_res_spin.py branches/bieri_gui/docs/latex/fetch_docstrings.py branches/bieri_gui/docs/latex/functions.tex branches/bieri_gui/docs/latex/relax.tex branches/bieri_gui/generic_fns/dasha.py branches/bieri_gui/generic_fns/minimise.py branches/bieri_gui/generic_fns/mol_res_spin.py branches/bieri_gui/generic_fns/palmer.py branches/bieri_gui/generic_fns/pcs.py branches/bieri_gui/generic_fns/value.py branches/bieri_gui/prompt/align_tensor.py branches/bieri_gui/prompt/consistency_tests.py branches/bieri_gui/prompt/dx.py branches/bieri_gui/prompt/frame_order.py branches/bieri_gui/prompt/jw_mapping.py branches/bieri_gui/prompt/minimisation.py branches/bieri_gui/prompt/model_free.py branches/bieri_gui/prompt/molmol.py branches/bieri_gui/prompt/n_state_model.py branches/bieri_gui/prompt/noe.py branches/bieri_gui/prompt/pipe.py branches/bieri_gui/prompt/relax_fit.py branches/bieri_gui/prompt/select.py branches/bieri_gui/specific_fns/__init__.py branches/bieri_gui/specific_fns/consistency_tests.py branches/bieri_gui/specific_fns/frame_order.py branches/bieri_gui/specific_fns/hybrid.py branches/bieri_gui/specific_fns/jw_mapping.py branches/bieri_gui/specific_fns/model_free/__init__.py branches/bieri_gui/specific_fns/model_free/main.py branches/bieri_gui/specific_fns/model_free/mf_minimise.py branches/bieri_gui/specific_fns/model_free/molmol.py branches/bieri_gui/specific_fns/model_free/results.py branches/bieri_gui/specific_fns/n_state_model.py branches/bieri_gui/specific_fns/noe.py branches/bieri_gui/specific_fns/relax_fit.py branches/bieri_gui/specific_fns/setup.py branches/bieri_gui/specific_fns/srls.py branches/bieri_gui/test_suite/unit_tests/_specific_fns/_model_free/test_main.py branches/bieri_gui/test_suite/unit_tests/_specific_fns/test_n_state_model.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/bieri_gui/data/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/data/mol_res_spin.py?rev=9991&r1=9990&r2=9991&view=diff Modified: branches/bieri_gui/docs/latex/fetch_docstrings.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/docs/latex/fetch_docstrings.py?rev=9991&r1=9990&r2=9991&view=diff Modified: branches/bieri_gui/docs/latex/functions.tex URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/docs/latex/functions.tex?rev=9991&r1=9990&r2=9991&view=diff Modified: branches/bieri_gui/docs/latex/relax.tex URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/docs/latex/relax.tex?rev=9991&r1=9990&r2=9991&view=diff Modified: branches/bieri_gui/generic_fns/dasha.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/dasha.py?rev=9991&r1=9990&r2=9991&view=diff Modified: branches/bieri_gui/generic_fns/minimise.py [... 107 lines stripped ...]