r15336 - /branches/frame_order_testing/generic_fns/frame_order.py -- February 15, 2012 - 11:01

Author: bugman
Date: Wed Feb 15 11:01:38 2012
New Revision: 15336

URL: http://svn.gna.org/viewcvs/relax?rev=15336&view=rev
Log:
The print_frame_order_2nd_degree() function can now write to a file.

This can then be used for debugging in the test suite.


Modified:
    branches/frame_order_testing/generic_fns/frame_order.py

Modified: branches/frame_order_testing/generic_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/frame_order.py?rev=15336&r1=15335&r2=15336&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/frame_order.py (original)
+++ branches/frame_order_testing/generic_fns/frame_order.py Wed Feb 15 
11:01:38 2012
@@ -31,7 +31,7 @@
 from float import isNaN
 
 
-def print_frame_order_2nd_degree(daeg, name=None, epsilon=1e-15, 
integer=False, dot=False, comma=True):
+def print_frame_order_2nd_degree(daeg, name=None, epsilon=1e-15, 
integer=False, dot=False, comma=True, file=sys.stdout):
     """Nicely print out the Frame Order matrix of the 2nd degree.
 
     @param daeg:        The 3D, rank-4 Frame Order matrix.
@@ -46,6 +46,8 @@
     @type dot:          bool
     @keyword comma:     A flag which if true causes commas to be printed 
between the elements.
     @type comma:        bool
+    @keyword file:      The file object to write to.
+    @type file:         file object
     """
 
     # Default name.
@@ -53,8 +55,8 @@
         name = 'Frame Order matrix, 2nd degree'
 
     # Header and first row start.
-    sys.stdout.write("\n%s:\n" % name)
-    sys.stdout.write('[[')
+    file.write("\n%s:\n" % name)
+    file.write('[[')
 
     # Convert to an array, if necessary.
     if isinstance(daeg, matrix):
@@ -64,7 +66,7 @@
     for i in range(len(daeg)):
         # 2nd to last row start.
         if i != 0:
-            sys.stdout.write(' [')
+            file.write(' [')
 
         # Row end character.
         char2 = ''
@@ -119,4 +121,4 @@
                     val = '0'
 
             # Write.
-            sys.stdout.write(format % (val, char1))
+            file.write(format % (val, char1))