r17867 - in /branches/frame_order_testing/test_suite/system_tests: frame_order.py scripts/frame_order/cam/base_script.py -- October 16, 2012 - 17:23

Author: bugman
Date: Tue Oct 16 17:23:39 2012
New Revision: 17867

URL: http://svn.gna.org/viewcvs/relax?rev=17867&view=rev
Log:
Activated optimisation and MC simulations in the 
Frame_order.test_cam_pseudo_ellipse() system test.

In the base class for the CaM frame order tests, the grid search has been 
deactivated and the
minimisation parts limited to 10 iterations.  This is needed for the test to 
not take forever.


Modified:
    branches/frame_order_testing/test_suite/system_tests/frame_order.py
    
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py

Modified: branches/frame_order_testing/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/frame_order.py?rev=17867&r1=17866&r2=17867&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/frame_order.py 
(original)
+++ branches/frame_order_testing/test_suite/system_tests/frame_order.py Tue 
Oct 16 17:23:39 2012
@@ -371,7 +371,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()
+        self.flags(opt=True)
         self.interpreter.run(script_file=self.cam_path+'pseudo_ellipse.py')
         self.check_chi2(1.5736897169830926)
 

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=17867&r1=17866&r2=17867&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
 Tue Oct 16 17:23:39 2012
@@ -113,14 +113,14 @@
 
         # Optimise.
         if hasattr(status, 'flag_opt') and status.flag_opt:
-            self._execute_uf(uf_name='grid_search', inc=11)
-            self._execute_uf(uf_name='minimise', min_algor='simplex', 
constraints=False)
+            #self._execute_uf(uf_name='grid_search', inc=11)
+            self._execute_uf(uf_name='minimise', min_algor='simplex', 
constraints=False, max_iter=10)
 
             # Test Monte Carlo simulations.
             self._execute_uf(uf_name='monte_carlo.setup', number=3)
             self._execute_uf(uf_name='monte_carlo.create_data')
             self._execute_uf(uf_name='monte_carlo.initial_values')
-            self._execute_uf(uf_name='minimise', min_algor='simplex', 
constraints=False)
+            self._execute_uf(uf_name='minimise', min_algor='simplex', 
constraints=False, max_iter=10)
             self._execute_uf(uf_name='eliminate')
             self._execute_uf(uf_name='monte_carlo.error_analysis')