r6374 - in /1.3: data/pipe_container.py specific_fns/hybrid.py -- June 22, 2008 - 03:25

Author: bugman
Date: Sun Jun 22 03:25:05 2008
New Revision: 6374

URL: http://svn.gna.org/viewcvs/relax?rev=6374&view=rev
Log:
Renamed all instances if 'hybrid_runs' to 'hybrid_pipes'.


Modified:
    1.3/data/pipe_container.py
    1.3/specific_fns/hybrid.py

Modified: 1.3/data/pipe_container.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/pipe_container.py?rev=6374&r1=6373&r2=6374&view=diff
==============================================================================
--- 1.3/data/pipe_container.py (original)
+++ 1.3/data/pipe_container.py Sun Jun 22 03:25:05 2008
@@ -47,7 +47,7 @@
         self.pipe_type = None
 
         # Hybrid models.
-        self.hybrid_runs = {}
+        self.hybrid_pipes = {}
 
         # Global minimisation statistics.
         self.chi2 = None
@@ -118,7 +118,7 @@
             return False
 
         # Tests for the initialised data (the pipe type can be set in an 
empty data pipe, so this isn't checked).
-        if self.hybrid_runs != {}:
+        if self.hybrid_pipes != {}:
             return False
         if self.chi2 != None:
             return False
@@ -136,7 +136,7 @@
         # An object has been added to the container.
         for name in dir(self):
             # Skip the objects initialised in __init__().
-            if name == 'structure' or name == 'mol' or name == 'pipe_type' 
or name == 'hybrid_runs' or name == 'chi2' or name == 'iter' or name == 
'f_count' or name == 'g_count' or name == 'h_count' or name == 'warning':
+            if name == 'structure' or name == 'mol' or name == 'pipe_type' 
or name == 'hybrid_pipes' or name == 'chi2' or name == 'iter' or name == 
'f_count' or name == 'g_count' or name == 'h_count' or name == 'warning':
                 continue
 
             # Skip the PipeContainer methods.

Modified: 1.3/specific_fns/hybrid.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/hybrid.py?rev=6374&r1=6373&r2=6374&view=diff
==============================================================================
--- 1.3/specific_fns/hybrid.py (original)
+++ 1.3/specific_fns/hybrid.py Sun Jun 22 03:25:05 2008
@@ -49,7 +49,7 @@
         ds.run_types[ds.run_names.index(new_run)] = 'hybrid'
 
         # Duplicate the hybrid run data structure.
-        ds.hybrid_runs[new_run] = ds.hybrid_runs[old_run]
+        ds.hybrid_pipes[new_run] = ds.hybrid_pipes[old_run]
 
 
     def hybridise(self, hybrid=None, runs=None):
@@ -88,7 +88,7 @@
         ds.run_types.append('hybrid')
 
         # Create the data structure of the runs which form the hybrid.
-        ds.hybrid_runs[hybrid] = runs
+        ds.hybrid_pipes[hybrid] = runs
 
 
     def model_statistics(self, run=None, instance=None, global_stats=None):
@@ -108,7 +108,7 @@
         chi2_total = 0.0
 
         # Specific setup.
-        for run in ds.hybrid_runs[self.run]:
+        for run in ds.hybrid_pipes[self.run]:
             # Function type.
             function_type = ds.run_types[ds.run_names.index(run)]