r3517 - /1.3/generic_fns/residue.py -- November 11, 2007 - 22:55

Author: bugman
Date: Sun Nov 11 22:55:16 2007
New Revision: 3517

URL: http://svn.gna.org/viewcvs/relax?rev=3517&view=rev
Log:
Simplification of the loops in the generic_fns.residue.renumber() function.


Modified:
    1.3/generic_fns/residue.py

Modified: 1.3/generic_fns/residue.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/residue.py?rev=3517&r1=3516&r2=3517&view=diff
==============================================================================
--- 1.3/generic_fns/residue.py (original)
+++ 1.3/generic_fns/residue.py Sun Nov 11 22:55:16 2007
@@ -236,21 +236,16 @@
 
     # Catch multiple renumberings!
     number = 0
-    for mol in molecule_loop(mol_token):
-        # Loop over the residues of the molecule.
-        for i in xrange(len(mol.res)):
-            # Rename the residue is there is a match.
-            if mol.res[i].num in residues or mol.res[i].name in residues:
-                number = number + 1
+    for res in residue_loop(res_id):
+        if res.num in residues or res.name in residues:
+            number = number + 1
 
     # Fail if multiple residues are numbered.
     if number > 1:
         raise RelaxError, "The renumbering of multiple residues is 
disallowed."
 
-    # Molecule loop.
-    for mol in molecule_loop(mol_token):
-        # Loop over the residues of the molecule.
-        for i in xrange(len(mol.res)):
-            # Rename the residue is there is a match.
-            if mol.res[i].num in residues or mol.res[i].name in residues:
-                mol.res[i].num = new_number
+    # Residue loop.
+    for res in residue_loop(res_id):
+        # Rename the residue is there is a match.
+        if res.num in residues or res.name in residues:
+            res.num = new_number