r10938 - in /1.3: generic_fns/minimise.py status.py -- February 25, 2010 - 13:52

Author: bugman
Date: Thu Feb 25 13:52:35 2010
New Revision: 10938

URL: http://svn.gna.org/viewcvs/relax?rev=10938&view=rev
Log:
The Monte Carlo simulation number is now present in the status singleton.

The value of status.mc_number is set to the simulation number (starting at 0) 
and at the end is
reset to None.


Modified:
    1.3/generic_fns/minimise.py
    1.3/status.py

Modified: 1.3/generic_fns/minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/minimise.py?rev=10938&r1=10937&r2=10938&view=diff
==============================================================================
--- 1.3/generic_fns/minimise.py (original)
+++ 1.3/generic_fns/minimise.py Thu Feb 25 13:52:35 2010
@@ -31,6 +31,7 @@
 from generic_fns import pipes
 from relax_errors import RelaxError
 import specific_fns
+from status import Status; status = Status()
 
 
 def calc(verbosity=1):
@@ -55,9 +56,18 @@
     if hasattr(cdp, 'sim_state') and cdp.sim_state == 1:
         # Loop over the simulations.
         for i in xrange(cdp.sim_number):
+            # Print out.
             if verbosity:
                 print(("Simulation " + repr(i+1)))
+
+            # Status.
+            status.mc_number = i
+
+            # Calculation.
             calculate(verbosity=verbosity-1, sim_index=i)
+
+        # Unset the status.
+        status.mc_number = None
 
     # Minimisation.
     else:
@@ -99,9 +109,18 @@
     if hasattr(cdp, 'sim_state') and cdp.sim_state == 1:
         # Loop over the simulations.
         for i in xrange(cdp.sim_number):
+            # Print out.
             if verbosity:
                 print(("Simulation " + repr(i+1)))
+
+            # Status.
+            status.mc_number = i
+
+            # Optimisation.
             grid_search(lower=lower, upper=upper, inc=inc, 
constraints=constraints, verbosity=verbosity-1, sim_index=i)
+
+        # Unset the status.
+        status.mc_number = None
 
     # Grid search.
     else:
@@ -153,9 +172,18 @@
     # Monte Carlo simulation minimisation.
     elif hasattr(cdp, 'sim_state') and cdp.sim_state == 1:
         for i in xrange(cdp.sim_number):
+            # Print out.
             if verbosity:
                 print(("Simulation " + repr(i+1)))
+
+            # Status.
+            status.mc_number = i
+
+            # Optimisation.
             minimise(min_algor=min_algor, min_options=min_options, 
func_tol=func_tol, grad_tol=grad_tol, max_iterations=max_iterations, 
constraints=constraints, scaling=scaling, verbosity=verbosity-1, sim_index=i)
+
+        # Unset the status.
+        status.mc_number = None
 
     # Standard minimisation.
     else:

Modified: 1.3/status.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/status.py?rev=10938&r1=10937&r2=10938&view=diff
==============================================================================
--- 1.3/status.py (original)
+++ 1.3/status.py Thu Feb 25 13:52:35 2010
@@ -31,6 +31,13 @@
     # Class variable for storing the class instance (for the singleton).
     _instance = None
 
+    def __init__(self):
+        """Initialise all the status data structures."""
+
+        # The Monte Carlo simulation status.
+        self.mc_number = None
+
+
     def __new__(self, *args, **kargs):
         """Replacement method for implementing the singleton design 
pattern."""