Author: bugman
Date: Mon Nov 26 15:10:34 2007
New Revision: 4016
URL: http://svn.gna.org/viewcvs/relax?rev=4016&view=rev
Log:
Merged revisions 4014-4015 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r4014 | bugman | 2007-11-26 15:05:35 +0100 (Mon, 26 Nov 2007) | 3 lines
Wrote a unit test for the generic_fns.diffusion_tensor.return_data_name()
function.
........
r4015 | bugman | 2007-11-26 15:09:19 +0100 (Mon, 26 Nov 2007) | 6 lines
Bug fix for generic_fns.align_tensor.return_data_name().
The function now checks that a string is passed into it and that it raises
a RelaxError when no
parameter matches.
........
Modified:
branches/N_state_model/ (props changed)
branches/N_state_model/generic_fns/diffusion_tensor.py
branches/N_state_model/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py
Propchange: branches/N_state_model/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 26 15:10:34 2007
@@ -1,1 +1,1 @@
-/1.3:1-3692,3695,3697-3713,3715-3719,3721-3728,3730-3731,3733-3755,3757-3807,3809-3833,3836-3838,3840-3869,3872-3905,3907-3986,4004
+/1.3:1-3692,3695,3697-3713,3715-3719,3721-3728,3730-3731,3733-3755,3757-3807,3809-3833,3836-3838,3840-3869,3872-3905,3907-3986,4004,4014-4015
Modified: branches/N_state_model/generic_fns/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/diffusion_tensor.py?rev=4016&r1=4015&r2=4016&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/diffusion_tensor.py (original)
+++ branches/N_state_model/generic_fns/diffusion_tensor.py Mon Nov 26
15:10:34 2007
@@ -30,7 +30,7 @@
from data import Data as relax_data_store
from data.diff_tensor import DiffTensorData
import pipes
-from relax_errors import RelaxError, RelaxNoPipeError, RelaxNoTensorError,
RelaxTensorError, RelaxUnknownParamCombError, RelaxUnknownParamError
+from relax_errors import RelaxError, RelaxNoPipeError, RelaxNoTensorError,
RelaxStrError, RelaxTensorError, RelaxUnknownParamCombError,
RelaxUnknownParamError
def copy(pipe_from=None, pipe_to=None):
@@ -747,6 +747,10 @@
|________________________________________________________|______________|__________________|
"""
+ # Enforce that the name must be a string.
+ if type(name) != str:
+ raise RelaxStrError, ('name', name)
+
# Local tm.
if search('^tm$', name):
return 'tm'
@@ -806,6 +810,9 @@
# phi.
if search('phi', name):
return 'phi'
+
+ # No parameter?
+ raise RelaxUnknownParamError, name
def return_eigenvalues(run=None):
Modified:
branches/N_state_model/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py?rev=4016&r1=4015&r2=4016&view=diff
==============================================================================
---
branches/N_state_model/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py
(original)
+++
branches/N_state_model/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py
Mon Nov 26 15:10:34 2007
@@ -25,6 +25,7 @@
# relax module imports.
from generic_fns import diffusion_tensor
+from relax_errors import RelaxStrError, RelaxUnknownParamError
from test_suite.unit_tests.diffusion_tensor_testing_base import
Diffusion_tensor_base_class
@@ -34,3 +35,47 @@
# Place the generic_fns.diffusion_tensor module into the class namespace.
diffusion_tensor_fns = diffusion_tensor
+
+
+ def test_return_data_name(self):
+ """The returning of diffusion tensor parameter names.
+
+ The function tested is
generic_fns.diffusion_tensor.return_data_name().
+ """
+
+ # Test the return of diffusion tensor Eigenvalue components.
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('tm'),
'tm')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('diso'),
'Diso')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('Diso'),
'Diso')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('da'),
'Da')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('Da'),
'Da')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('dr'),
'Dr')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('Dr'),
'Dr')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('dx'),
'Dx')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('Dx'),
'Dx')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('dy'),
'Dy')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('Dy'),
'Dy')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('dz'),
'Dz')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('Dz'),
'Dz')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('dpar'),
'Dpar')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('Dpar'),
'Dpar')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('dper'),
'Dper')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('Dper'),
'Dper')
+
self.assertEqual(self.diffusion_tensor_fns.return_data_name('dratio'),
'Dratio')
+
self.assertEqual(self.diffusion_tensor_fns.return_data_name('Dratio'),
'Dratio')
+
+ # Test the return of Euler and spherical angles.
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('a'),
'alpha')
+
self.assertEqual(self.diffusion_tensor_fns.return_data_name('alpha'), 'alpha')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('b'),
'beta')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('beta'),
'beta')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('g'),
'gamma')
+
self.assertEqual(self.diffusion_tensor_fns.return_data_name('gamma'), 'gamma')
+
self.assertEqual(self.diffusion_tensor_fns.return_data_name('theta'), 'theta')
+ self.assertEqual(self.diffusion_tensor_fns.return_data_name('phi'),
'phi')
+
+ # Test a few things which should fail.
+ self.assertRaises(RelaxUnknownParamError,
self.diffusion_tensor_fns.return_data_name, 'c')
+ self.assertRaises(RelaxUnknownParamError,
self.diffusion_tensor_fns.return_data_name, '7')
+ self.assertRaises(RelaxStrError,
self.diffusion_tensor_fns.return_data_name, 7)
+ self.assertRaises(RelaxUnknownParamError,
self.diffusion_tensor_fns.return_data_name, 'tmm')
r4016 - in /branches/N_state_model: ./ generic_fns/ test_suite/unit_tests/_generic_fns/