r24514 - /branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py -- July 10, 2014 - 18:12

Author: bugman
Date: Thu Jul 10 18:12:07 2014
New Revision: 24514

URL: http://svn.gna.org/viewcvs/relax?rev=24514&view=rev
Log:
Changed the minimisation in the frame order system tests where optimisation 
is activated.

The number of iterations is now set to 1 for speed testing, and the 
constraints are turned on.


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

Modified: 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=24514&r1=24513&r2=24514&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 (original)
+++ 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py
 Thu Jul 10 18:12:07 2014
@@ -197,13 +197,13 @@
         # 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, max_iter=10)
+            self._execute_uf(uf_name='minimise', min_algor='simplex', 
constraints=True, max_iter=1)
 
             # 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, max_iter=10)
+            self._execute_uf(uf_name='minimise', min_algor='simplex', 
constraints=True, max_iter=1)
             self._execute_uf(uf_name='eliminate')
             self._execute_uf(uf_name='monte_carlo.error_analysis')