r10761 - in /branches/multi_processor_merge/specific_fns/model_free: mf_minimise.py multi_processor_commands.py -- February 18, 2010 - 23:29

Author: bugman
Date: Thu Feb 18 23:29:31 2010
New Revision: 10761

URL: http://svn.gna.org/viewcvs/relax?rev=10761&view=rev
Log:
Renamed MF_super_grid_memo to MF_split_grid_memo.

This is the memo for the parallelised grid!


Modified:
    branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
    
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.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=10761&r1=10760&r2=10761&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:29:31 2010
@@ -1593,11 +1593,11 @@
 
                 # Set up the constrained super grid memo.
                 if constraints:
-                    super_grid_memo = MF_super_grid_memo(model_free=self, 
index=index, sim_index=sim_index, model_type=data_store.model_type, 
scaling=scaling, scaling_matrix=data_store.scaling_matrix, full_output=True, 
verbosity=verbosity, print_prefix="", grid_size=self.grid_size, A=A, b=b)
+                    super_grid_memo = MF_split_grid_memo(model_free=self, 
index=index, sim_index=sim_index, model_type=data_store.model_type, 
scaling=scaling, scaling_matrix=data_store.scaling_matrix, full_output=True, 
verbosity=verbosity, print_prefix="", grid_size=self.grid_size, A=A, b=b)
 
                 # Set up the unconstrained super grid memo.
                 else:
-                    super_grid_memo = MF_super_grid_memo(model_free=self, 
index=index, sim_index=sim_index, model_type=data_store.model_type, 
scaling=scaling, scaling_matrix=data_store.scaling_matrix, full_output=True, 
verbosity=verbosity, print_prefix="", grid_size=self.grid_size)
+                    super_grid_memo = MF_split_grid_memo(model_free=self, 
index=index, sim_index=sim_index, model_type=data_store.model_type, 
scaling=scaling, scaling_matrix=data_store.scaling_matrix, full_output=True, 
verbosity=verbosity, print_prefix="", grid_size=self.grid_size)
 
                 # Loop over each grid sub-division.
                 for sub_grid_index, sub_grid_info in 
enumerate(sub_grid_list):

Modified: 
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py?rev=10761&r1=10760&r2=10761&view=diff
==============================================================================
--- 
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
 (original)
+++ 
branches/multi_processor_merge/specific_fns/model_free/multi_processor_commands.py
 Thu Feb 18 23:29:31 2010
@@ -262,6 +262,10 @@
 
 
 
+class MF_split_grid_command(MF_minimise_command):
+    pass
+
+
 class MF_grid_command(MF_minimise_command):
     """Command class for the model-free grid search."""
 
@@ -325,11 +329,11 @@
         memo.model_free._disassemble_result(param_vector=self.param_vector, 
func=self.func, iter=self.iter, fc=self.fc, gc=self.gc, hc=self.hc, 
warning=self.warning, spin=memo.spin, sim_index=memo.sim_index, 
model_type=memo.model_type, scaling=memo.scaling, 
scaling_matrix=memo.scaling_matrix)
 
 
-class MF_super_grid_memo(MF_memo):
+class MF_split_grid_memo(MF_memo):
     def __init__(self, model_free, spin, sim_index, model_type, scaling, 
scaling_matrix, print_prefix, verbosity, full_output, A, b, grid_size):
 
         # Execute the base class __init__() method.
-        super(MF_super_grid_memo, self).__init__(model_free, spin, 
sim_index, model_type, scaling, scaling_matrix)
+        super(MF_split_grid_memo, self).__init__(model_free, spin, 
sim_index, model_type, scaling, scaling_matrix)
 
         self.full_output = full_output
         self.print_prefix = print_prefix