r7492 - /branches/pipe_refs/generic_fns/eliminate.py -- October 02, 2008 - 13:45

Author: bugman
Date: Thu Oct  2 13:45:17 2008
New Revision: 7492

URL: http://svn.gna.org/viewcvs/relax?rev=7492&view=rev
Log:
Bug fix for the eliminate() function.

'i' is now called 'model_info' because of the switch to model_loop().


Modified:
    branches/pipe_refs/generic_fns/eliminate.py

Modified: branches/pipe_refs/generic_fns/eliminate.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/pipe_refs/generic_fns/eliminate.py?rev=7492&r1=7491&r2=7492&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/eliminate.py (original)
+++ branches/pipe_refs/generic_fns/eliminate.py Thu Oct  2 13:45:17 2008
@@ -74,8 +74,8 @@
 
         if not sim_state:
             # Get the parameter names and values.
-            names = param_names(i)
-            values = param_values(i)
+            names = param_names(model_info)
+            values = param_values(model_info)
 
             # No data.
             if names == None or values == None:
@@ -89,12 +89,12 @@
             flag = False
             for j in xrange(len(names)):
                 # Eliminate function.
-                if eliminate(names[j], values[j], i, args):
+                if eliminate(names[j], values[j], model_info, args):
                     flag = True
 
             # Deselect.
             if flag:
-                deselect(i)
+                deselect(model_info)
 
 
         # Simulation elimination.
@@ -104,8 +104,8 @@
             # Loop over the simulations.
             for j in xrange(cdp.sim_number):
                 # Get the parameter names and values.
-                names = param_names(i)
-                values = param_values(i, sim_index=j)
+                names = param_names(model_info)
+                values = param_values(model_info, sim_index=j)
 
                 # No data.
                 if names == None or values == None:
@@ -119,9 +119,9 @@
                 flag = False
                 for k in xrange(len(names)):
                     # Eliminate function.
-                    if eliminate(names[k], values[k], i, args):
+                    if eliminate(names[k], values[k], model_info, args):
                         flag = True
 
                 # Deselect.
                 if flag:
-                    deselect(i, sim_index=j)
+                    deselect(model_info, sim_index=j)