r24709 - /branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py -- July 24, 2014 - 15:11

Author: bugman
Date: Thu Jul 24 15:11:29 2014
New Revision: 24709

URL: http://svn.gna.org/viewcvs/relax?rev=24709&view=rev
Log:
Some more fixes for the optimisation user function changes.


Modified:
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py?rev=24709&r1=24708&r2=24709&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py
 (original)
+++ 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py
 Thu Jul 24 15:11:29 2014
@@ -80,14 +80,14 @@
 
 # Grid search (low quality for speed).
 frame_order.num_int_pts(num=500)
-grid_search(inc=[21, 21, 21, None, None, None, None, None, None, 21, 21])
+minimise.grid_search(inc=[21, 21, 21, None, None, None, None, None, None, 
21, 21])
 
 # Iterative optimisation with increasing precision.
 num_int_pts = [500, 1000]
 func_tol = [1e-2, 1e-3]
 for i in range(len(num_int_pts)):
     frame_order.num_int_pts(num=num_int_pts[i])
-    minimise('simplex', func_tol=func_tol[i])
+    minimise.execute('simplex', func_tol=func_tol[i])
 
 # Load the full PCS data set.
 for i in range(len(ln)):
@@ -98,14 +98,14 @@
 func_tol = [1e-2, 1e-3, 5e-3, 1e-4]
 for i in range(len(num_int_pts)):
     frame_order.num_int_pts(num=num_int_pts[i])
-    minimise('simplex', func_tol=func_tol[i])
+    minimise.execute('simplex', func_tol=func_tol[i])
 
 # Test Monte Carlo simulations.
 frame_order.num_int_pts(num=10000)
 monte_carlo.setup(number=200)
 monte_carlo.create_data()
 monte_carlo.initial_values()
-minimise('simplex', func_tol=1e-4)
+minimise.execute('simplex', func_tol=1e-4)
 eliminate()
 monte_carlo.error_analysis()