Author: bugman
Date: Tue Dec 11 09:57:00 2007
New Revision: 4176
URL: http://svn.gna.org/viewcvs/relax?rev=4176&view=rev
Log:
Merged revisions 4137-4175 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r4137 | bugman | 2007-12-09 12:15:34 +0100 (Sun, 09 Dec 2007) | 3 lines
Updated the value.set() user function to the new relax design.
........
r4138 | bugman | 2007-12-09 12:17:33 +0100 (Sun, 09 Dec 2007) | 3 lines
Added the base class for the tests of both the 'prompt.value' and
'generic_fns.value' modules.
........
r4139 | bugman | 2007-12-09 12:19:58 +0100 (Sun, 09 Dec 2007) | 3 lines
Updated the __init__ file of the base directory of the unit tests.
........
r4141 | bugman | 2007-12-09 12:44:13 +0100 (Sun, 09 Dec 2007) | 3 lines
Added the message "Copyright (C) 2006-2007 the relax development team" to
the relax intro message.
........
r4144 | bugman | 2007-12-09 15:07:26 +0100 (Sun, 09 Dec 2007) | 15 lines
Manually merged r4140 of the 1.2.12 tag.
The command used was:
svn merge -r4139:4140 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/1.2.12
.....
r4140 | bugman | 2007-12-09 12:33:01 +0100 (Sun, 09 Dec 2007) | 3 lines
Changed paths:
M /tags/1.2.12/sconstruct
Fixed the 'sconstruct' file to handle Windows Vista.
.....
........
r4145 | bugman | 2007-12-09 15:09:10 +0100 (Sun, 09 Dec 2007) | 3 lines
Fixed the program intro catch Windows Vista.
........
r4146 | bugman | 2007-12-09 17:41:47 +0100 (Sun, 09 Dec 2007) | 3 lines
Added the infrastructure for the user function arg unit tests of
prompt.value.
........
r4147 | bugman | 2007-12-09 18:05:13 +0100 (Sun, 09 Dec 2007) | 3 lines
Implemented the val unit test for the value.set() user function.
........
r4148 | bugman | 2007-12-09 18:06:37 +0100 (Sun, 09 Dec 2007) | 6 lines
Bug fix.
The value argment to the value.set() user function has been changed to
'val'. The argument was
clashing with the modules because the names were the same.
........
r4149 | bugman | 2007-12-09 18:10:31 +0100 (Sun, 09 Dec 2007) | 3 lines
Implemented the param unit test for the value.set() user function.
........
r4150 | bugman | 2007-12-09 18:16:21 +0100 (Sun, 09 Dec 2007) | 3 lines
Implemented the spin_id unit test for the value.set() user function.
........
r4151 | bugman | 2007-12-09 18:47:22 +0100 (Sun, 09 Dec 2007) | 3 lines
Converted the set() class method into a module function.
........
r4152 | bugman | 2007-12-09 18:52:14 +0100 (Sun, 09 Dec 2007) | 3 lines
Shifted all the specific_fns class imports and initialisations from main.py
to __init__.py.
........
r4153 | bugman | 2007-12-09 18:56:59 +0100 (Sun, 09 Dec 2007) | 5 lines
Big bug fixes.
The structures 'self.relax.specific' and 'self.relax.specific_setup' no
longer exist!
........
r4154 | bugman | 2007-12-09 19:02:59 +0100 (Sun, 09 Dec 2007) | 5 lines
Shifted the Specific_setup class into the __init__ module.
This class will be replaced by the specific_setup() function but has been
kept here for reference.
........
r4155 | bugman | 2007-12-09 19:08:17 +0100 (Sun, 09 Dec 2007) | 5 lines
Added a stub of the function get_specific_fn() to specific_fns/__init__.py.
The function generic_fns.value.set() now calls this instead.
........
r4156 | bugman | 2007-12-09 19:10:22 +0100 (Sun, 09 Dec 2007) | 3 lines
Added the relaxation curve fitting module to the __init__.__all__ array.
........
r4157 | bugman | 2007-12-09 19:13:57 +0100 (Sun, 09 Dec 2007) | 3 lines
Added a docstring for the specific_fns module.
........
r4158 | bugman | 2007-12-09 19:16:38 +0100 (Sun, 09 Dec 2007) | 3 lines
Fixed the specific_fns docstring. It should be at the top and it is a
package not a module.
........
r4159 | bugman | 2007-12-09 19:24:08 +0100 (Sun, 09 Dec 2007) | 3 lines
Converted the get_string() class method into a module function.
........
r4160 | bugman | 2007-12-09 19:28:06 +0100 (Sun, 09 Dec 2007) | 3 lines
Created the get_instance() function to return the appropriate class
instance.
........
r4161 | bugman | 2007-12-09 19:34:57 +0100 (Sun, 09 Dec 2007) | 3 lines
Implemented the get_specific_fn() function.
........
r4162 | bugman | 2007-12-09 19:38:56 +0100 (Sun, 09 Dec 2007) | 3 lines
Deleted the Specific_setup class.
........
r4163 | bugman | 2007-12-09 21:45:08 +0100 (Sun, 09 Dec 2007) | 3 lines
Converted the sort_params() class method into a function and renamed it to
partition_params().
........
r4164 | bugman | 2007-12-09 21:46:36 +0100 (Sun, 09 Dec 2007) | 3 lines
Updated the call to partition_params().
........
r4165 | bugman | 2007-12-09 21:48:53 +0100 (Sun, 09 Dec 2007) | 3 lines
Passed the val and param args into partition_params() and changed all
references to value to val.
........
r4166 | bugman | 2007-12-09 21:50:56 +0100 (Sun, 09 Dec 2007) | 3 lines
Added the framework for adding unit tests of the generic_fns.value module.
........
r4167 | bugman | 2007-12-09 21:57:46 +0100 (Sun, 09 Dec 2007) | 3 lines
Wrote 4 unit tests for the generic_fns.value.partition_params() function.
........
r4168 | bugman | 2007-12-09 21:59:30 +0100 (Sun, 09 Dec 2007) | 5 lines
Bug fix for the partition_params() function.
The structure self.relax.generic does not exist.
........
r4169 | bugman | 2007-12-09 22:01:33 +0100 (Sun, 09 Dec 2007) | 3 lines
Bug fix for 2 of the unit tests for the
generic_fns.value.partition_params() function.
........
r4170 | bugman | 2007-12-09 22:04:13 +0100 (Sun, 09 Dec 2007) | 5 lines
Bug fix for the partition_params() function.
The RelaxUnknownParamError was being thrown when any parameter was not a
diffusion tensor parameter!
........
r4171 | bugman | 2007-12-09 22:08:44 +0100 (Sun, 09 Dec 2007) | 5 lines
Bug fix for the partition_params() function.
The specific return_data_names function is now passed into it.
........
r4172 | bugman | 2007-12-09 22:09:25 +0100 (Sun, 09 Dec 2007) | 5 lines
Updated the unit tests of generic_fns.value.partition_params().
The model-free return_data_name function is passed into it.
........
r4173 | bugman | 2007-12-09 22:11:46 +0100 (Sun, 09 Dec 2007) | 3 lines
Added 2 more unit tests for the generic_fns.value.partition_params()
function.
........
r4174 | bugman | 2007-12-09 22:12:23 +0100 (Sun, 09 Dec 2007) | 3 lines
Removed the unused RelaxError import.
........
r4175 | bugman | 2007-12-09 22:17:55 +0100 (Sun, 09 Dec 2007) | 3 lines
Updated the docstring of the generic_fns.value.set() function.
........
Added:
branches/N_state_model/test_suite/unit_tests/_generic_fns/test_value.py
- copied unchanged from r4175,
1.3/test_suite/unit_tests/_generic_fns/test_value.py
branches/N_state_model/test_suite/unit_tests/_prompt/test_value.py
- copied unchanged from r4175,
1.3/test_suite/unit_tests/_prompt/test_value.py
branches/N_state_model/test_suite/unit_tests/value_testing_base.py
- copied unchanged from r4175,
1.3/test_suite/unit_tests/value_testing_base.py
Removed:
branches/N_state_model/specific_fns/main.py
branches/N_state_model/specific_fns/specific_setup.py
Modified:
branches/N_state_model/ (props changed)
branches/N_state_model/generic_fns/value.py
branches/N_state_model/prompt/value.py
branches/N_state_model/relax
branches/N_state_model/sconstruct
branches/N_state_model/specific_fns/__init__.py
branches/N_state_model/specific_fns/hybrid.py
branches/N_state_model/specific_fns/jw_mapping.py
branches/N_state_model/specific_fns/model_free/model_free.py
branches/N_state_model/specific_fns/noe.py
branches/N_state_model/specific_fns/relax_fit.py
branches/N_state_model/test_suite/unit_tests/__init__.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/N_state_model/generic_fns/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/value.py?rev=4176&r1=4175&r2=4176&view=diff
Modified: branches/N_state_model/prompt/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/value.py?rev=4176&r1=4175&r2=4176&view=diff
Modified: branches/N_state_model/relax
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/relax?rev=4176&r1=4175&r2=4176&view=diff
Modified: branches/N_state_model/sconstruct
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/sconstruct?rev=4176&r1=4175&r2=4176&view=diff
Modified: branches/N_state_model/specific_fns/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/__init__.py?rev=4176&r1=4175&r2=4176&view=diff
Modified: branches/N_state_model/specific_fns/hybrid.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/hybrid.py?rev=4176&r1=4175&r2=4176&view=diff
Modified: branches/N_state_model/specific_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/jw_mapping.py?rev=4176&r1=4175&r2=4176&view=diff
Removed: branches/N_state_model/specific_fns/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/main.py?rev=4175&view=auto
Modified: branches/N_state_model/specific_fns/model_free/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/model_free/model_free.py?rev=4176&r1=4175&r2=4176&view=diff
Modified: branches/N_state_model/specific_fns/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/noe.py?rev=4176&r1=4175&r2=4176&view=diff
Modified: branches/N_state_model/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/relax_fit.py?rev=4176&r1=4175&r2=4176&view=diff
Removed: branches/N_state_model/specific_fns/specific_setup.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/specific_setup.py?rev=4175&view=auto
Modified: branches/N_state_model/test_suite/unit_tests/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/unit_tests/__init__.py?rev=4176&r1=4175&r2=4176&view=diff
r4176 - in /branches/N_state_model: ./ generic_fns/ prompt/ specific_fns/ specific_fns/model_free/ test_suite/unit_tests/ te...