r8135 - in /1.3: generic_fns/grace.py test_suite/system_tests/relax_fit.py -- December 04, 2008 - 17:46

Author: bugman
Date: Thu Dec  4 17:46:03 2008
New Revision: 8135

URL: http://svn.gna.org/viewcvs/relax?rev=8135&view=rev
Log:
Partial fix for bug #12679 (https://gna.org/bugs/index.php?12679).

This bug was reported by Michael Funk (mifu att nmr dot mpibpc dot mpg dot 
de).

The problem was that the data for the graph was numpy arrays, and only lists 
were being checked for.


Modified:
    1.3/generic_fns/grace.py
    1.3/test_suite/system_tests/relax_fit.py

Modified: 1.3/generic_fns/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/grace.py?rev=8135&r1=8134&r2=8135&view=diff
==============================================================================
--- 1.3/generic_fns/grace.py (original)
+++ 1.3/generic_fns/grace.py Thu Dec  4 17:46:03 2008
@@ -24,7 +24,7 @@
 """Module for interfacing with Grace (also known as Xmgrace, Xmgr, and 
ace)."""
 
 # Python module imports.
-from numpy import array
+from numpy import array, ndarray
 from os import system
 from re import match
 from warnings import warn
@@ -324,7 +324,7 @@
 
     # Test for multiple data sets.
     multi = False
-    if type(data[0][-4]) == list:
+    if type(data[0][-4]) == list or isinstance(data[0][-4], ndarray):
         multi = True
 
     # Multiple data sets.

Modified: 1.3/test_suite/system_tests/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/relax_fit.py?rev=8135&r1=8134&r2=8135&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/relax_fit.py (original)
+++ 1.3/test_suite/system_tests/relax_fit.py Thu Dec  4 17:46:03 2008
@@ -74,9 +74,9 @@
             lines[i] = split(lines[i])
 
         # Check some of the Grace data.
-        self.assertEqual(len(lines[26]), 2)
-        self.assertEqual(lines[26][0], '0.004')
-        self.assertEqual(lines[26][1], '487178.')
+        self.assertEqual(len(lines[23]), 2)
+        self.assertEqual(lines[23][0], '0.004')
+        self.assertEqual(lines[23][1], '487178.0')
 
 
     def test_curve_fitting(self):