r10171 - in /branches/multi_processor_merge: generic_fns/subdivide_grid.py specific_fns/model_free/mf_minimise.py -- January 11, 2010 - 13:00

Author: bugman
Date: Mon Jan 11 13:00:33 2010
New Revision: 10171

URL: http://svn.gna.org/viewcvs/relax?rev=10171&view=rev
Log:
Modified the Grid_info class remove the grid_ops arg.

This is now removed and subdivided into 'inc', 'lower', and 'upper' in the 
1.3 line.


Modified:
    branches/multi_processor_merge/generic_fns/subdivide_grid.py
    branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py

Modified: branches/multi_processor_merge/generic_fns/subdivide_grid.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/generic_fns/subdivide_grid.py?rev=10171&r1=10170&r2=10171&view=diff
==============================================================================
--- branches/multi_processor_merge/generic_fns/subdivide_grid.py (original)
+++ branches/multi_processor_merge/generic_fns/subdivide_grid.py Mon Jan 11 
13:00:33 2010
@@ -38,7 +38,23 @@
 
 
 class Grid_info(object):
-    def __init__(self, grid_ops, start=0, range=None):
+    def __init__(self, lower=None, upper=None, inc=None, n=None, start=0, 
range=None):
+        """Initialise the grid sub-division object.
+
+        @keyword lower: The lower bounds of the grid search which must be 
equal to the number of parameters in the model.
+        @type lower:    array of numbers
+        @keyword upper: The upper bounds of the grid search which must be 
equal to the number of parameters in the model.
+        @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:      array of int
+        @keyword n:     The number of parameters.
+        @type n:        int
+        @keyword start: Unknown?
+        @type start:    int
+        @keyword range: Unknown?
+        @type range:    int
+        """
+
         self.grid_ops = grid_ops
         for op in self.grid_ops:
             op[GRID_LOWER] = float(op[GRID_LOWER])

Modified: 
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py?rev=10171&r1=10170&r2=10171&view=diff
==============================================================================
--- branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py 
(original)
+++ branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py Mon 
Jan 11 13:00:33 2010
@@ -1587,7 +1587,7 @@
             # Parallelised grid search for the diffusion parameter space.
             if match('^[Gg]rid', min_algor) and data_store.model_type == 
'diff' :
                 # Split up the grid into chunks for each processor.
-                full_grid_info = Grid_info(opt_params.min_options)
+                full_grid_info = Grid_info(lower=lower, upper=upper, 
inc=inc, n=num_params)
                 sub_grid_list = 
full_grid_info.sub_divide(processor.processor_size())
 
                 # Set up the constrained super grid memo.