Changeset 5f2d3c78 in sasview

Timestamp:

Sep 8, 2009 3:59:30 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d0cda82

Parents:

4785dec

Message:

data line should be composed only with numbers in any of the columns.
Added unittest and testdata

Location:

DataLoader

Files:

• readers/ascii_reader.py (modified) (1 diff)
• test/ascii_test_6.txt (added)
• test/utest_ascii.py (modified) (1 diff)

DataLoader/readers/ascii_reader.py

@@ -109 +109 @@
                     
                     try:
-                        
+                        #Make sure that all columns are numbers.
+                        for colnum in range(len(toks)):
+                            float(toks[colnum])
+                            
                         _x = float(toks[0])
                         _y = float(toks[1])

DataLoader/test/utest_ascii.py

@@ -83 +83 @@
         self.assertEqual(f.x[4],0.0497)
         
+    def test_truncated_5(self):
+        """
+            Test a 6-col ascii file with complex header where one of them has a letter and 
+            many lines with 2 or 2 columns in the middle of the data section.
+            Only last four lines should be read.
+        """
+        # Test .ABS file loaded as ascii
+        f = self.loader.load("ascii_test_6.txt")
+        # The length of the data is 5
+        self.assertEqual(len(f.x), 4)
+        self.assertEqual(f.x[0],0.013534)
+        self.assertEqual(f.x[3],0.022254)
         
 if __name__ == '__main__':