r26006 - /branches/frame_order_cleanup/test_suite/system_tests/frame_order.py -- September 24, 2014 - 14:05

Author: bugman
Date: Wed Sep 24 14:05:21 2014
New Revision: 26006

URL: http://svn.gna.org/viewcvs/relax?rev=26006&view=rev
Log:
Turned off optimisation for all of the Frame_order.test_cam_quad_int_* system 
tests.

The SciPy quadratic integration is far too slow to be used in the test suite. 
 The simple call to
the minimise.calculate user function is sufficient for checking these target 
functions.


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=26006&r1=26005&r2=26006&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 24 14:05:21 2014
@@ -126,6 +126,7 @@
             'test_cam_quad_int_rotor2_pcs',
             'test_cam_quad_int_rotor2_rdc'
         ]
+        blacklist = []
 
         # Skip the blacklisted tests.
         if skip_tests and methodName in blacklist:
@@ -1027,7 +1028,7 @@
         """Test the free rotor frame order model of CaM."""
 
         # The flags, execute the script, and then check the chi2 value.
-        self.flags(opt=True, quad_int=True)
+        self.flags(quad_int=True)
         self.interpreter.run(script_file=self.cam_path+'free_rotor.py')
         self.check_chi2(0.049488502147038226)
 
@@ -1090,7 +1091,7 @@
         """Test the isotropic cone, free rotor frame order model of CaM."""
 
         # The flags, execute the script, and then check the chi2 value.
-        self.flags(opt=True, quad_int=True)
+        self.flags(quad_int=True)
         self.interpreter.run(script_file=self.cam_path+'iso_cone.py')
         self.check_chi2(0.046263256206108584)
 
@@ -1198,7 +1199,7 @@
         """Test the second isotropic cone, free rotor frame order model of 
CaM."""
 
         # The flags, execute the script, and then check the chi2 value.
-        self.flags(opt=True, quad_int=True)
+        self.flags(quad_int=True)
         self.interpreter.run(script_file=self.cam_path+'pseudo_ellipse.py')
         self.check_chi2(0.052923535071890106)
 
@@ -1306,7 +1307,7 @@
         """Test the rigid frame order model of CaM."""
 
         # The flags, execute the script, and then check the chi2 value.
-        self.flags(opt=True, quad_int=True)
+        self.flags(quad_int=True)
         self.interpreter.run(script_file=self.cam_path+'rigid.py')
         self.check_chi2(0.081171019382935666)
 
@@ -1387,7 +1388,7 @@
         """Test the second rotor frame order model of CaM."""
 
         # The flags, execute the script, and then check the chi2 value.
-        self.flags(opt=True, quad_int=True)
+        self.flags(quad_int=True)
         self.interpreter.run(script_file=self.cam_path+'rotor2.py')
         self.check_chi2(0.075040490418167072)