r10151 - /branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py -- January 07, 2010 - 18:18

Author: bugman
Date: Thu Jan  7 18:18:47 2010
New Revision: 10151

URL: http://svn.gna.org/viewcvs/relax?rev=10151&view=rev
Log:
The normal grid search has been activated using MF_grid_command.

The diffusion tensor sub-grid algorithm might need a MF_subgrid_command class.


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

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=10151&r1=10150&r2=10151&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 Thu 
Jan  7 18:18:47 2010
@@ -1621,14 +1621,22 @@
                     memo = MF_grid_memo(super_grid_memo)
                     processor.add_to_queue(command, memo)
 
+                # Exit this method.
+                return
+
+            # Normal grid search.
+            if search('^[Gg]rid', min_algor):
+                # Minimisation initialisation.
+                command = MF_grid_command()
+
             # Minimisation of all other model types.
             else:
                 # Minimisation initialisation.
                 command = MF_minimise_command()
 
-                # Set up for optimisation.
-                command.set_minimise(mf=self.mf, model_type=model_type, 
args=(), x0=param_vector, min_algor=min_algor, min_options=min_options, 
func_tol=func_tol, grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, 
spin_id=spin_id, sim_index=sim_index, full_output=True, print_flag=verbosity)
-
-                # Set up the model-free memo and add it to the processor 
queue.
-                memo = MF_memo(model_free=self, spin=spin, 
sim_index=sim_index, model_type=model_type, scaling=scaling, 
scaling_matrix=scaling_matrix)
-                processor.add_to_queue(command, memo)
+            # Set up for optimisation.
+            command.set_minimise(mf=self.mf, model_type=model_type, args=(), 
x0=param_vector, min_algor=min_algor, min_options=min_options, 
func_tol=func_tol, grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, 
spin_id=spin_id, sim_index=sim_index, full_output=True, print_flag=verbosity)
+
+            # Set up the model-free memo and add it to the processor queue.
+            memo = MF_memo(model_free=self, spin=spin, sim_index=sim_index, 
model_type=model_type, scaling=scaling, scaling_matrix=scaling_matrix)
+            processor.add_to_queue(command, memo)