r17538 - /trunk/specific_fns/model_free/mf_minimise.py -- September 21, 2012 - 11:09

Author: bugman
Date: Fri Sep 21 11:09:52 2012
New Revision: 17538

URL: http://svn.gna.org/viewcvs/relax?rev=17538&view=rev
Log:
Modified the model-free optimisation final printout to be more 
multi-processor friendly.

The message saying that the optimised chi2 is an improvement or not now 
includes the spin ID string
if present.  This is more informative for the multi-processor mpi4py 
printouts.


Modified:
    trunk/specific_fns/model_free/mf_minimise.py

Modified: trunk/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/model_free/mf_minimise.py?rev=17538&r1=17537&r2=17538&view=diff
==============================================================================
--- trunk/specific_fns/model_free/mf_minimise.py (original)
+++ trunk/specific_fns/model_free/mf_minimise.py Fri Sep 21 11:09:52 2012
@@ -347,16 +347,21 @@
             if (model_type == 'diff' or model_type == 'all') and 
hasattr(cdp, 'chi2'):
                 chi2 = cdp.chi2
 
+            # Spin text.
+            spin_text = ''
+            if spin != None and hasattr(spin, '_spin_ids') and 
len(spin._spin_ids):
+                spin_text = " for the spin '%s'" % spin._spin_ids[0]
+
             # No improvement.
             if chi2 != None and func >= chi2:
-                print("Discarding the optimisation results, the optimised 
chi-squared value is higher than the current value (%s >= %s)." % (func, 
chi2))
+                print("Discarding the optimisation results%s, the optimised 
chi-squared value is higher than the current value (%s >= %s)." % (spin_text, 
func, chi2))
 
                 # Exit!
                 return
 
             # New minimum.
             else:
-                print("Storing the optimisation results, the optimised 
chi-squared value is lower than the current value (%s < %s)." % (func, chi2))
+                print("Storing the optimisation results%s, the optimised 
chi-squared value is lower than the current value (%s < %s)." % (spin_text, 
func, chi2))
 
         # Disassemble the parameter vector.
         self._disassemble_param_vector(model_type, 
param_vector=param_vector, spin=spin, sim_index=sim_index)