r2477 - in /1.2: specific_fns/relax_data.py test_suite/model_free.py -- April 17, 2006 - 07:35

Author: bugman
Date: Mon Apr 17 07:35:14 2006
New Revision: 2477

URL: http://svn.gna.org/viewcvs/relax?rev=2477&view=rev
Log:
Fix to bug #5805.

The report is located at https://gna.org/bugs/?func=detailitem&item_id=5805.

The fix was simply to skip lines which don't have four columns.


Modified:
    1.2/specific_fns/relax_data.py
    1.2/test_suite/model_free.py

Modified: 1.2/specific_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/specific_fns/relax_data.py?rev=2477&r1=2476&r2=2477&view=diff
==============================================================================
--- 1.2/specific_fns/relax_data.py (original)
+++ 1.2/specific_fns/relax_data.py Mon Apr 17 07:35:14 2006
@@ -566,10 +566,15 @@
 
             # Test the validity of the relaxation data.
             for i in xrange(len(file_data)):
+                # Skip missing data.
+                if len(file_data[i]) != 4:
+                    continue
+
+                # Test that the data are numbers.
                 try:
                     int(file_data[i][num_col])
-                    eval(file_data[i][data_col])
-                    eval(file_data[i][error_col])
+                    float(file_data[i][data_col])
+                    float(file_data[i][error_col])
                 except ValueError:
                     raise RelaxError, "The relaxation data is invalid (num=" 
+ file_data[i][num_col] + ", name=" + file_data[i][name_col] + ", data=" + 
file_data[i][data_col] + ", error=" + file_data[i][error_col] + ")."
 
@@ -598,6 +603,10 @@
 
         # Loop over the relaxation data.
         for i in xrange(len(file_data)):
+            # Skip missing data.
+            if len(file_data[i]) != 4:
+                continue
+
             # Convert the data.
             res_num = int(file_data[i][num_col])
             res_name = file_data[i][name_col]

Modified: 1.2/test_suite/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/test_suite/model_free.py?rev=2477&r1=2476&r2=2477&view=diff
==============================================================================
--- 1.2/test_suite/model_free.py (original)
+++ 1.2/test_suite/model_free.py Mon Apr 17 07:35:14 2006
@@ -65,12 +65,12 @@
         self.relax.interpreter._Relax_data.read(self.run, 'R1', '600', 600.0 
* 1e6, 'r1.600.out', dir=path)
 
         # Test the data.
-        if self.relax.data.res[self.run][0].relax_data[0] != 
1.3874977659397683:
+        if self.relax.data.res[self.run][1].relax_data[0] != 
1.3874977659397683:
             print "The relaxation data does not match."
             return
 
         # Test the error.
-        if self.relax.data.res[self.run][0].relax_error[0] != 
0.027749955318795365:
+        if self.relax.data.res[self.run][1].relax_error[0] != 
0.027749955318795365:
             print "The relaxation error does not match."
             return