r10764 - /branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py -- February 18, 2010 - 23:53

Author: bugman
Date: Thu Feb 18 23:53:35 2010
New Revision: 10764

URL: http://svn.gna.org/viewcvs/relax?rev=10764&view=rev
Log:
The MF_split_grid_command.store_data() method is being used to pump in all 
the data.

This comes from the base 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=10764&r1=10763&r2=10764&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 
Feb 18 23:53:35 2010
@@ -1599,13 +1599,8 @@
                     # Grid search initialisation.
                     command = MF_split_grid_command()
 
-                    # Constrained optimisation.
-                    if constraints:
-                        command.set_minimise(mf=self.mf, 
model_type=data_store.model_type, args=(), x0=opt_params.param_vector, 
min_algor=min_algor, min_options=opt_params.min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, A=A, b=b, full_output=True, 
verbosity=verbosity)
-
-                    # Unconstrained optimisation.
-                    else:
-                        command.set_minimise(mf=self.mf, 
model_type=data_store.model_type, args=(), x0=opt_params.param_vector, 
min_algor=min_algor, min_options=opt_params.min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, full_output=True, 
verbosity=verbosity)
+                    # Pass in the data and optimisation parameters.
+                    command.store_data(deepcopy(data_store), 
deepcopy(opt_params))
 
                     # Set up the model-free memo and add it to the processor 
queue.
                     memo = MF_memo(super_grid_memo)