r7483 - /branches/pipe_refs/generic_fns/eliminate.py -- October 01, 2008 - 14:18

Author: bugman
Date: Wed Oct  1 14:18:37 2008
New Revision: 7483

URL: http://svn.gna.org/viewcvs/relax?rev=7483&view=rev
Log:
Switched the eliminate function to use the new 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=7483&r1=7482&r2=7483&view=diff
==============================================================================
--- branches/pipe_refs/generic_fns/eliminate.py (original)
+++ branches/pipe_refs/generic_fns/eliminate.py Wed Oct  1 14:18:37 2008
@@ -55,20 +55,20 @@
 
     # Specific eliminate, parameter names, parameter values, number of 
instances, and deselect function setup.
     eliminate = get_specific_fn('eliminate', cdp.pipe_type)
+    model_loop = get_specific_fn('model_loop', cdp.pipe_type)
     param_names = get_specific_fn('param_names', cdp.pipe_type)
     param_values = get_specific_fn('param_values', cdp.pipe_type)
-    num_instances = get_specific_fn('num_instances', cdp.pipe_type)
     deselect = get_specific_fn('deselect', cdp.pipe_type)
 
-    # Get the number of instances and loop over them.
-    for i in xrange(num_instances()):
-        # Determine if simulations are active.
-        if hasattr(cdp, 'sim_state') and cdp.sim_state == True:
-            sim_state = True
-        else:
-            sim_state = False
+    # Determine if simulations are active.
+    if hasattr(cdp, 'sim_state') and cdp.sim_state == True:
+        sim_state = True
+    else:
+        sim_state = False
 
 
+    # Get the number of instances and loop over them.
+    for model_info in model_loop():
         # Model elimination.
         ####################