Author: bugman
Date: Wed Sep 10 13:43:41 2014
New Revision: 25731
URL: http://svn.gna.org/viewcvs/relax?rev=25731&view=rev
Log:
Removed the second permutation from the 6 Frame_order.test_axis_perm_* system
tests.
A second identical permutation does not necessarily restore the original
state.
Modified:
branches/frame_order_cleanup/test_suite/system_tests/frame_order.py
Modified: branches/frame_order_cleanup/test_suite/system_tests/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/frame_order.py?rev=25731&r1=25730&r2=25731&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/frame_order.py
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/frame_order.py Wed
Sep 10 13:43:41 2014
@@ -289,17 +289,6 @@
self.assertAlmostEqual(cdp.eigen_beta, beta)
self.assertAlmostEqual(cdp.eigen_gamma, gamma)
- # Permute the axes a second time - this should restore the original
result.
- self.interpreter.frame_order.permute_axes('A')
-
- # Check the values.
- self.assertAlmostEqual(cdp.cone_theta_x, orig_cone_theta_x)
- self.assertAlmostEqual(cdp.cone_theta_y, orig_cone_theta_y)
- self.assertAlmostEqual(cdp.cone_sigma_max, orig_cone_sigma_max)
- self.assertAlmostEqual(cdp.eigen_alpha, orig_eigen_alpha)
- self.assertAlmostEqual(cdp.eigen_beta, orig_eigen_beta)
- self.assertAlmostEqual(cdp.eigen_gamma, orig_eigen_gamma)
-
def test_axis_perm_x_le_y_le_z_permB(self):
"""Test the operation of the frame_order.permute_axes user function
for permutation 'B' when x <= y <= z."""
@@ -343,17 +332,6 @@
self.assertAlmostEqual(cdp.eigen_beta, beta)
self.assertAlmostEqual(cdp.eigen_gamma, gamma)
- # Permute the axes a second time - this should restore the original
result.
- self.interpreter.frame_order.permute_axes('B')
-
- # Check the values.
- self.assertAlmostEqual(cdp.cone_theta_x, orig_cone_theta_x)
- self.assertAlmostEqual(cdp.cone_theta_y, orig_cone_theta_y)
- self.assertAlmostEqual(cdp.cone_sigma_max, orig_cone_sigma_max)
- self.assertAlmostEqual(cdp.eigen_alpha, orig_eigen_alpha)
- self.assertAlmostEqual(cdp.eigen_beta, orig_eigen_beta)
- self.assertAlmostEqual(cdp.eigen_gamma, orig_eigen_gamma)
-
def test_axis_perm_x_le_z_le_y_permB(self):
"""Test the operation of the frame_order.permute_axes user function
for permutation 'B' when x <= z <= y."""
@@ -397,17 +375,6 @@
self.assertAlmostEqual(cdp.eigen_beta, beta)
self.assertAlmostEqual(cdp.eigen_gamma, gamma)
- # Permute the axes a second time - this should restore the original
result.
- self.interpreter.frame_order.permute_axes('B')
-
- # Check the values.
- self.assertAlmostEqual(cdp.cone_theta_x, orig_cone_theta_x)
- self.assertAlmostEqual(cdp.cone_theta_y, orig_cone_theta_y)
- self.assertAlmostEqual(cdp.cone_sigma_max, orig_cone_sigma_max)
- self.assertAlmostEqual(cdp.eigen_alpha, orig_eigen_alpha)
- self.assertAlmostEqual(cdp.eigen_beta, orig_eigen_beta)
- self.assertAlmostEqual(cdp.eigen_gamma, orig_eigen_gamma)
-
def test_axis_perm_x_le_z_le_y_permA(self):
"""Test the operation of the frame_order.permute_axes user function
for permutation 'A' when x <= z <= y."""
@@ -450,17 +417,6 @@
self.assertAlmostEqual(cdp.eigen_alpha, alpha)
self.assertAlmostEqual(cdp.eigen_beta, beta)
self.assertAlmostEqual(cdp.eigen_gamma, gamma)
-
- # Permute the axes a second time - this should restore the original
result.
- self.interpreter.frame_order.permute_axes('A')
-
- # Check the values.
- self.assertAlmostEqual(cdp.cone_theta_x, orig_cone_theta_x)
- self.assertAlmostEqual(cdp.cone_theta_y, orig_cone_theta_y)
- self.assertAlmostEqual(cdp.cone_sigma_max, orig_cone_sigma_max)
- self.assertAlmostEqual(cdp.eigen_alpha, orig_eigen_alpha)
- self.assertAlmostEqual(cdp.eigen_beta, orig_eigen_beta)
- self.assertAlmostEqual(cdp.eigen_gamma, orig_eigen_gamma)
def test_axis_perm_z_le_x_le_y_permA(self):
@@ -503,17 +459,6 @@
self.assertAlmostEqual(cdp.eigen_beta, beta)
self.assertAlmostEqual(cdp.eigen_gamma, gamma)
- # Permute the axes a second time - this should restore the original
result.
- self.interpreter.frame_order.permute_axes('A')
-
- # Check the values.
- self.assertAlmostEqual(cdp.cone_theta_x, orig_cone_theta_x)
- self.assertAlmostEqual(cdp.cone_theta_y, orig_cone_theta_y)
- self.assertAlmostEqual(cdp.cone_sigma_max, orig_cone_sigma_max)
- self.assertAlmostEqual(cdp.eigen_alpha, orig_eigen_alpha)
- self.assertAlmostEqual(cdp.eigen_beta, orig_eigen_beta)
- self.assertAlmostEqual(cdp.eigen_gamma, orig_eigen_gamma)
-
def test_axis_perm_z_le_x_le_y_permB(self):
"""Test the operation of the frame_order.permute_axes user function
for permutation 'B' when z <= x <= y."""
@@ -554,17 +499,6 @@
self.assertAlmostEqual(cdp.eigen_alpha, alpha)
self.assertAlmostEqual(cdp.eigen_beta, beta)
self.assertAlmostEqual(cdp.eigen_gamma, gamma)
-
- # Permute the axes a second time - this should restore the original
result.
- self.interpreter.frame_order.permute_axes('B')
-
- # Check the values.
- self.assertAlmostEqual(cdp.cone_theta_x, orig_cone_theta_x)
- self.assertAlmostEqual(cdp.cone_theta_y, orig_cone_theta_y)
- self.assertAlmostEqual(cdp.cone_sigma_max, orig_cone_sigma_max)
- self.assertAlmostEqual(cdp.eigen_alpha, orig_eigen_alpha)
- self.assertAlmostEqual(cdp.eigen_beta, orig_eigen_beta)
- self.assertAlmostEqual(cdp.eigen_gamma, orig_eigen_gamma)
def test_cam_double_rotor(self):
r25731 - /branches/frame_order_cleanup/test_suite/system_tests/frame_order.py