r24603 - /branches/zooming_grid_search/pipe_control/minimise.py -- July 22, 2014 - 14:22

Author: bugman
Date: Tue Jul 22 14:22:48 2014
New Revision: 24603

URL: http://svn.gna.org/viewcvs/relax?rev=24603&view=rev
Log:
Fix for the skipping of preset parameters in the grid search.

Dictionary and list type parameters are now handled correctly.


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=24603&r1=24602&r2=24603&view=diff
==============================================================================
--- branches/zooming_grid_search/pipe_control/minimise.py       (original)
+++ branches/zooming_grid_search/pipe_control/minimise.py       Tue Jul 22 
14:22:48 2014
@@ -304,7 +304,7 @@
                 upper_i = param_object.grid_upper(names[i], 
model_info=model_info)
 
             # Skip preset values.
-            if skip_preset and values[i] != None:
+            if skip_preset and not values[i] in [None, {}, []]:
                 lower_i = values[i]
                 upper_i = values[i]
                 model_inc[-1][i] = 1