mailr17595 - /trunk/generic_fns/align_tensor.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on September 28, 2012 - 13:29:
Author: bugman
Date: Fri Sep 28 13:29:29 2012
New Revision: 17595

URL: http://svn.gna.org/viewcvs/relax?rev=17595&view=rev
Log:
Python 3 preparation - eliminated the unneeded use of xrange().


Modified:
    trunk/generic_fns/align_tensor.py

Modified: trunk/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=17595&r1=17594&r2=17595&view=diff
==============================================================================
--- trunk/generic_fns/align_tensor.py (original)
+++ trunk/generic_fns/align_tensor.py Fri Sep 28 13:29:29 2012
@@ -626,7 +626,7 @@
     index = None
 
     # Loop over the tensors.
-    for i in xrange(len(dp.align_tensors)):
+    for i in range(len(dp.align_tensors)):
         if dp.align_tensors[i].name == tensor:
             index = i
 
@@ -653,7 +653,7 @@
     data = None
 
     # Loop over the tensors.
-    for i in xrange(len(cdp.align_tensors)):
+    for i in range(len(cdp.align_tensors)):
         if cdp.align_tensors[i].name == tensor:
             data = cdp.align_tensors[i]
 
@@ -930,7 +930,7 @@
     loc_inc = inc / axis_incs
 
     # Increment over the model parameters.
-    for i in xrange(n):
+    for i in range(n):
         # Parameter conversion factors.
         factor = return_conversion_factor(params[swap[i]])
 
@@ -955,7 +955,7 @@
         # Tick locations.
         string = "{"
         val = 0.0
-        for j in xrange(axis_incs + 1):
+        for j in range(axis_incs + 1):
             string = string + " " + repr(val)
             val = val + loc_inc
         string = string + " }"
@@ -963,7 +963,7 @@
 
         # Tick values.
         string = "{"
-        for j in xrange(axis_incs + 1):
+        for j in range(axis_incs + 1):
             string = string + "\"" + "%.2f" % vals + "\" "
             vals = vals + val_inc
         string = string + "}"
@@ -1043,17 +1043,17 @@
         sys.stdout.write("{Szz, Sxx-yy, Sxy, Sxz, Syz}")
     sys.stdout.write(":\n")
     sys.stdout.write("%8s" % '')
-    for i in xrange(tensor_num):
+    for i in range(tensor_num):
         sys.stdout.write("%8i" % i)
     sys.stdout.write("\n")
 
     # First loop.
-    for i in xrange(tensor_num):
+    for i in range(tensor_num):
         # Print out.
         sys.stdout.write("%8i" % i)
 
         # Second loop.
-        for j in xrange(tensor_num):
+        for j in range(tensor_num):
             # Dot product.
             delta = dot(matrix[i], matrix[j])
 
@@ -1411,7 +1411,7 @@
     orient_values = []
 
     # Loop over the parameters.
-    for i in xrange(len(param)):
+    for i in range(len(param)):
         # Get the object name.
         param[i] = return_data_name(param[i])
 




Related Messages


Powered by MHonArc, Updated Fri Sep 28 13:40:01 2012