r25881 - /branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/auto_analysis_to_rigid.py -- September 17, 2014 - 17:11

Author: bugman
Date: Wed Sep 17 17:11:44 2014
New Revision: 25881

URL: http://svn.gna.org/viewcvs/relax?rev=25881&view=rev
Log:
Updated the Frame_order.test_auto_analysis system test script.

This now uses the new auto-analysis Optimisation_settings object design.

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=25881&r1=25880&r2=25881&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
      Wed Sep 17 17:11:44 2014
@@ -59,17 +59,17 @@
 
 # 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=5, 
num_int_pts=1)
+OPT_SUBSET.add_grid(inc=2, sobol_max_points=1)
+OPT_SUBSET.add_min(min_algor='simplex', func_tol=1e-2, max_iter=5, 
sobol_max_points=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=5, 
num_int_pts=1)
+OPT_FULL.add_grid(inc=2, sobol_max_points=1)
+OPT_FULL.add_min(min_algor='simplex', func_tol=1e-2, max_iter=5, 
sobol_max_points=1)
 
 # Monte Carlo simulation optimisation setup.
 OPT_MC = Optimisation_settings()
-OPT_MC.add_min(min_algor='simplex', func_tol=1e-2, max_iter=5, num_int_pts=1)
+OPT_MC.add_min(min_algor='simplex', func_tol=1e-2, max_iter=5, 
sobol_max_points=1)
 
 
 # Set up the base data pipes.