r11330 - /1.3/specific_fns/frame_order.py -- July 21, 2010 - 13:54

Author: bugman
Date: Wed Jul 21 13:54:01 2010
New Revision: 11330

URL: http://svn.gna.org/viewcvs/relax?rev=11330&view=rev
Log:
Bug fix for the frame order grid search - the non-linear grid search is now 
performed.

Previously the minfx.grid.grid() function was being used, causing the custom 
grid to be ignored.
Now minfx.grid.grid_point_array() is being used allowing the non-regular grid 
to be used.



Modified:
    1.3/specific_fns/frame_order.py

Modified: 1.3/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/frame_order.py?rev=11330&r1=11329&r2=11330&view=diff
==============================================================================
--- 1.3/specific_fns/frame_order.py (original)
+++ 1.3/specific_fns/frame_order.py Wed Jul 21 13:54:01 2010
@@ -27,7 +27,7 @@
 from copy import deepcopy
 from math import cos, pi
 from minfx.generic import generic_minimise
-from minfx.grid import grid
+from minfx.grid import grid_point_array
 from numpy import arccos, array, float64, ones, transpose, zeros
 from re import search
 from warnings import warn
@@ -1020,7 +1020,7 @@
 
         # Grid search.
         if search('^[Gg]rid', min_algor):
-            results = grid(func=target.func, args=(), incs=min_options, 
verbosity=verbosity)
+            results = grid_point_array(func=target.func, args=(), 
points=min_options, verbosity=verbosity)
 
         # Minimisation.
         else: