r7831 - in /branches/multi_processor_merge/specific_fns/model_free: mf_minimise.py multi_processor_commands.py -- October 19, 2008 - 17:36

Author: bugman
Date: Sun Oct 19 17:36:28 2008
New Revision: 7831

URL: http://svn.gna.org/viewcvs/relax?rev=7831&view=rev
Log:
Fix for the verbosity argument.  generic_minimise() requires this arg to be 
called print_flag.


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=7831&r1=7830&r2=7831&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 Sun 
Oct 19 17:36:28 2008
@@ -1158,11 +1158,11 @@
 
                 # Constrained optimisation.
                 if constraints:
-                    command.set_minimise(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, verbosity=verbosity)
+                    command.set_minimise(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)
 
                 # Unconstrained optimisation.
                 else:
-                    command.set_minimise(args=(), x0=param_vector, 
min_algor=min_algor, min_options=min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, spin_id=spin_id, 
sim_index=sim_index, full_output=True, verbosity=verbosity)
+                    command.set_minimise(args=(), x0=param_vector, 
min_algor=min_algor, min_options=min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, 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)

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=7831&r1=7830&r2=7831&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
 Sun Oct 19 17:36:28 2008
@@ -167,7 +167,7 @@
         super(MF_minimise_command, self).__init__()
 
         # The minimisation map containing the minimisation information.
-        self.minimise_map = {'args':(), 'x0':None, 'min_algor':None, 
'min_options':None, 'func_tol':1e-25, 'grad_tol':None, 'maxiter':1e6, 
'A':None, 'b':None, 'l':None, 'u':None, 'c':None, 'dc':None, 'd2c':None, 
'dc':None, 'd2c':None, 'full_output':0, 'verbosity':0, 'print_prefix':""}
+        self.minimise_map = {'args':(), 'x0':None, 'min_algor':None, 
'min_options':None, 'func_tol':1e-25, 'grad_tol':None, 'maxiter':1e6, 
'A':None, 'b':None, 'l':None, 'u':None, 'c':None, 'dc':None, 'd2c':None, 
'dc':None, 'd2c':None, 'full_output':0, 'print_flag':0, 'print_prefix':""}
 
         # The map containing the model-free information.
         self.mf_map = {'init_params':None, 'model_type':None, 
'diff_type':None, 'diff_params':None, 'scaling_matrix':None, 
'num_spins':None, 'equations':None, 'param_types':None, 'param_values':None, 
'relax_data':None, 'errors':None, 'bond_length':None, 'csa':None, 
'num_frq':0, 'frq':None, 'num_ri':None, 'remap_table':None, 
'noe_r1_table':None, 'ri_labels':None, 'gx':0, 'gh':0, 'h_bar':0, 'mu0':0, 
'num_params':None, 'vectors':None}
@@ -184,14 +184,14 @@
         """Minimisation print out."""
 
         # Only print out if verbosity is turned on.
-        if self.minimise_map['verbosity'] >= 1:
+        if self.minimise_map['print_flag'] >= 1:
             # Monte Carlo simulation print out.
             if self.info_map['sim_index'] != None and self.info_map['index'] 
== 0:
                 print 'Simulation '+ `self.info_map['sim_index']`+ '\n'
 
             # Individual spin print out.
             if self.mf_map['model_type'] == 'mf' or 
self.mf_map['model_type'] == 'local_tm':
-                if self.minimise_map['verbosity'] >= 2:
+                if self.minimise_map['print_flag'] >= 2:
                     print "\n\n"
                 string = "Fitting to spin: " + self.info_map['spin_id']
                 print "\n\n" + string
@@ -351,7 +351,7 @@
 
     def pre_command_feed_back(self, processor):
 #        print_prefix = self.minimise_map['print_prefix']
-#        verbosity = self.minimise_map['verbosity']
+#        verbosity = self.minimise_map['print_flag']
 #        grid_step = self.minimise_map['min_options'].start
 #        grid_size = self.minimise_map['min_options'].steps
 #        full_output = self.minimise_map['full_output']