r9518 - /1.3/generic_fns/frame_order.py -- September 11, 2009 - 14:44

Author: bugman
Date: Fri Sep 11 14:44:41 2009
New Revision: 9518

URL: http://svn.gna.org/viewcvs/relax?rev=9518&view=rev
Log:
Fixes for print_frame_order_2nd_degree() for when NaN is encountered.


Modified:
    1.3/generic_fns/frame_order.py

Modified: 1.3/generic_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/frame_order.py?rev=9518&r1=9517&r2=9518&view=diff
==============================================================================
--- 1.3/generic_fns/frame_order.py (original)
+++ 1.3/generic_fns/frame_order.py Fri Sep 11 14:44:41 2009
@@ -26,6 +26,9 @@
 # Python module imports.
 from numpy import array, matrix
 from sys import stdout
+
+# relax module imports.
+from float import isNaN
 
 
 def print_frame_order_2nd_degree(daeg, name=None, epsilon=1e-15, 
integer=False, dot=False, comma=True):
@@ -91,8 +94,13 @@
                     val = daeg[i, j]
                     format = "%10.4f%s"
 
-                # Write.
-                stdout.write(format % (val, char1))
+            # NaN.
+            if isNaN(daeg[i, j]):
+                val = 'NaN'
+                if integer:
+                    format = "%3i%s"
+                else:
+                    format = "%10s%s"
 
             # Write out the zero elements.
             else:
@@ -110,5 +118,5 @@
                 else:
                     val = '0'
 
-                # Write.
-                stdout.write(format % (val, char1))
+            # Write.
+            stdout.write(format % (val, char1))