r5187 - /1.3/specific_fns/model_free/mf_minimise.py -- March 23, 2008 - 14:51

Author: bugman
Date: Sun Mar 23 14:51:05 2008
New Revision: 5187

URL: http://svn.gna.org/viewcvs/relax?rev=5187&view=rev
Log:
Passed the scaling matrix into the grid_search_config() method.


Modified:
    1.3/specific_fns/model_free/mf_minimise.py

Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=5187&r1=5186&r2=5187&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sun Mar 23 14:51:05 2008
@@ -463,25 +463,27 @@
         self.minimise(min_algor='grid', lower=lower, upper=upper, inc=inc, 
constraints=constraints, verbosity=verbosity, sim_index=sim_index)
 
 
-    def grid_search_config(self, num_params, spin=None, spin_id=None, 
lower=None, upper=None, inc=None):
+    def grid_search_config(self, num_params, spin=None, spin_id=None, 
lower=None, upper=None, inc=None, scaling_matrix=None):
         """Configure the grid search.
 
-        @param num_params:      The number of parameters in the model.
-        @type num_params:       int
-        @keyword spin:          The spin data container.
-        @type spin:             SpinContainer instance
-        @keyword spin_id:       The spin identification string.
-        @type spin_id:          str
-        @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
+        @param num_params:          The number of parameters in the model.
+        @type num_params:           int
+        @keyword spin:              The spin data container.
+        @type spin:                 SpinContainer instance
+        @keyword spin_id:           The spin identification string.
+        @type spin_id:              str
+        @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 scaling_matrix:    The diagonal scaling matrix.
+        @type scaling_matrix:       numpy diagonal matrix
         """
 
         # Make sure that the length of the parameter array is > 0.
@@ -878,7 +880,7 @@
 
             # Configure the grid search.
             if match('^[Gg]rid', min_algor):
-                min_options = self.grid_search_config(num_params, spin=spin, 
lower=lower, upper=upper, inc=inc)
+                min_options = self.grid_search_config(num_params, spin=spin, 
lower=lower, upper=upper, inc=inc, scaling_matrix=scaling_matrix)
 
             # Scaling of values for the set function.
             if match('^[Ss]et', min_algor):