Author: semor
Date: Sun Jan 13 22:44:34 2008
New Revision: 4694
URL: http://svn.gna.org/viewcvs/relax?rev=4694&view=rev
Log:
Merged revisions 4662-4671,4673-4693 via svnmerge from
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3
........
r4662 | bugman | 2008-01-13 06:07:18 -0500 (Sun, 13 Jan 2008) | 3 lines
Started to convert the model-free user functions to the new relax design.
........
r4663 | bugman | 2008-01-13 06:09:22 -0500 (Sun, 13 Jan 2008) | 6 lines
Deleted the model_free.copy() user function.
This function was not used anywhere within relax and the model-free
specific copy() method was
complete rubbish anyway (ancient, unused, broken code).
........
r4664 | bugman | 2008-01-13 06:15:02 -0500 (Sun, 13 Jan 2008) | 3 lines
Removed the run argument from all model-free user functions.
........
r4665 | bugman | 2008-01-13 06:16:34 -0500 (Sun, 13 Jan 2008) | 3 lines
Copyright update.
........
r4666 | bugman | 2008-01-13 06:26:29 -0500 (Sun, 13 Jan 2008) | 3 lines
Converted all the res_num args to spin_id in the model-free user functions.
........
r4667 | bugman | 2008-01-13 06:31:20 -0500 (Sun, 13 Jan 2008) | 3 lines
Added the framework for unit tests of the model-free user function args.
........
r4668 | bugman | 2008-01-13 06:41:52 -0500 (Sun, 13 Jan 2008) | 3 lines
Wrote 7 unit tests for all args of the model-free user functions.
........
r4669 | bugman | 2008-01-13 06:43:02 -0500 (Sun, 13 Jan 2008) | 3 lines
Fix for the spin_id arg of the model_free.select_model() user function.
........
r4670 | bugman | 2008-01-13 06:44:04 -0500 (Sun, 13 Jan 2008) | 3 lines
Fix for the spin_id arg of the model_free.create_model() user function.
........
r4671 | bugman | 2008-01-13 06:45:07 -0500 (Sun, 13 Jan 2008) | 3 lines
Fix for the spin_id arg of the model_free.remove_tm() user function.
........
r4673 | bugman | 2008-01-13 06:48:43 -0500 (Sun, 13 Jan 2008) | 5 lines
Bug fix for the model arg of the model_free.select_model() user function.
The testing of this arg started with and elif statement!!!
........
r4674 | bugman | 2008-01-13 06:53:06 -0500 (Sun, 13 Jan 2008) | 5 lines
Bug fixes for the model-free user function arg unit tests.
Some args had to be supplied in the unit tests to prevent RelaxErrors from
reaching the correct arg.
........
r4675 | bugman | 2008-01-13 06:57:32 -0500 (Sun, 13 Jan 2008) | 5 lines
Bug fix for the params arg of the model_free.create_model() user function.
This arg is now properly checked.
........
r4676 | bugman | 2008-01-13 07:01:10 -0500 (Sun, 13 Jan 2008) | 3 lines
Removed the Model_free_main.__init__() method and converted its docstring
to that of the class.
........
r4677 | bugman | 2008-01-13 11:31:48 -0500 (Sun, 13 Jan 2008) | 5 lines
Renamed all the instantiated classes in specific_fns.__init__.
This is to avoid name clashes and the overwriting of the module names.
........
r4678 | bugman | 2008-01-13 11:37:05 -0500 (Sun, 13 Jan 2008) | 3 lines
Imported the specific_fns.model_free_obj object.
........
r4679 | bugman | 2008-01-13 12:19:08 -0500 (Sun, 13 Jan 2008) | 3 lines
Converted the create_model() model-free method to the new relax design.
........
r4680 | bugman | 2008-01-13 12:22:22 -0500 (Sun, 13 Jan 2008) | 3 lines
Converted the model_setup() model-free method to the new relax design.
........
r4681 | bugman | 2008-01-13 12:25:13 -0500 (Sun, 13 Jan 2008) | 3 lines
Converted the data_init() model-free method to the new relax design.
........
r4682 | bugman | 2008-01-13 12:26:20 -0500 (Sun, 13 Jan 2008) | 3 lines
Updated the docstring of the model_setup() model-free method to be in
epydoc format.
........
r4683 | bugman | 2008-01-13 12:28:09 -0500 (Sun, 13 Jan 2008) | 5 lines
Added the missing import of the spin_loop.
The model 'm4' construction system test now passes.
........
r4684 | bugman | 2008-01-13 12:29:44 -0500 (Sun, 13 Jan 2008) | 3 lines
Fixes for all the unit tests of the generic_fns.value.partition_params()
function.
........
r4685 | bugman | 2008-01-13 12:32:16 -0500 (Sun, 13 Jan 2008) | 3 lines
Converted the select_model() model-free method to the new relax design.
........
r4686 | bugman | 2008-01-13 12:39:35 -0500 (Sun, 13 Jan 2008) | 3 lines
Converted the overfit_deselect() model-free method to the new relax design.
........
r4687 | bugman | 2008-01-13 12:43:26 -0500 (Sun, 13 Jan 2008) | 3 lines
Cleaned up the code of the overfit_deselect() model-free method.
........
r4688 | bugman | 2008-01-13 13:00:31 -0500 (Sun, 13 Jan 2008) | 5 lines
Converted the grid_search() model-free method to the new relax design.
The grid_search_setup() method has been merged into this method.
........
r4689 | bugman | 2008-01-13 13:03:55 -0500 (Sun, 13 Jan 2008) | 5 lines
Bug fix for the system test of AIC model selection between two diffusion
tensors.
The diffusion tensor was not been properly set up.
........
r4690 | bugman | 2008-01-13 13:16:07 -0500 (Sun, 13 Jan 2008) | 3 lines
Shifted all of the model-free optimisation related methods into a separate
module.
........
r4691 | bugman | 2008-01-13 13:16:32 -0500 (Sun, 13 Jan 2008) | 3 lines
Renamed the module to avoid a name clash.
........
r4692 | bugman | 2008-01-13 13:50:36 -0500 (Sun, 13 Jan 2008) | 3 lines
Converted the assemble_param_names() model-free method to the new relax
design.
........
r4693 | bugman | 2008-01-13 14:02:17 -0500 (Sun, 13 Jan 2008) | 3 lines
Converted the assemble_param_vector() model-free method to the new relax
design.
........
Added:
branches/consistency_tests_1.3/specific_fns/model_free/mf_minimise.py
- copied unchanged from r4693,
1.3/specific_fns/model_free/mf_minimise.py
branches/consistency_tests_1.3/test_suite/unit_tests/_prompt/test_model_free.py
- copied unchanged from r4693,
1.3/test_suite/unit_tests/_prompt/test_model_free.py
branches/consistency_tests_1.3/test_suite/unit_tests/model_free_testing_base.py
- copied unchanged from r4693,
1.3/test_suite/unit_tests/model_free_testing_base.py
Modified:
branches/consistency_tests_1.3/ (props changed)
branches/consistency_tests_1.3/prompt/model_free.py
branches/consistency_tests_1.3/specific_fns/__init__.py
branches/consistency_tests_1.3/specific_fns/model_free/__init__.py
branches/consistency_tests_1.3/specific_fns/model_free/model_free.py
branches/consistency_tests_1.3/test_suite/system_tests/model_selection.py
branches/consistency_tests_1.3/test_suite/unit_tests/_generic_fns/test_value.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/consistency_tests_1.3/prompt/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/model_free.py?rev=4694&r1=4693&r2=4694&view=diff
Modified: branches/consistency_tests_1.3/specific_fns/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/__init__.py?rev=4694&r1=4693&r2=4694&view=diff
Modified: branches/consistency_tests_1.3/specific_fns/model_free/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/model_free/__init__.py?rev=4694&r1=4693&r2=4694&view=diff
Modified: branches/consistency_tests_1.3/specific_fns/model_free/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/model_free/model_free.py?rev=4694&r1=4693&r2=4694&view=diff
Modified:
branches/consistency_tests_1.3/test_suite/system_tests/model_selection.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/test_suite/system_tests/model_selection.py?rev=4694&r1=4693&r2=4694&view=diff
Modified:
branches/consistency_tests_1.3/test_suite/unit_tests/_generic_fns/test_value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/test_suite/unit_tests/_generic_fns/test_value.py?rev=4694&r1=4693&r2=4694&view=diff
r4694 - in /branches/consistency_tests_1.3: ./ prompt/ specific_fns/ specific_fns/model_free/ test_suite/system_tests/ test_...