r6773 - /1.3/specific_fns/model_free/mf_minimise.py -- July 06, 2008 - 01:07

Author: bugman
Date: Sun Jul  6 00:39:32 2008
New Revision: 6773

URL: http://svn.gna.org/viewcvs/relax?rev=6773&view=rev
Log:
Added the reset_min_stats() method to reset all minimisation stats prior to 
optimisation.


Modified:
    1.3/specific_fns/model_free/mf_minimise.py

Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=6773&r1=6772&r2=6773&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sun Jul  6 00:39:32 2008
@@ -782,6 +782,9 @@
             if not hasattr(spin, 'proton_type'):
                 raise RelaxProtonTypeError
 
+        # Reset the minimisation statistics.
+        self.reset_min_stats()
+
         # Determine the model type.
         model_type = self.determine_model_type()
 
@@ -1263,6 +1266,35 @@
         return relax_data, relax_error, equations, param_types, 
param_values, r, csa, num_frq, frq, num_ri, remap_table, noe_r1_table, 
ri_labels, gx, gh, num_params, xh_unit_vectors, diff_type, diff_params
 
 
+    def reset_min_stats(self):
+        """Reset all the minimisation statistics.
+
+        All global and spin specific values will be set to None.
+        """
+
+        # Alias the current data pipe.
+        cdp = ds[ds.current_pipe]
+
+        # Global stats.
+        if hasattr(cdp, 'chi2'):
+            cdp.chi2 = None
+            cdp.iter = None
+            cdp.f_count = None
+            cdp.g_count = None
+            cdp.h_count = None
+            cdp.warning = None
+
+        # Spin specific stats.
+        for spin in spin_loop():
+            if hasattr(spin, 'chi2'):
+                spin.chi2 = None
+                spin.iter = None
+                spin.f_count = None
+                spin.g_count = None
+                spin.h_count = None
+                spin.warning = None
+
+
     def test_grid_size(self, min_options, verbosity=1):
         """Test the size of the grid search.