r25814 - /branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py -- September 12, 2014 - 19:22

Author: bugman
Date: Fri Sep 12 19:22:19 2014
New Revision: 25814

URL: http://svn.gna.org/viewcvs/relax?rev=25814&view=rev
Log:
Small speed up of the Frame_order.test_auto_analysis system test.


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

Modified: 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py?rev=25814&r1=25813&r2=25814&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py
      (original)
+++ 
branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py
      Fri Sep 12 19:22:19 2014
@@ -55,21 +55,21 @@
 # Rigid model optimisation setup.
 OPT_RIGID = Optimisation_settings()
 OPT_RIGID.add_grid(inc=8, zoom=0)
-OPT_RIGID.add_min(min_algor='simplex', func_tol=1e-2)
+OPT_RIGID.add_min(min_algor='simplex', func_tol=1e-2, max_iter=20)
 
 # PCS subset optimisation setup.
 OPT_SUBSET = Optimisation_settings()
 OPT_SUBSET.add_grid(inc=2, num_int_pts=1)
-OPT_SUBSET.add_min(min_algor='simplex', func_tol=1e-2, max_iter=20, 
num_int_pts=1)
+OPT_SUBSET.add_min(min_algor='simplex', func_tol=1e-2, max_iter=5, 
num_int_pts=1)
 
 # Full data set optimisation setup.
 OPT_FULL = Optimisation_settings()
 OPT_FULL.add_grid(inc=2, num_int_pts=1)
-OPT_FULL.add_min(min_algor='simplex', func_tol=1e-2, max_iter=20, 
num_int_pts=1)
+OPT_FULL.add_min(min_algor='simplex', func_tol=1e-2, max_iter=5, 
num_int_pts=1)
 
 # Monte Carlo simulation optimisation setup.
 OPT_MC = Optimisation_settings()
-OPT_MC.add_min(min_algor='simplex', func_tol=1e-2, max_iter=20, 
num_int_pts=1)
+OPT_MC.add_min(min_algor='simplex', func_tol=1e-2, max_iter=5, num_int_pts=1)
 
 
 # Set up the base data pipes.