Author: bugman
Date: Wed Jul 25 12:41:50 2012
New Revision: 17314
URL: http://svn.gna.org/viewcvs/relax?rev=17314&view=rev
Log:
Updated the system tests for the align_tensor.init user function changes.
Modified:
branches/frame_order_testing/test_suite/system_tests/align_tensor.py
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/A_to_chi.py
Modified: branches/frame_order_testing/test_suite/system_tests/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/align_tensor.py?rev=17314&r1=17313&r2=17314&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/align_tensor.py
(original)
+++ branches/frame_order_testing/test_suite/system_tests/align_tensor.py Wed
Jul 25 12:41:50 2012
@@ -39,6 +39,9 @@
# Temp file name.
ds.tmpfile = mktemp()
+ # The alignment.
+ align_id = 'test'
+
# Tensor name lists.
self.full_list = ['0 full', '1 full', '2 full', '3 full', '4 full']
self.red_list = ['0 red', '1 red', '2 red', '3 red', '4 red']
@@ -69,12 +72,12 @@
# Set up the tensors.
for i in range(5):
# Load the tensor.
- self.interpreter.align_tensor.init(tensor=self.full_list[i],
params=self.tensors_full[i], param_types=0)
- self.interpreter.align_tensor.init(tensor=self.red_list[i],
params=self.tensors_red[i], param_types=0)
+ self.interpreter.align_tensor.init(tensor=self.full_list[i],
align_id=align_id, params=self.tensors_full[i], param_types=0)
+ self.interpreter.align_tensor.init(tensor=self.red_list[i],
align_id=align_id, params=self.tensors_red[i], param_types=0)
# Errors.
- self.interpreter.align_tensor.init(tensor=self.full_list[i],
params=(error, error, error, error, error), param_types=0, errors=True)
- self.interpreter.align_tensor.init(tensor=self.red_list[i],
params=(error, error, error, error, error), param_types=0, errors=True)
+ self.interpreter.align_tensor.init(tensor=self.full_list[i],
align_id=align_id, params=(error, error, error, error, error), param_types=0,
errors=True)
+ self.interpreter.align_tensor.init(tensor=self.red_list[i],
align_id=align_id, params=(error, error, error, error, error), param_types=0,
errors=True)
# Domain.
self.interpreter.align_tensor.set_domain(tensor=self.full_list[i],
domain='full')
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=17314&r1=17313&r2=17314&view=diff
==============================================================================
---
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
(original)
+++
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
Wed Jul 25 12:41:50 2012
@@ -207,9 +207,10 @@
# The tensor domains and reductions.
full = ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom']
red = ['Dy C-dom', 'Tb C-dom', 'Tm C-dom', 'Er C-dom']
+ ids = ['dy', 'tb', 'tm', 'er']
for i in range(len(full)):
# Initialise the reduced tensor.
- self._execute_uf(uf_name='align_tensor.init', tensor=red[i],
params=(0,0,0,0,0))
+ self._execute_uf(uf_name='align_tensor.init', tensor=red[i],
align_id=ids[i], params=(0, 0, 0, 0, 0))
# Set the domain info.
self._execute_uf(uf_name='align_tensor.set_domain',
tensor=full[i], domain='N')
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/5_state_xz.py?rev=17314&r1=17313&r2=17314&view=diff
==============================================================================
---
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
(original)
+++
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
Wed Jul 25 12:41:50 2012
@@ -21,18 +21,11 @@
self._execute_uf(uf_name='domain', id='N')
# Load the C-terminal alignment tensors.
-self._execute_uf(uf_name='align_tensor.init', tensor='chi1 C-dom',
params=(-1/2., -1/2., 0., 0., 0.))
-self._execute_uf(uf_name='align_tensor.init', tensor='chi2 C-dom',
params=(-1/8., -7/8., 0., 0., 0.))
-self._execute_uf(uf_name='align_tensor.init', tensor='chi3 C-dom',
params=(-1/8., 1/16., 0., 0., -15/16.))
-self._execute_uf(uf_name='align_tensor.init', tensor='chi4 C-dom',
params=(7/16., -7/8., 0., 9/16., 0.))
-self._execute_uf(uf_name='align_tensor.init', tensor='chi5 C-dom',
params=(-1/2., -1/2., 3/8., 0., 0.))
-
-# Set the domain the tensors correspond to.
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi1 C-dom',
domain='C')
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi2 C-dom',
domain='C')
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi3 C-dom',
domain='C')
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi4 C-dom',
domain='C')
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi5 C-dom',
domain='C')
+self._execute_uf(uf_name='align_tensor.init', tensor='chi1 C-dom',
align_id='1', domain='C', params=(-1/2., -1/2., 0., 0., 0.))
+self._execute_uf(uf_name='align_tensor.init', tensor='chi2 C-dom',
align_id='2', domain='C', params=(-1/8., -7/8., 0., 0., 0.))
+self._execute_uf(uf_name='align_tensor.init', tensor='chi3 C-dom',
align_id='3', domain='C', params=(-1/8., 1/16., 0., 0., -15/16.))
+self._execute_uf(uf_name='align_tensor.init', tensor='chi4 C-dom',
align_id='4', domain='C', params=(7/16., -7/8., 0., 9/16., 0.))
+self._execute_uf(uf_name='align_tensor.init', tensor='chi5 C-dom',
align_id='5', domain='C', params=(-1/2., -1/2., 3/8., 0., 0.))
# Calculate the singular values.
self._execute_uf(uf_name='align_tensor.svd', basis_set=0, tensors=['chi1
C-dom', 'chi2 C-dom', 'chi3 C-dom', 'chi4 C-dom', 'chi5 C-dom'])
@@ -44,18 +37,11 @@
# Load the N-terminal alignment tensors.
-self._execute_uf(uf_name='align_tensor.init', tensor='chi1 N-dom',
params=(1/20.*(2-3*sqrt(2)), -1/2., 0., 0., 0.))
-self._execute_uf(uf_name='align_tensor.init', tensor='chi2 N-dom',
params=(1/80.*(26-9*sqrt(2)), -7/8., 0., 0., 0.))
-self._execute_uf(uf_name='align_tensor.init', tensor='chi3 N-dom',
params=(-1/160.*(8+3*sqrt(2)), 1/16., 0., 0.,
-3/16.*(1+sqrt(2)+2*cos(pi/8.))))
-self._execute_uf(uf_name='align_tensor.init', tensor='chi4 N-dom',
params=(7/16., -7/8., 0., 9/80.*(1+sqrt(2)), 0.))
-self._execute_uf(uf_name='align_tensor.init', tensor='chi5 N-dom',
params=(1/20.*(2-3*sqrt(2)), -1/2., 3/40.*(1+sqrt(2)+2*cos(pi/8.)), 0.,
0.))
-
-# Set the domain the tensors correspond to.
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi1 N-dom',
domain='N')
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi2 N-dom',
domain='N')
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi3 N-dom',
domain='N')
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi4 N-dom',
domain='N')
-self._execute_uf(uf_name='align_tensor.set_domain', tensor='chi5 N-dom',
domain='N')
+self._execute_uf(uf_name='align_tensor.init', tensor='chi1 N-dom',
align_id='1', domain='N', params=(1/20.*(2-3*sqrt(2)), -1/2., 0.,
0., 0.))
+self._execute_uf(uf_name='align_tensor.init', tensor='chi2 N-dom',
align_id='2', domain='N', params=(1/80.*(26-9*sqrt(2)), -7/8., 0.,
0., 0.))
+self._execute_uf(uf_name='align_tensor.init', tensor='chi3 N-dom',
align_id='3', domain='N', params=(-1/160.*(8+3*sqrt(2)), 1/16., 0., 0.,
-3/16.*(1+sqrt(2)+2*cos(pi/8.))))
+self._execute_uf(uf_name='align_tensor.init', tensor='chi4 N-dom',
align_id='4', domain='N', params=(7/16., -7/8., 0.,
9/80.*(1+sqrt(2)), 0.))
+self._execute_uf(uf_name='align_tensor.init', tensor='chi5 N-dom',
align_id='5', domain='N', params=(1/20.*(2-3*sqrt(2)), -1/2.,
3/40.*(1+sqrt(2)+2*cos(pi/8.)), 0., 0.))
# Specify the tensor reductions.
self._execute_uf(uf_name='align_tensor.reduction', full_tensor='chi1 C-dom',
red_tensor='chi1 N-dom')
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/A_to_chi.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/A_to_chi.py?rev=17314&r1=17313&r2=17314&view=diff
==============================================================================
---
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/A_to_chi.py
(original)
+++
branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/A_to_chi.py
Wed Jul 25 12:41:50 2012
@@ -10,7 +10,7 @@
# The tensor.
tensor = 'A'
-self._execute_uf(tensor, (5.090/const, 12.052/const, 0, 0, 0),
param_types=2, uf_name='align_tensor.init')
+self._execute_uf(align_id=tensor, params=(5.090/const, 12.052/const, 0, 0,
0), param_types=2, uf_name='align_tensor.init')
# The temperature.
self._execute_uf(uf_name='temperature', id=tensor, temp=298)
r17314 - in /branches/frame_order_testing/test_suite/system_tests: ./ scripts/frame_order/cam/ scripts/n_state_model/