r5174 - /1.3/specific_fns/model_free/mf_minimise.py -- March 23, 2008 - 02:03

Author: bugman
Date: Sun Mar 23 02:03:03 2008
New Revision: 5174

URL: http://svn.gna.org/viewcvs/relax?rev=5174&view=rev
Log:
Split up the grid search function, reverting back to the structure as in the 
1.2 line. 


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=5174&r1=5173&r2=5174&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sun Mar 23 02:03:03 2008
@@ -459,6 +459,14 @@
         @type sim_index:    int
         """
 
+        # Minimisation.
+        self.minimise(min_algor='grid', min_options=min_options, 
constraints=constraints, verbosity=verbosity, sim_index=sim_index)
+
+
+    def grid_search_config(self, index=None):
+        """Configure the grid search.
+        """
+
         # Create the initial parameter vector.
         param_vector = self.assemble_param_vector()
 
@@ -514,9 +522,6 @@
 
         # Complete the grid search configuration.
         self.grid_search_config_fin(min_options, lower, upper, 
scaling_matrix)
-
-        # Minimisation.
-        self.minimise(min_algor='grid', min_options=min_options, 
constraints=constraints, verbosity=verbosity, sim_index=sim_index)
 
 
     def grid_search_config_diff(min_options, inc, m):
@@ -842,9 +847,9 @@
                 if scaling_matrix:
                     param_vector = dot(inv(scaling_matrix), param_vector)
 
-            # Get the grid search minimisation options.
+            # Configure the grid search.
             if match('^[Gg]rid', min_algor):
-                min_options = self.grid_search_setup(index=index)
+                min_options = self.grid_search_config(index=index)
 
             # Scaling of values for the set function.
             if match('^[Ss]et', min_algor):