Author: bugman Date: Tue Jul 22 13:12:40 2014 New Revision: 24599 URL: http://svn.gna.org/viewcvs/relax?rev=24599&view=rev Log: Shifted the constraints boolean argument to the end of the grid_search() function argument list. Modified: branches/zooming_grid_search/pipe_control/minimise.py Modified: branches/zooming_grid_search/pipe_control/minimise.py URL: http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/pipe_control/minimise.py?rev=24599&r1=24598&r2=24599&view=diff ============================================================================== --- branches/zooming_grid_search/pipe_control/minimise.py (original) +++ branches/zooming_grid_search/pipe_control/minimise.py Tue Jul 22 13:12:40 2014 @@ -137,7 +137,7 @@ processor.run_queue() -def grid_search(lower=None, upper=None, inc=None, constraints=True, verbosity=1): +def grid_search(lower=None, upper=None, inc=None, verbosity=1, constraints=True): """The grid search function. @keyword lower: The lower bounds of the grid search which must be equal to the number of parameters in the model. @@ -146,10 +146,10 @@ @type upper: array of numbers @keyword inc: The increments for each dimension of the space for the grid search. The number of elements in the array must equal to the number of parameters in the model. @type inc: int or list of int + @keyword verbosity: The amount of information to print. The higher the value, the greater the verbosity. + @type verbosity: int @keyword constraints: If True, constraints are applied during the grid search (elinating parts of the grid). If False, no constraints are used. @type constraints: bool - @keyword verbosity: The amount of information to print. The higher the value, the greater the verbosity. - @type verbosity: int """ # Test if the current data pipe exists.