r10019 - /1.3/generic_fns/eliminate.py -- November 30, 2009 - 10:28

Author: bugman
Date: Mon Nov 30 10:28:55 2009
New Revision: 10019

URL: http://svn.gna.org/viewcvs/relax?rev=10019&view=rev
Log:
Analysis API fixes.

The param_names() and param_values() methods are now called get_param_names() 
and
get_param_values().


Modified:
    1.3/generic_fns/eliminate.py

Modified: 1.3/generic_fns/eliminate.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/eliminate.py?rev=10019&r1=10018&r2=10019&view=diff
==============================================================================
--- 1.3/generic_fns/eliminate.py (original)
+++ 1.3/generic_fns/eliminate.py Mon Nov 30 10:28:55 2009
@@ -50,8 +50,8 @@
     # 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)
+    get_param_names = get_specific_fn('get_param_names', cdp.pipe_type)
+    get_param_values = get_specific_fn('get_param_values', cdp.pipe_type)
     deselect = get_specific_fn('deselect', cdp.pipe_type)
 
     # Determine if simulations are active.
@@ -68,8 +68,8 @@
 
         if not sim_state:
             # Get the parameter names and values.
-            names = param_names(model_info)
-            values = param_values(model_info)
+            names = get_param_names(model_info)
+            values = get_param_values(model_info)
 
             # No data.
             if names == None or values == None:
@@ -98,8 +98,8 @@
             # Loop over the simulations.
             for j in xrange(cdp.sim_number):
                 # Get the parameter names and values.
-                names = param_names(model_info)
-                values = param_values(model_info, sim_index=j)
+                names = get_param_names(model_info)
+                values = get_param_values(model_info, sim_index=j)
 
                 # No data.
                 if names == None or values == None: